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 2019/04/15 12:48:34 UTC
svn commit: r1857574 [1/2] - in /uima/uv3/ruta-v3/trunk/ruta-core: ./
src/main/jflex/org/apache/uima/ruta/seed/ src/test/java/org/apache/uima/ruta/
src/test/java/org/apache/uima/ruta/action/
src/test/java/org/apache/uima/ruta/block/ src/test/java/org/a...
Author: pkluegl
Date: Mon Apr 15 12:48:34 2019
New Revision: 1857574
URL: http://svn.apache.org/viewvc?rev=1857574&view=rev
Log:
UIMA-6024: apply cleanup of 2.7.0
Added:
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringFeatureTest.java
Removed:
uima/uv3/ruta-v3/trunk/ruta-core/TypeSystem.xml
Modified:
uima/uv3/ruta-v3/trunk/ruta-core/pom.xml
uima/uv3/ruta-v3/trunk/ruta-core/src/main/jflex/org/apache/uima/ruta/seed/SeedLexer.flex
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/HtmlConverterTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ResourcesFromDataPathTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RulesParamTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaEngineTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/RutaTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/StackedScriptsTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/TestRutaInferenceVisitor.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/UimafitTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/ViewWriterTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationFeatureExpressionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationLabelExpressionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/annotation/AnnotationVariableExpressionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/resource/WordListStringExpressionTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/expression/string/StringSubtypeAllowedValuesTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/InlinedRulesTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/RutaAnnotationTypeMatcherTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/SidestepInComposedTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/WildCard2Test.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/rule/quantifier/QuantifierTest.java
uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/seed/DefaultSeederTest.java
Modified: uima/uv3/ruta-v3/trunk/ruta-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/pom.xml?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/pom.xml (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/pom.xml Mon Apr 15 12:48:34 2019
@@ -13,6 +13,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ruta-core</artifactId>
+ <version>${project.parent.version}</version>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>ruta-parent</artifactId>
@@ -28,12 +29,11 @@
<description>The core implementation of the UIMA Ruta rule engine.</description>
<name>Apache UIMA Ruta: ${project.artifactId}</name>
-
<dependencies>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>ruta-typesystem</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>3.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
@@ -207,25 +207,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${basedir}/target/generated-sources/antlr3
- </source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>de.jflex</groupId>
@@ -239,12 +220,26 @@
</execution>
</executions>
</plugin>
- <plugin>
+
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
- <id>add-source</id>
+ <id>add-antlr-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${basedir}/target/generated-sources/antlr3
+ </source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-jflex-source</id>
<phase>generate-sources</phase>
<goals>
<goal>add-source</goal>
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/main/jflex/org/apache/uima/ruta/seed/SeedLexer.flex
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/main/jflex/org/apache/uima/ruta/seed/SeedLexer.flex?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/main/jflex/org/apache/uima/ruta/seed/SeedLexer.flex (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/main/jflex/org/apache/uima/ruta/seed/SeedLexer.flex Mon Apr 15 12:48:34 2019
@@ -60,8 +60,7 @@ import org.apache.uima.ruta.type.SW;
ALPHA=[A-Za-z]
DIGIT=[0-9]
-WHITE_SPACE_CHAR=[\n\r\ \t\b\012]
-BREAK=[\n\r\b\012\u000b]
+BREAK=[\n\r\b\012\u000b\u2028]
SPACE=[ \t]
%%
@@ -207,9 +206,18 @@ SPACE=[ \t]
return t;
}
- <<EOF>> {
+ <<EOF>> {
return null;
}
+ [^] {
+ SPECIAL t = new SPECIAL(cas);
+ t.setBegin(yychar);
+ t.setEnd(yychar + yytext().length());
+
+ return t;
+ }
+
+
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AlternativeMatchTest.java Mon Apr 15 12:48:34 2019
@@ -33,7 +33,7 @@ import org.junit.Test;
public class AlternativeMatchTest {
@Test
- public void test() {
+ public void test() throws Exception {
String document = "1 this is a Test.";
String script = "";
script += "CW{-> CREATE(T0, \"s\"=\"a\"),CREATE(T0, \"s\"=\"b\")};";
@@ -47,25 +47,19 @@ public class AlternativeMatchTest {
script += "NUM W[1,8]? T0.s==\"a\"{-> T8};";
script += "NUM W W W W?? T0.s==\"b\"{-> T9};";
script += "NUM W W W W?? T0.s==\"a\"{-> T10};";
-
-
+
Map<String, String> typeMap = new TreeMap<String, String>();
String typeName1 = "T0";
typeMap.put(typeName1, "uima.tcas.Annotation");
-
+
Map<String, List<TestFeature>> featureMap = new TreeMap<String, List<TestFeature>>();
List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
featureMap.put(typeName1, list);
String fn1 = "s";
list.add(new TestFeature(fn1, "", "uima.cas.String"));
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
- Ruta.apply(cas, script);
- } catch (Exception e) {
- e.printStackTrace();
- }
+
+ CAS cas = RutaTestUtils.getCAS(document, typeMap, featureMap);
+ Ruta.apply(cas, script);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Test");
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Test");
@@ -77,7 +71,7 @@ public class AlternativeMatchTest {
RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, "Test");
RutaTestUtils.assertAnnotationsEquals(cas, 9, 1, "Test");
RutaTestUtils.assertAnnotationsEquals(cas, 10, 1, "Test");
-
+
if (cas != null) {
cas.release();
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ConflictingTypeTest.java Mon Apr 15 12:48:34 2019
@@ -21,18 +21,14 @@ package org.apache.uima.ruta;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import java.io.IOException;
-
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.ruta.engine.RutaEngine;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
/**
@@ -42,27 +38,26 @@ public class ConflictingTypeTest {
/**
* Create an analysis engine for a Ruta script.
*
- * @param script Script path.
+ * @param script
+ * Script path.
* @return Analysis engine.
*/
- private AnalysisEngine createAE(String script) throws ResourceInitializationException, IOException, InvalidXMLException {
+ private AnalysisEngine createAE(String script) throws Exception {
final TypeSystemDescription tsd = TypeSystemDescriptionFactory.createTypeSystemDescription(
"org.apache.uima.ruta.engine.BasicTypeSystem",
"org.apache.uima.ruta.ConflictingTypeSystem");
final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription(
- "org.apache.uima.ruta.engine.BasicEngine",
- RutaEngine.PARAM_MAIN_SCRIPT, script);
+ "org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script);
ruta.getAnalysisEngineMetaData().setTypeSystem(tsd);
- ruta.getAnalysisEngineMetaData()
- .getTypeSystem()
- .addType("org.apache.uima.T1", "Type for Testing", "uima.tcas.Annotation");
+ ruta.getAnalysisEngineMetaData().getTypeSystem().addType("org.apache.uima.T1",
+ "Type for Testing", "uima.tcas.Annotation");
return AnalysisEngineFactory.createEngine(ruta);
}
@Test
- public void test() throws ResourceInitializationException, IOException, InvalidXMLException, AnalysisEngineProcessException {
+ public void test() throws Exception {
final String name = getClass().getSimpleName();
final String namespace = getClass().getPackage().getName();
final AnalysisEngine ae = createAE(namespace + "." + name);
@@ -78,8 +73,8 @@ public class ConflictingTypeTest {
// org.apache.uima.ruta.type.conflicting.W are imported into RUTA's namespace as W;
assertTrue(e.getCause() instanceof IllegalArgumentException);
} finally {
- cas.release();
- ae.destroy();
+ cas.release();
+ ae.destroy();
}
}
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/CustomViewTest.java Mon Apr 15 12:48:34 2019
@@ -21,7 +21,6 @@ package org.apache.uima.ruta;
import static org.junit.Assert.assertEquals;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -33,10 +32,8 @@ import org.apache.uima.fit.factory.Analy
import org.apache.uima.fit.util.JCasUtil;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.type.W;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -50,17 +47,16 @@ public class CustomViewTest {
/**
* Create an analysis engine for a Ruta script.
*
- * @param script Script path.
+ * @param script
+ * Script path.
* @return Analysis engine.
*/
- private AnalysisEngine createAE(String script) throws ResourceInitializationException, IOException, InvalidXMLException {
+ private AnalysisEngine createAE(String script) throws Exception {
final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription(
- "org.apache.uima.ruta.engine.BasicEngine",
- RutaEngine.PARAM_MAIN_SCRIPT, script);
+ "org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script);
- ruta.getAnalysisEngineMetaData()
- .getTypeSystem()
- .addType("org.apache.uima.T1", "Type for Testing", "uima.tcas.Annotation");
+ ruta.getAnalysisEngineMetaData().getTypeSystem().addType("org.apache.uima.T1",
+ "Type for Testing", "uima.tcas.Annotation");
final AggregateBuilder builder = new AggregateBuilder();
builder.add(ruta, "_InitialView", "text");
@@ -93,7 +89,8 @@ public class CustomViewTest {
words.add(a.getCoveredText());
}
- assertEquals("Checking run " + i, words, Arrays.asList("This", "is", "a", "short", "document"));
+ assertEquals("Checking run " + i, words,
+ Arrays.asList("This", "is", "a", "short", "document"));
}
}
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatch1Test.java Mon Apr 15 12:48:34 2019
@@ -19,30 +19,22 @@
package org.apache.uima.ruta;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class FeatureMatch1Test {
@Test
- public void test() throws AnalysisEngineProcessException, InvalidXMLException,
- ResourceInitializationException, ResourceConfigurationException, URISyntaxException,
- IOException {
+ public void test() throws Exception {
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ImportStatementsTest.java Mon Apr 15 12:48:34 2019
@@ -22,7 +22,6 @@ package org.apache.uima.ruta;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -37,7 +36,6 @@ import org.apache.uima.fit.factory.Analy
import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
import org.apache.uima.fit.util.CasUtil;
import org.apache.uima.fit.util.JCasUtil;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.ruta.descriptor.RutaBuildOptions;
import org.apache.uima.ruta.descriptor.RutaDescriptorFactory;
@@ -45,7 +43,6 @@ import org.apache.uima.ruta.descriptor.R
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.type.FalsePositive;
import org.apache.uima.ruta.type.TruePositive;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -67,8 +64,7 @@ public class ImportStatementsTest {
* {@link org.apache.uima.ruta.engine.RutaEngine#PARAM_STRICT_IMPORTS} value.
* @return Analysis engine.
*/
- private AnalysisEngine createAE(String script, boolean strictImport)
- throws ResourceInitializationException, IOException, InvalidXMLException {
+ private AnalysisEngine createAE(String script, boolean strictImport) throws Exception {
final TypeSystemDescription tsd = TypeSystemDescriptionFactory.createTypeSystemDescription(
"org.apache.uima.ruta.engine.BasicTypeSystem",
"org.apache.uima.ruta.ImportStatementsTestTypeSystem",
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java Mon Apr 15 12:48:34 2019
@@ -20,7 +20,6 @@
package org.apache.uima.ruta;
import java.io.File;
-import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
@@ -42,7 +41,7 @@ import org.junit.Test;
public class IncompletePartitioningTest {
@Test
- public void test() throws Exception, IOException {
+ public void test() throws Exception {
String className = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
@@ -54,7 +53,8 @@ public class IncompletePartitioningTest
File textFile = new File(textURL.toURI());
URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
if (url == null) {
- url = RutaTestUtils.class.getClassLoader().getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
+ url = RutaTestUtils.class.getClassLoader()
+ .getResource("org/apache/uima/ruta/engine/BasicEngine.xml");
}
XMLInputSource in = new XMLInputSource(url);
ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -62,8 +62,7 @@ public class IncompletePartitioningTest
TypeSystemDescription basicTypeSystem = aed.getAnalysisEngineMetaData().getTypeSystem();
for (int i = 1; i <= 50; i++) {
- basicTypeSystem.addType(RutaTestUtils.TYPE + i, "Type for Testing",
- "uima.tcas.Annotation");
+ basicTypeSystem.addType(RutaTestUtils.TYPE + i, "Type for Testing", "uima.tcas.Annotation");
}
Collection<TypeSystemDescription> tsds = new ArrayList<TypeSystemDescription>();
tsds.add(basicTypeSystem);
@@ -71,8 +70,8 @@ public class IncompletePartitioningTest
aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems);
AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
- ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS, new String[] { ruleFile
- .getParentFile().getPath() });
+ ae.setConfigParameterValue(RutaEngine.PARAM_SCRIPT_PATHS,
+ new String[] { ruleFile.getParentFile().getPath() });
String name = ruleFile.getName();
if (name.endsWith(RutaEngine.SCRIPT_FILE_EXTENSION)) {
name = name.substring(0, name.length() - 5);
@@ -84,7 +83,7 @@ public class IncompletePartitioningTest
ae.reconfigure();
CAS cas = ae.newCAS();
cas.setDocumentText(FileUtils.file2String(textFile, "UTF-8"));
-
+
Type typeCW = cas.getTypeSystem().getType("org.apache.uima.ruta.type.CW");
Type typeSW = cas.getTypeSystem().getType("org.apache.uima.ruta.type.SW");
cas.addFsToIndexes(cas.createAnnotation(typeCW, 0, 5));
@@ -92,7 +91,7 @@ public class IncompletePartitioningTest
cas.addFsToIndexes(cas.createAnnotation(typeCW, 15, 18));
cas.addFsToIndexes(cas.createAnnotation(typeSW, 19, 22));
cas.addFsToIndexes(cas.createAnnotation(typeCW, 23, 28));
-
+
ae.process(cas);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "Peter, Jochen", "Flo and");
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java Mon Apr 15 12:48:34 2019
@@ -21,7 +21,11 @@ package org.apache.uima.ruta;
import static org.junit.Assert.assertEquals;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIterator;
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NewCASPipelineTest.java Mon Apr 15 12:48:34 2019
@@ -20,28 +20,22 @@ package org.apache.uima.ruta;
import static org.junit.Assert.assertEquals;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.fit.factory.AnalysisEngineFactory;
import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
import org.apache.uima.fit.pipeline.SimplePipeline;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.ResourceMetaData;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.util.CasCreationUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
-
/**
* Tests if the script is correctly applied in a pipeline if a new CAS is used.
*
@@ -56,23 +50,21 @@ public class NewCASPipelineTest {
* Script path.
* @return Analysis engine.
*/
- private AnalysisEngine createAE(String script) throws ResourceInitializationException,
- IOException, InvalidXMLException {
+ private AnalysisEngine createAE(String script) throws Exception {
final TypeSystemDescription tsd = TypeSystemDescriptionFactory
.createTypeSystemDescription("org.apache.uima.ruta.engine.BasicTypeSystem");
final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription(
"org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script);
ruta.getAnalysisEngineMetaData().setTypeSystem(tsd);
- ruta.getAnalysisEngineMetaData().getTypeSystem()
- .addType(TEST_TYPE, "Type for Testing", "uima.tcas.Annotation");
+ ruta.getAnalysisEngineMetaData().getTypeSystem().addType(TEST_TYPE, "Type for Testing",
+ "uima.tcas.Annotation");
return AnalysisEngineFactory.createEngine(ruta);
}
@Test
- public void test() throws ResourceInitializationException, IOException, InvalidXMLException,
- AnalysisEngineProcessException, ResourceConfigurationException {
+ public void test() throws Exception {
final String name = getClass().getSimpleName();
final String namespace = getClass().getPackage().getName();
final AnalysisEngine ae = createAE(namespace + "." + name);
@@ -80,8 +72,7 @@ public class NewCASPipelineTest {
metaData.add(ae.getMetaData());
String input = "This is a test.";
Type t1 = null;
-
-
+
// create a cas and apply rules
final CAS cas = CasCreationUtils.createCas(metaData);
cas.setDocumentText(input);
@@ -97,18 +88,18 @@ public class NewCASPipelineTest {
t1 = cas.getTypeSystem().getType(TEST_TYPE);
assertEquals(1, cas.getAnnotationIndex(t1).size());
-
+
// create a new cas and force the ae to update its types
ae.setConfigParameterValue(RutaEngine.PARAM_RELOAD_SCRIPT, true);
ae.reconfigure();
-
+
final CAS cas2 = CasCreationUtils.createCas(metaData);
cas2.setDocumentText(input);
SimplePipeline.runPipeline(cas2, ae);
t1 = cas2.getTypeSystem().getType(TEST_TYPE);
assertEquals(1, cas2.getAnnotationIndex(t1).size());
-
+
// create a new cas and do not force the ae to update its types
ae.setConfigParameterValue(RutaEngine.PARAM_RELOAD_SCRIPT, false);
ae.reconfigure();
@@ -118,7 +109,7 @@ public class NewCASPipelineTest {
t1 = cas3.getTypeSystem().getType(TEST_TYPE);
assertEquals(1, cas3.getAnnotationIndex(t1).size());
-
+
// create a new cas and do not reconfigure the engine
final CAS cas4 = CasCreationUtils.createCas(metaData);
cas4.setDocumentText(input);
@@ -126,7 +117,7 @@ public class NewCASPipelineTest {
t1 = cas4.getTypeSystem().getType(TEST_TYPE);
assertEquals(1, cas4.getAnnotationIndex(t1).size());
-
+
if (ae != null) {
ae.destroy();
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java Mon Apr 15 12:48:34 2019
@@ -22,8 +22,6 @@ package org.apache.uima.ruta;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -34,8 +32,6 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
-import org.apache.uima.cas.CASRuntimeException;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
@@ -43,39 +39,37 @@ import org.apache.uima.fit.factory.Analy
import org.apache.uima.fit.factory.TypeSystemDescriptionFactory;
import org.apache.uima.fit.util.CasUtil;
import org.apache.uima.jcas.tcas.Annotation;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.type.TruePositive;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Assert;
import org.junit.Test;
-
/**
* Test the strict import option of {@link org.apache.uima.ruta.engine.RutaEngine}.
*/
public class StrictImportTest {
private final String NAME = this.getClass().getSimpleName();
+
private final String NAMESPACE = this.getClass().getPackage().getName();
/**
* Create an analysis engine for a Ruta script.
*
- * @param script Script path.
- * @param strictImport {@link RutaEngine#PARAM_STRICT_IMPORTS} value.
+ * @param script
+ * Script path.
+ * @param strictImport
+ * {@link RutaEngine#PARAM_STRICT_IMPORTS} value.
* @return Analysis engine.
*/
- private AnalysisEngine createAE(String script, boolean strictImport) throws ResourceInitializationException, IOException, InvalidXMLException {
+ private AnalysisEngine createAE(String script, boolean strictImport) throws Exception {
final TypeSystemDescription tsd = TypeSystemDescriptionFactory.createTypeSystemDescription(
"org.apache.uima.ruta.engine.BasicTypeSystem",
"org.apache.uima.ruta.StrictImportTestTypeSystem");
final AnalysisEngineDescription ruta = AnalysisEngineFactory.createEngineDescription(
- "org.apache.uima.ruta.engine.BasicEngine",
- RutaEngine.PARAM_MAIN_SCRIPT, script,
+ "org.apache.uima.ruta.engine.BasicEngine", RutaEngine.PARAM_MAIN_SCRIPT, script,
RutaEngine.PARAM_STRICT_IMPORTS, strictImport);
tsd.addType(script.replaceAll("/", ".") + ".T1", "Type for Testing", "uima.tcas.Annotation");
@@ -148,44 +142,43 @@ public class StrictImportTest {
return values;
}
-
+
@Test
- public void testStrictScriptImport() throws ResourceInitializationException, InvalidXMLException, IOException, AnalysisEngineProcessException {
+ public void testStrictScriptImport() throws Exception {
Map<String, String> complexTypes = new HashMap<>();
String s1 = "org.apache.uima.ruta.StrictScript2.Type1";
String s2 = "org.apache.uima.ruta.other.Type1";
complexTypes.put(s1, "uima.tcas.Annotation");
complexTypes.put(s2, "uima.tcas.Annotation");
-
+
CAS cas = RutaTestUtils.getCAS("Some text.", complexTypes, null);
-
- AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class,
+
+ AnalysisEngine ae = AnalysisEngineFactory.createEngine(RutaEngine.class,
RutaEngine.PARAM_MAIN_SCRIPT, "org.apache.uima.ruta.StrictScript1",
RutaEngine.PARAM_ADDITIONAL_SCRIPTS, "org.apache.uima.ruta.StrictScript2",
- RutaEngine.PARAM_STRICT_IMPORTS, true
- );
+ RutaEngine.PARAM_STRICT_IMPORTS, true);
ae.process(cas);
-
+
Type t1 = cas.getTypeSystem().getType(s1);
Type t2 = cas.getTypeSystem().getType(s2);
-
+
Assert.assertEquals(1, cas.getAnnotationIndex(t1).size());
Assert.assertEquals(1, cas.getAnnotationIndex(t2).size());
-
+
cas.release();
}
-
+
@Test
- public void testDocumentAnnotation() throws ResourceInitializationException, InvalidXMLException, IOException, AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException, CASRuntimeException, CASException {
+ public void testDocumentAnnotation() throws Exception {
CAS cas = RutaTestUtils.getCAS("Some text.");
Map<String, Object> params = new HashMap<>();
params.put(RutaEngine.PARAM_STRICT_IMPORTS, true);
Ruta.apply(cas, "DocumentAnnotation{->TruePositive};", params);
Ruta.apply(cas, "Document{->TruePositive};", params);
- AnnotationIndex<Annotation> annotationIndex = cas.getJCas().getAnnotationIndex(TruePositive.type);
+ AnnotationIndex<Annotation> annotationIndex = cas.getJCas()
+ .getAnnotationIndex(TruePositive.type);
Assert.assertEquals(2, annotationIndex.size());
cas.release();
}
-
-
+
}
\ No newline at end of file
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java Mon Apr 15 12:48:34 2019
@@ -20,7 +20,9 @@
package org.apache.uima.ruta;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,28 +35,26 @@ import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
+import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
+import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
+import org.xml.sax.SAXException;
public class WSDictionaryTest {
@Test
- public void test() {
+ public void test() throws SAXException, ResourceInitializationException, InvalidXMLException, IOException {
String document = "Peter Kluegl, Marshall Schor, Joern Kottmann\n";
document += "PeterKluegl, MarshallSchor, JoernKottmann\n";
document += "Peter<x>Kluegl, Marshall<x>Schor, Joern<x>Kottmann\n";
String script = "WORDLIST list = 'org/apache/uima/ruta/WSDictionaryTestList.txt';";
script += "MARKFAST(T1, list);";
- CAS cas = null;
- try {
- cas = RutaTestUtils.getCAS(document);
- Ruta.apply(cas, script);
- } catch (Exception e) {
- e.printStackTrace();
- }
+
+ CAS cas = executeAnalysis(RutaTestUtils.getCAS(document), script);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 9, "Peter Kluegl", "Marshall Schor",
"Joern Kottmann", "PeterKluegl", "MarshallSchor", "JoernKottmann", "Peter<x>Kluegl",
@@ -71,10 +71,7 @@ public class WSDictionaryTest {
String script = "WORDLIST list = 'org/apache/uima/ruta/WSDictionaryTestList.txt';";
script += "MARKFAST(T1, list, true, 0, false);";
- Map<String, Object> map = new HashMap<>();
- map.put(RutaEngine.PARAM_DICT_REMOVE_WS, true);
- CAS cas = RutaTestUtils.getCAS(document);
- Ruta.apply(cas, script, map);
+ CAS cas = executeAnalysis(RutaTestUtils.getCAS(document), script);
RutaTestUtils.assertAnnotationsEquals(cas, 1, 9, "Peter Kluegl", "Marshall Schor",
"Joern Kottmann", "PeterKluegl", "MarshallSchor", "JoernKottmann", "Peter<x>Kluegl",
@@ -84,7 +81,7 @@ public class WSDictionaryTest {
}
@Test
- public void testTableWithWS() {
+ public void testTableWithWS() throws ResourceInitializationException, IOException, InvalidXMLException, SAXException {
String document = "Peter Kluegl, Marshall Schor, Joern Kottmann\n";
document += "PeterKluegl, MarshallSchor, JoernKottmann\n";
document += "Peter<x>Kluegl, Marshall<x>Schor, Joern<x>Kottmann\n";
@@ -102,15 +99,8 @@ public class WSDictionaryTest {
list.add(new TestFeature(fn1, "", "uima.cas.String"));
String fn2 = "system";
list.add(new TestFeature(fn2, "", "uima.cas.String"));
- CAS cas = null;
- try {
- cas = RutaTestUtils.getCAS(document, complexTypes, features);
- Map<String, Object> map = new HashMap<>();
- map.put(RutaEngine.PARAM_DICT_REMOVE_WS, true);
- Ruta.apply(cas, script, map);
- } catch (Exception e) {
- e.printStackTrace();
- }
+
+ CAS cas = executeAnalysis(RutaTestUtils.getCAS(document, complexTypes, features), script);
Type t = null;
AnnotationIndex<AnnotationFS> ai = null;
@@ -182,4 +172,16 @@ public class WSDictionaryTest {
cas.release();
}
+
+ private CAS executeAnalysis(CAS cas, String script) {
+ try {
+ Map<String, Object> map = new HashMap<>();
+ map.put(RutaEngine.PARAM_DICT_REMOVE_WS, true);
+ Ruta.apply(cas, script, map);
+ } catch (Exception e) {
+ fail("Failed to execute analysis engine. Reason: " + e.getMessage());
+ }
+ return cas;
+ }
+
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java Mon Apr 15 12:48:34 2019
@@ -22,14 +22,11 @@ package org.apache.uima.ruta.action;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
@@ -37,21 +34,16 @@ import org.apache.uima.cas.FeatureStruct
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class CreateTest {
@Test
- public void test() throws AnalysisEngineProcessException, InvalidXMLException,
- ResourceInitializationException, ResourceConfigurationException, URISyntaxException,
- IOException {
+ public void test() throws Exception {
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java Mon Apr 15 12:48:34 2019
@@ -19,32 +19,24 @@
package org.apache.uima.ruta.action;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.FeatureMatch1Test;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class ImplicitActionTest {
@Test
- public void test() throws AnalysisEngineProcessException, InvalidXMLException,
- ResourceInitializationException, ResourceConfigurationException, URISyntaxException,
- IOException {
+ public void test() throws Exception {
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
@@ -93,9 +85,7 @@ public class ImplicitActionTest {
}
@Test
- public void testChangeOffsets()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testChangeOffsets() throws Exception {
String text = "text 2 3 x 4 1";
String script = "";
script += "NUM{->T1};";
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/LabelAtActionTest.java Mon Apr 15 12:48:34 2019
@@ -18,23 +18,15 @@
*/
package org.apache.uima.ruta.action;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class LabelAtActionTest {
@Test
- public void test() throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void test() throws Exception {
String document = "This is a test.";
String script = "CW{-> t:T1}->{t{->T2};};";
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MacroActionTest.java Mon Apr 15 12:48:34 2019
@@ -19,16 +19,9 @@
package org.apache.uima.ruta.action;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class MacroActionTest {
@@ -77,9 +70,7 @@ public class MacroActionTest {
}
@Test
- public void testVariable()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testVariable() throws Exception {
String document = "Test";
String script = "INT j;\n";
script += "ACTION inc(VAR INT var, INT i) = ASSIGN(var,var+i);\n";
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java Mon Apr 15 12:48:34 2019
@@ -19,16 +19,9 @@
package org.apache.uima.ruta.action;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class Shift1Test {
@@ -42,9 +35,9 @@ public class Shift1Test {
cas.release();
}
-
+
@Test
- public void testOverlapping() throws ResourceInitializationException, InvalidXMLException, IOException, AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testOverlapping() throws Exception {
String text = "text 2 3 x 4";
String script = "";
script += "NUM+{->T1};";
@@ -54,5 +47,5 @@ public class Shift1Test {
RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "2 3", "3 x 4", "4");
cas.release();
}
-
+
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftWithLowMemoryProfileTest.java Mon Apr 15 12:48:34 2019
@@ -21,33 +21,27 @@ package org.apache.uima.ruta.action;
import static org.junit.Assert.assertEquals;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
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.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
/**
* There was a {@link NullPointerException} when calling
- * {@link org.apache.uima.ruta.type.RutaBasic#getEndAnchors(org.apache.uima.cas.Type)}
- * with a type that is not annotated in the CAS when running on the low memory profile. This
- * test ensures this bug does not come back.
+ * {@link org.apache.uima.ruta.type.RutaBasic#getEndAnchors(org.apache.uima.cas.Type)} with a type
+ * that is not annotated in the CAS when running on the low memory profile. This test ensures this
+ * bug does not come back.
*/
public class ShiftWithLowMemoryProfileTest {
@Test
- public void testWithLowMemory() throws AnalysisEngineProcessException, InvalidXMLException, ResourceConfigurationException, IOException, URISyntaxException, ResourceInitializationException {
+ public void testWithLowMemory() throws Exception {
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
Map<String, Object> parameters = new HashMap<String, Object>();
@@ -56,7 +50,6 @@ public class ShiftWithLowMemoryProfileTe
CAS cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION,
namespace + "/" + name + ".txt", parameters, 50);
-
Type t = cas.getTypeSystem().getType("org.apache.uima.ruta.type.W");
AnnotationIndex<AnnotationFS> ai = cas.getAnnotationIndex(t);
assertEquals(1, ai.size());
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/ForEachBlockTest.java Mon Apr 15 12:48:34 2019
@@ -19,20 +19,14 @@
package org.apache.uima.ruta.block;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.seed.TextSeeder;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Ignore;
import org.junit.Test;
@@ -69,9 +63,7 @@ public class ForEachBlockTest {
@Test
@Ignore
- public void testPerformance()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testPerformance() throws Exception {
int lines = 10000;
StringBuilder sb = new StringBuilder();
@@ -127,9 +119,7 @@ public class ForEachBlockTest {
}
@Test
- public void testRigthToLeft()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testRigthToLeft() throws Exception {
String script = "NUM{-> T1};";
script += "FOREACH(t) T1{}{\n";
script += "n:T1 SPECIAL.ct==\"^\" t{-> t.begin = n.begin};\n";
@@ -142,9 +132,7 @@ public class ForEachBlockTest {
}
@Test
- public void testEnforcedLeftToRigthInComposedWithDebbugging()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testEnforcedLeftToRigthInComposedWithDebbugging() throws Exception {
String script = "NUM{-> T1};";
script += "FOREACH(t) T1{}{\n";
script += "(n:@T1{->UNMARK(T1)} SPECIAL.ct==\"^\" t){-> t.begin = n.begin};\n";
@@ -160,9 +148,7 @@ public class ForEachBlockTest {
}
@Test
- public void testDirection()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testDirection() throws Exception {
String script = "NUM{-> T1};";
script += "FOREACH(t,true) T1{}{\n";
script += "(# t{-PARTOF(T2)}){->T2};\n";
@@ -178,7 +164,6 @@ public class ForEachBlockTest {
cas.release();
}
-
@Test
public void testComposed() throws Exception {
String script = "NUM{-> T1};";
@@ -192,8 +177,7 @@ public class ForEachBlockTest {
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "4x2^3");
cas.release();
}
-
-
+
@Test
public void testConditionMacro() throws Exception {
String script = "CONDITION isSmall() = REGEXP(\".\");\n";
@@ -207,7 +191,7 @@ public class ForEachBlockTest {
RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "1");
cas.release();
}
-
+
@Test
public void testWithContainingBlock() throws Exception {
String script = "";
@@ -225,7 +209,5 @@ public class ForEachBlockTest {
RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "1", "22", "333");
cas.release();
}
-
-
-
+
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/block/RutaScriptBlockTest.java Mon Apr 15 12:48:34 2019
@@ -19,16 +19,10 @@
package org.apache.uima.ruta.block;
-import java.io.IOException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class RutaScriptBlockTest {
@@ -61,8 +55,7 @@ public class RutaScriptBlockTest {
}
@Test
- public void testExternalBlockCall() throws ResourceInitializationException, InvalidXMLException,
- IOException, AnalysisEngineProcessException, CASException {
+ public void testExternalBlockCall() throws Exception {
String script = "SCRIPT org.apache.uima.ruta.ScriptWithStackedBlocks;";
script += "(# PERIOD){-> T3} (# PERIOD){->T4};";
script += "T3{-> CALL(ScriptWithStackedBlocks.First)};";
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java Mon Apr 15 12:48:34 2019
@@ -19,18 +19,12 @@
package org.apache.uima.ruta.condition;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class ContainsTest {
@@ -45,19 +39,20 @@ public class ContainsTest {
RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "A single sentence", "And here is another one",
"Testing the CONTAINS condition of Ruta");
RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Testing the CONTAINS condition of Ruta");
- RutaTestUtils.assertAnnotationsEquals(cas, 4, 2, "A single sentence", "Testing the CONTAINS condition of Ruta");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 2, "A single sentence",
+ "Testing the CONTAINS condition of Ruta");
cas.release();
}
-
+
@Test
- public void testAlias() throws ResourceInitializationException, InvalidXMLException, IOException, AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testAlias() throws Exception {
String document = "1 some text; 2 some text; 3 some text;";
-
+
String script = "IMPORT PACKAGE * FROM org.apache.uima.ruta.ImportStatementsTestTypeSystemWithManyPackages AS ruta;";
script += "(NUM # PM){-> ruta.Type1, T1};";
script += "Document{CONTAINS(ruta.Type1) -> T2};";
-
+
Map<String, String> typeMap = new TreeMap<String, String>();
String typeName = "org.apache.uima.ruta.other3.Type1";
typeMap.put(typeName, "uima.tcas.Annotation");
@@ -66,29 +61,28 @@ public class ContainsTest {
CAS cas = RutaTestUtils.getCAS(document, typeMap, null);
Ruta.apply(cas, script);
-
- RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "1 some text;", "2 some text;", "3 some text;");
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "1 some text;", "2 some text;",
+ "3 some text;");
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, document);
-
+
}
-
+
@Test
- public void testContainsOverlappingAnnotations() throws ResourceInitializationException,
- InvalidXMLException, IOException, AnalysisEngineProcessException,
- ResourceConfigurationException, URISyntaxException {
-
- String document = "1 2 3 4 5 6 7 8";
-
- String script = "(\"1\" # \"5\") {-> T1};";
- script += "(\"3\" # \"8\") {-> T1};";
- script += "(\"3\" # \"4\") {-> T1};";
- script += "(\"3\" # \"5\") {-> T2};";
- script += "T2{CONTAINS(T1,1,1)-> T3};";
-
- CAS cas = RutaTestUtils.getCAS(document);
- Ruta.apply(cas, script);
-
- RutaTestUtils.assertAnnotationsEquals(cas, 3, 1);
-
+ public void testContainsOverlappingAnnotations() throws Exception {
+
+ String document = "1 2 3 4 5 6 7 8";
+
+ String script = "(\"1\" # \"5\") {-> T1};";
+ script += "(\"3\" # \"8\") {-> T1};";
+ script += "(\"3\" # \"4\") {-> T1};";
+ script += "(\"3\" # \"5\") {-> T2};";
+ script += "T2{CONTAINS(T1,1,1)-> T3};";
+
+ CAS cas = RutaTestUtils.getCAS(document);
+ Ruta.apply(cas, script);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1);
+
}
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java Mon Apr 15 12:48:34 2019
@@ -21,20 +21,14 @@ package org.apache.uima.ruta.condition;
import static org.junit.Assert.assertEquals;
-import java.io.IOException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
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.jcas.JCas;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Assert;
import org.junit.Test;
@@ -45,27 +39,27 @@ public class ContextCountTest {
CAS cas = RutaTestUtils.processTestScript(this.getClass());
- RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "A single sentence",
- "And here is another one", "Testing the CONTEXTCOUNT condition of Ruta System");
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "A single sentence", "And here is another one",
+ "Testing the CONTEXTCOUNT condition of Ruta System");
RutaTestUtils.assertAnnotationsEquals(cas, 2, 4, "A", "And", "Testing", "Ruta");
Type t = RutaTestUtils.getTestType(cas, 3);
AnnotationIndex<AnnotationFS> ai = cas.getAnnotationIndex(t);
assertEquals(1, ai.size());
FSIterator<AnnotationFS> iterator = ai.iterator();
- assertEquals("A single sentence." + "And here is another one."
- + "Testing the CONTEXTCOUNT condition of Ruta System.", iterator.next()
- .getCoveredText().replaceAll("[\n\r]", ""));
+ assertEquals(
+ "A single sentence." + "And here is another one."
+ + "Testing the CONTEXTCOUNT condition of Ruta System.",
+ iterator.next().getCoveredText().replaceAll("[\n\r]", ""));
cas.release();
}
@Test
- public void testIndex() throws CASException, ResourceInitializationException,
- InvalidXMLException, IOException, AnalysisEngineProcessException {
+ public void testIndex() throws Exception {
JCas jcas = RutaTestUtils.getCAS("A B C a b c").getJCas();
Assert.assertTrue(Ruta.matches(jcas,
- "INT index; CW{CONTEXTCOUNT(Document,index,index)} # @SW{CONTEXTCOUNT(Document,0,100,index)-> MARK(T1,1,3)};"));
+ "INT index; CW{CONTEXTCOUNT(Document,index,index)} # @SW{CONTEXTCOUNT(Document,0,100,index)-> MARK(T1,1,3)};"));
RutaTestUtils.assertAnnotationsEquals(jcas.getCas(), 1, 3, "A B C a", "B C a b", "C a b c");
}
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java Mon Apr 15 12:48:34 2019
@@ -19,16 +19,9 @@
package org.apache.uima.ruta.condition;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class CountTest {
@@ -37,24 +30,23 @@ public class CountTest {
public void test() {
CAS cas = RutaTestUtils.processTestScript(this.getClass());
-
+
RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "A single sentence", "And here is another one",
"Testing the COUNT condition of Ruta System");
RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Testing the COUNT condition of Ruta System");
RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Testing the COUNT condition of Ruta System");
-
- cas.release();
+
+ cas.release();
}
-
+
@Test
- public void testCountWithPeriodPostfix() throws ResourceInitializationException, InvalidXMLException,
- IOException, AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
-
+ public void testCountWithPeriodPostfix() throws Exception {
+
String document = "Some text.";
String script = "(CW SW) {-> T1};";
- script +="INT i = 0;";
- script +="T1{COUNT(PERIOD, i)};";
- script +="Document{(i>0)-> T2};";
+ script += "INT i = 0;";
+ script += "T1{COUNT(PERIOD, i)};";
+ script += "Document{(i>0)-> T2};";
CAS cas = RutaTestUtils.getCAS(document);
Ruta.apply(cas, script);
RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java Mon Apr 15 12:48:34 2019
@@ -19,29 +19,21 @@
package org.apache.uima.ruta.condition;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class FeatureTest {
@Test
- public void test() throws AnalysisEngineProcessException, InvalidXMLException,
- ResourceInitializationException, ResourceConfigurationException, URISyntaxException,
- IOException {
+ public void test() throws Exception {
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition1Test.java Mon Apr 15 12:48:34 2019
@@ -19,31 +19,23 @@
package org.apache.uima.ruta.condition;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.FeatureMatch1Test;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class ImplicitCondition1Test {
@Test
- public void test() throws AnalysisEngineProcessException, InvalidXMLException,
- ResourceInitializationException, ResourceConfigurationException, URISyntaxException,
- IOException {
+ public void test() throws Exception {
String name = this.getClass().getSimpleName();
String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ImplicitCondition2Test.java Mon Apr 15 12:48:34 2019
@@ -19,15 +19,9 @@
package org.apache.uima.ruta.condition;
-import java.io.IOException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Assert;
import org.junit.Test;
@@ -63,8 +57,7 @@ public class ImplicitCondition2Test {
}
@Test
- public void testStringCompare() throws ResourceInitializationException, InvalidXMLException,
- IOException, AnalysisEngineProcessException, CASException {
+ public void testStringCompare() throws Exception {
String document = "a b. a b.";
CAS cas = RutaTestUtils.getCAS(document);
Assert.assertTrue(Ruta.matches(cas.getJCas(), "(w:W # W{W.ct==w.ct}){->T1};"));
@@ -74,8 +67,7 @@ public class ImplicitCondition2Test {
}
@Test
- public void testStringCompareNull() throws ResourceInitializationException, InvalidXMLException,
- IOException, AnalysisEngineProcessException, CASException {
+ public void testStringCompareNull() throws Exception {
String document = "a b. a b.";
CAS cas = RutaTestUtils.getCAS(document);
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MacroConditionTest.java Mon Apr 15 12:48:34 2019
@@ -19,16 +19,9 @@
package org.apache.uima.ruta.condition;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Test;
public class MacroConditionTest {
@@ -78,9 +71,7 @@ public class MacroConditionTest {
}
@Test
- public void testVariable()
- throws ResourceInitializationException, InvalidXMLException, IOException,
- AnalysisEngineProcessException, ResourceConfigurationException, URISyntaxException {
+ public void testVariable() throws Exception {
String document = "This is a Test.";
String script = "INT j;\n";
script += "CONDITION cc(VAR INT var) = TOTALCOUNT(W,1,1000,var);\n";
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/descriptor/GenerateDescriptorTest.java Mon Apr 15 12:48:34 2019
@@ -19,13 +19,10 @@
package org.apache.uima.ruta.descriptor;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
-import org.antlr.runtime.RecognitionException;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
@@ -33,7 +30,6 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.Type;
import org.apache.uima.fit.util.CasUtil;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.resource.impl.ResourceManager_impl;
import org.apache.uima.resource.metadata.ConfigurationParameterSettings;
@@ -42,7 +38,6 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.ruta.engine.HtmlAnnotator;
import org.apache.uima.ruta.engine.RutaEngine;
-import org.apache.uima.util.InvalidXMLException;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -72,8 +67,7 @@ public class GenerateDescriptorTest {
}
@Test
- public void testCreateAnalysisEngineDescription()
- throws InvalidXMLException, IOException, RecognitionException, URISyntaxException {
+ public void testCreateAnalysisEngineDescription() throws Exception {
String script = "";
script += "PACKAGE test.package;\n";
@@ -117,8 +111,7 @@ public class GenerateDescriptorTest {
}
@Test
- public void testCreateTypeSystemDescription() throws URISyntaxException, IOException,
- RecognitionException, InvalidXMLException, ResourceInitializationException {
+ public void testCreateTypeSystemDescription() throws Exception {
String script = "";
script += "PACKAGE test.package;\n";
@@ -187,8 +180,7 @@ public class GenerateDescriptorTest {
}
@Test
- public void testRuleScriptName() throws URISyntaxException, IOException, RecognitionException,
- InvalidXMLException, ResourceInitializationException {
+ public void testRuleScriptName() throws Exception {
String script = "";
script += "PACKAGE test.package;\n";
Modified: uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java
URL: http://svn.apache.org/viewvc/uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java?rev=1857574&r1=1857573&r2=1857574&view=diff
==============================================================================
--- uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java (original)
+++ uima/uv3/ruta-v3/trunk/ruta-core/src/test/java/org/apache/uima/ruta/engine/CascadedModifierTest.java Mon Apr 15 12:48:34 2019
@@ -21,32 +21,23 @@ package org.apache.uima.ruta.engine;
import static org.junit.Assert.assertEquals;
-import java.io.IOException;
-import java.net.URISyntaxException;
import java.net.URL;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
-import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
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.resource.ResourceConfigurationException;
-import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
-import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
import org.junit.Test;
-import org.xml.sax.SAXException;
public class CascadedModifierTest {
@Test
- public void test() throws IOException, URISyntaxException, InvalidXMLException,
- ResourceInitializationException, ResourceConfigurationException,
- AnalysisEngineProcessException, SAXException {
+ public void test() throws Exception {
URL url = RutaEngine.class.getClassLoader().getResource("AAE.xml");
if (url == null) {