You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2016/08/29 07:24:16 UTC
svn commit: r1758177 - in /uima/ruta/trunk/ruta-core/src/test:
java/org/apache/uima/ruta/engine/ resources/org/apache/uima/ruta/
resources/org/apache/uima/ruta/engine/
Author: pkluegl
Date: Mon Aug 29 07:24:16 2016
New Revision: 1758177
URL: http://svn.apache.org/viewvc?rev=1758177&view=rev
Log:
UIMA-5077
- avoid warnings
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TypeAliasTestEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/CWEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SWEngine.xml
uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SimpleEngine.xml
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java?rev=1758177&r1=1758176&r2=1758177&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java Mon Aug 29 07:24:16 2016
@@ -35,10 +35,11 @@ import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.fit.factory.JCasFactory;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceConfigurationException;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.util.FileUtils;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
@@ -360,9 +361,8 @@ public class HtmlConverterTest {
}
@Test
- public void annotationPropagationTest() throws AnalysisEngineProcessException,
- ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
- IOException {
+ public void annotationPropagationTest() throws Exception {
+ JCas jcas = JCasFactory.createJCas();
for (String htmlContent : new String[] { htmlWin }) {
// configure annotator and create AE:
URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
@@ -374,23 +374,12 @@ public class HtmlConverterTest {
AnalysisEngineDescription specifier = (AnalysisEngineDescription) UIMAFramework
.getXMLParser().parseResourceSpecifier(in);
- TypeSystemDescription basicTypeSystem = specifier.getAnalysisEngineMetaData().getTypeSystem();
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "A", "Type for Testing",
- "uima.tcas.Annotation");
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "I", "Type for Testing",
- "uima.tcas.Annotation");
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "B", "Type for Testing",
- "uima.tcas.Annotation");
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "U", "Type for Testing",
- "uima.tcas.Annotation");
- specifier.getAnalysisEngineMetaData().setTypeSystem(basicTypeSystem);
-
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
ae.setConfigParameterValue("outputView", outputViewName);
ae.reconfigure();
// create the cas and input annotation
- CAS cas = ae.newCAS();
+ CAS cas = jcas.getCas();
cas.reset();
cas.setDocumentText(htmlContent);
Type boldType = cas.getTypeSystem().getType(HtmlAnnotator.NAMESPACE + "B");
@@ -420,9 +409,8 @@ public class HtmlConverterTest {
}
@Test
- public void annotationPropagationAndDecodingTest() throws AnalysisEngineProcessException,
- ResourceConfigurationException, ResourceInitializationException, InvalidXMLException,
- IOException {
+ public void annotationPropagationAndDecodingTest() throws Exception {
+ JCas jcas = JCasFactory.createJCas();
// configure annotator and create AE:
URL url = HtmlConverter.class.getClassLoader().getResource("HtmlConverter.xml");
if (url == null) {
@@ -432,24 +420,13 @@ public class HtmlConverterTest {
XMLInputSource in = new XMLInputSource(url);
AnalysisEngineDescription specifier = (AnalysisEngineDescription) UIMAFramework
.getXMLParser().parseResourceSpecifier(in);
-
- TypeSystemDescription basicTypeSystem = specifier.getAnalysisEngineMetaData().getTypeSystem();
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "A", "Type for Testing",
- "uima.tcas.Annotation");
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "I", "Type for Testing",
- "uima.tcas.Annotation");
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "B", "Type for Testing",
- "uima.tcas.Annotation");
- basicTypeSystem.addType(HtmlAnnotator.NAMESPACE + "U", "Type for Testing",
- "uima.tcas.Annotation");
- specifier.getAnalysisEngineMetaData().setTypeSystem(basicTypeSystem);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
ae.setConfigParameterValue("outputView", outputViewName);
ae.reconfigure();
// create the cas and input annotation
- CAS cas = ae.newCAS();
+ CAS cas = jcas.getCas();
cas.reset();
cas.setDocumentText(htmlDecodingAnnotations);
Type boldType = cas.getTypeSystem().getType(HtmlAnnotator.NAMESPACE + "B");
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TypeAliasTestEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TypeAliasTestEngine.xml?rev=1758177&r1=1758176&r2=1758177&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TypeAliasTestEngine.xml (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/TypeAliasTestEngine.xml Mon Aug 29 07:24:16 2016
@@ -274,25 +274,6 @@
</value>
</nameValuePair>
<nameValuePair>
- <name>additionalExtensions</name>
- <value>
- <array>
- <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
- <string>org.apache.uima.ruta.string.bool.BooleanOperationsExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
- <string>org.apache.uima.ruta.string.StringOperationsExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
- <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
- <string>org.apache.uima.ruta.block.OnlyOnceBlockExtension</string>
- <string>org.apache.uima.ruta.block.fst.FSTBlockExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
- </array>
- </value>
- </nameValuePair>
- <nameValuePair>
<name>additionalEngineLoaders</name>
<value>
<array/>
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/CWEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/CWEngine.xml?rev=1758177&r1=1758176&r2=1758177&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/CWEngine.xml (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/CWEngine.xml Mon Aug 29 07:24:16 2016
@@ -281,21 +281,6 @@
</value>
</nameValuePair>
<nameValuePair>
- <name>additionalExtensions</name>
- <value>
- <array>
- <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
- <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
- </array>
- </value>
- </nameValuePair>
- <nameValuePair>
<name>additionalEngineLoaders</name>
<value>
<array/>
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SWEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SWEngine.xml?rev=1758177&r1=1758176&r2=1758177&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SWEngine.xml (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SWEngine.xml Mon Aug 29 07:24:16 2016
@@ -281,21 +281,6 @@
</value>
</nameValuePair>
<nameValuePair>
- <name>additionalExtensions</name>
- <value>
- <array>
- <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
- <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
- </array>
- </value>
- </nameValuePair>
- <nameValuePair>
<name>additionalEngineLoaders</name>
<value>
<array/>
Modified: uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SimpleEngine.xml
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SimpleEngine.xml?rev=1758177&r1=1758176&r2=1758177&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SimpleEngine.xml (original)
+++ uima/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/engine/SimpleEngine.xml Mon Aug 29 07:24:16 2016
@@ -281,21 +281,6 @@
</value>
</nameValuePair>
<nameValuePair>
- <name>additionalExtensions</name>
- <value>
- <array>
- <string>org.apache.uima.ruta.example.extensions.ExampleConditionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleActionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBooleanFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleNumberFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleStringFunctionExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleTypeFunctionExtension</string>
- <string>org.apache.uima.ruta.block.OnlyFirstBlockExtension</string>
- <string>org.apache.uima.ruta.example.extensions.ExampleBlockExtension</string>
- </array>
- </value>
- </nameValuePair>
- <nameValuePair>
<name>additionalEngineLoaders</name>
<value>
<array/>