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 2015/04/29 13:53:30 UTC
svn commit: r1676719 [3/5] - in /uima/ruta/trunk/ruta-core/src:
main/java/org/apache/uima/ruta/engine/ test/java/org/apache/uima/ruta/
test/java/org/apache/uima/ruta/action/
test/java/org/apache/uima/ruta/condition/
test/java/org/apache/uima/ruta/engine/
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java Wed Apr 29 11:53:18 2015
@@ -19,16 +19,12 @@
package org.apache.uima.ruta;
-import static org.junit.Assert.assertEquals;
-
import java.util.Map;
import java.util.TreeMap;
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -51,13 +47,8 @@ public class SubAtomicTest {
e.printStackTrace();
assert (false);
}
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(0, ai.size());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 0);
Type type1 = cas.getTypeSystem().getType("org.apache.uima.SubAtomic1");
Type type2 = cas.getTypeSystem().getType("org.apache.uima.SubAtomic2");
@@ -73,40 +64,13 @@ public class SubAtomicTest {
e.printStackTrace();
assert (false);
}
-
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Jochen", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("hen", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Joc", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 4);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Jochen", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 5);
- ai = cas.getAnnotationIndex(t);
- assertEquals(0, ai.size());
-
- if (cas != null) {
- cas.release();
- }
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Jochen");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "hen");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Joc");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "Jochen");
+ RutaTestUtils.assertAnnotationsEquals(cas, 5, 0);
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/TypeAliasTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/TypeAliasTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/TypeAliasTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/TypeAliasTest.java Wed Apr 29 11:53:18 2015
@@ -73,9 +73,6 @@ public class TypeAliasTest {
assertEquals("Peter", iterator.next().getCoveredText());
assertEquals("Peter", iterator.next().getCoveredText());
- if (cas != null) {
- cas.release();
- }
-
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WSDictionaryTest.java Wed Apr 29 11:53:18 2015
@@ -55,28 +55,11 @@ public class WSDictionaryTest {
} catch (Exception e) {
e.printStackTrace();
}
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 9, "Peter Kluegl", "Marshall Schor", "Joern Kottmann", "PeterKluegl",
+ "MarshallSchor", "JoernKottmann", "Peter<x>Kluegl", "Marshall<x>Schor", "Joern<x>Kottmann");
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(9, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl", iterator.next().getCoveredText());
- assertEquals("Marshall Schor", iterator.next().getCoveredText());
- assertEquals("Joern Kottmann", iterator.next().getCoveredText());
- assertEquals("PeterKluegl", iterator.next().getCoveredText());
- assertEquals("MarshallSchor", iterator.next().getCoveredText());
- assertEquals("JoernKottmann", iterator.next().getCoveredText());
- assertEquals("Peter<x>Kluegl", iterator.next().getCoveredText());
- assertEquals("Marshall<x>Schor", iterator.next().getCoveredText());
- assertEquals("Joern<x>Kottmann", iterator.next().getCoveredText());
- if (cas != null) {
- cas.release();
- }
-
+ cas.release();
}
@Test
@@ -96,27 +79,10 @@ public class WSDictionaryTest {
e.printStackTrace();
}
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(9, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl", iterator.next().getCoveredText());
- assertEquals("Marshall Schor", iterator.next().getCoveredText());
- assertEquals("Joern Kottmann", iterator.next().getCoveredText());
- assertEquals("PeterKluegl", iterator.next().getCoveredText());
- assertEquals("MarshallSchor", iterator.next().getCoveredText());
- assertEquals("JoernKottmann", iterator.next().getCoveredText());
- assertEquals("Peter<x>Kluegl", iterator.next().getCoveredText());
- assertEquals("Marshall<x>Schor", iterator.next().getCoveredText());
- assertEquals("Joern<x>Kottmann", iterator.next().getCoveredText());
- if (cas != null) {
- cas.release();
- }
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 9, "Peter Kluegl", "Marshall Schor", "Joern Kottmann", "PeterKluegl",
+ "MarshallSchor", "JoernKottmann", "Peter<x>Kluegl", "Marshall<x>Schor", "Joern<x>Kottmann");
+ cas.release();
}
@Test
@@ -213,11 +179,7 @@ public class WSDictionaryTest {
v2 = next.getStringValue(f2);
assertEquals("Joern Kottmann", v1);
assertEquals("CAS Editor", v2);
-
- if (cas != null) {
- cas.release();
- }
+ cas.release();
}
-
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard1Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard1Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard1Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard1Test.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,160 +27,42 @@ public class WildCard1Test {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals(cas.getDocumentText().length(), iterator.next().getCoveredText().length());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The Ruta language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 4);
- ai = cas.getAnnotationIndex(t);
- assertEquals(8, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 5);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The Ruta language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 6);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The Ruta language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 7);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals(cas.getDocumentText(), iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 8);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals(cas.getDocumentText(), iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 9);
- ai = cas.getAnnotationIndex(t);
- assertEquals(2, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 10);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The Ruta language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 11);
- ai = cas.getAnnotationIndex(t);
- assertEquals(9, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 12);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The Ruta language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 13);
- ai = cas.getAnnotationIndex(t);
- assertEquals(8, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 14);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("The Ruta language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 16);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 17);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(4, ai.size());
- assertEquals("The", iterator.next().getCoveredText());
- assertEquals("If", iterator.next().getCoveredText());
- assertEquals("The", iterator.next().getCoveredText());
- assertEquals("The", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 18);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 19);
- ai = cas.getAnnotationIndex(t);
- assertEquals(8, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 20);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 21);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 22);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 23);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 24);
- ai = cas.getAnnotationIndex(t);
- assertEquals(2, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 25);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 26);
- ai = cas.getAnnotationIndex(t);
- assertEquals(9, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 27);
- ai = cas.getAnnotationIndex(t);
- assertEquals(4, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 28);
- ai = cas.getAnnotationIndex(t);
- assertEquals(8, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 29);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
-
- if (cas != null) {
- cas.release();
- }
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ final String TEXT = "The Ruta language is an imperative rule language extended with scripting elements";
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, cas.getDocumentText());
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "The");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, TEXT + ".");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 8);
+ RutaTestUtils.assertAnnotationsEquals(cas, 5, 1, TEXT);
+ RutaTestUtils.assertAnnotationsEquals(cas, 6, 1, TEXT);
+ RutaTestUtils.assertAnnotationsEquals(cas, 7, 1, cas.getDocumentText());
+ RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, cas.getDocumentText());
+ RutaTestUtils.assertAnnotationsEquals(cas, 9, 2);
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 10, 1, TEXT);
+ RutaTestUtils.assertAnnotationsEquals(cas, 11, 9);
+ RutaTestUtils.assertAnnotationsEquals(cas, 12, 1, TEXT + ".");
+ RutaTestUtils.assertAnnotationsEquals(cas, 13, 8);
+ RutaTestUtils.assertAnnotationsEquals(cas, 14, 1, TEXT + ".");
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 16, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 17, 4, "The", "If", "The", "The");
+ RutaTestUtils.assertAnnotationsEquals(cas, 18, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 19, 8);
+ RutaTestUtils.assertAnnotationsEquals(cas, 20, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 21, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 22, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 23, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 24, 2);
+ RutaTestUtils.assertAnnotationsEquals(cas, 25, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 26, 9);
+ RutaTestUtils.assertAnnotationsEquals(cas, 27, 4);
+ RutaTestUtils.assertAnnotationsEquals(cas, 28, 8);
+ RutaTestUtils.assertAnnotationsEquals(cas, 29, 1);
+
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard2Test.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -55,38 +49,14 @@ public class WildCard2Test {
} catch (Exception e) {
e.printStackTrace();
}
-
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(2, ai.size());
- iterator = ai.iterator();
- assertEquals("Ogren, P.V., Wetzler, P.G., Bethard, S.:", iterator.next().getCoveredText());
- assertEquals("Stephen Soderland, Claire Cardie, and Raymond Mooney.", iterator.next()
- .getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(2, ai.size());
- iterator = ai.iterator();
- assertEquals("ClearTK: A UIMA Toolkit for Statistical Natural Language Processing.", iterator
- .next().getCoveredText());
- assertEquals("Learning Information Extraction Rules for Semi-Structured and Free Text.",
- iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(2, ai.size());
- iterator = ai.iterator();
- assertEquals("2008", iterator.next().getCoveredText());
- assertEquals("1999", iterator.next().getCoveredText());
- if (cas != null) {
- cas.release();
- }
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "Ogren, P.V., Wetzler, P.G., Bethard, S.:",
+ "Stephen Soderland, Claire Cardie, and Raymond Mooney.");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 2,
+ "ClearTK: A UIMA Toolkit for Statistical Natural Language Processing.",
+ "Learning Information Extraction Rules for Semi-Structured and Free Text.");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 2, "2008", "1999");
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard3Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard3Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard3Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCard3Test.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,66 +27,17 @@ public class WildCard3Test {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor,", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor,", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 4);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 5);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor, and", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 6);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 7);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor,", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 8);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor, and others.", iterator.next().getCoveredText());
-
-
- if (cas != null) {
- cas.release();
- }
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Peter Kluegl, Joern Kottmann, Marshall Schor,");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Peter Kluegl, Joern Kottmann, Marshall Schor,");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "Peter Kluegl, Joern Kottmann, Marshall");
+ RutaTestUtils.assertAnnotationsEquals(cas, 5, 1, "Peter Kluegl, Joern Kottmann, Marshall Schor, and");
+ RutaTestUtils.assertAnnotationsEquals(cas, 6, 1, "Peter Kluegl, Joern Kottmann, Marshall Schor");
+ RutaTestUtils.assertAnnotationsEquals(cas, 7, 1, "Peter Kluegl, Joern Kottmann, Marshall Schor,");
+ RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, "Peter Kluegl, Joern Kottmann, Marshall Schor, and others.");
+
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,27 +27,11 @@ public class AddFilterTypeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals(" text<br/>", iterator.next().getCoveredText());
-
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, " text<br/>");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,27 +27,11 @@ public class AddRetainTypeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals(" text<br/>", iterator.next().getCoveredText());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, " text<br/>");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,28 +27,12 @@ public class ClearTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- cas.release();
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1);
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java Wed Apr 29 11:53:18 2015
@@ -151,10 +151,6 @@ public class CreateTest {
assertEquals("Test", ((AnnotationFS) fv1).getCoveredText());
- if (cas != null) {
- cas.release();
- }
-
+ cas.release();
}
-
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,26 +27,10 @@ public class FilterTypeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals(" text<br/>", iterator.next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, " text<br/>");
cas.release();
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java Wed Apr 29 11:53:18 2015
@@ -131,9 +131,6 @@ public class GatherTest {
assertEquals("A", v1.getCoveredText());
assertEquals(null, v2);
- if (cas != null) {
- cas.release();
- }
-
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,22 +27,11 @@ public class GetFeatureTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50, false, false, null, null);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,32 +27,13 @@ public class GetListTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- cas.release();
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1);
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1);
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,26 +27,11 @@ public class GetTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
- assertEquals("Only", ai.iterator().next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- cas.release();
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Only");
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ImplicitActionTest.java Wed Apr 29 11:53:18 2015
@@ -19,8 +19,6 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -28,10 +26,6 @@ import java.util.Map;
import java.util.TreeMap;
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.ruta.FeatureMatch1Test;
import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
@@ -82,45 +76,13 @@ public class ImplicitActionTest {
} catch (Exception e) {
e.printStackTrace();
assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl", iterator.next().getCoveredText());
- assertEquals("Joern Kottmann", iterator.next().getCoveredText());
- assertEquals("Marshall Schor", iterator.next().getCoveredText());
+ }
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(3, ai.size());
- assertEquals("Peter", iterator.next().getCoveredText());
- assertEquals("Joern", iterator.next().getCoveredText());
- assertEquals("Marshall", iterator.next().getCoveredText());
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "Peter Kluegl", "Joern Kottmann", "Marshall Schor");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "Peter", "Joern", "Marshall");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "Peter", "Joern", "Marshall");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 3, "Peter", "Joern", "Marshall");
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(3, ai.size());
- assertEquals("Peter", iterator.next().getCoveredText());
- assertEquals("Joern", iterator.next().getCoveredText());
- assertEquals("Marshall", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 4);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(3, ai.size());
- assertEquals("Peter", iterator.next().getCoveredText());
- assertEquals("Joern", iterator.next().getCoveredText());
- assertEquals("Marshall", iterator.next().getCoveredText());
- if (cas != null) {
- cas.release();
- }
-
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -45,34 +39,11 @@ public class MarkFastTest {
e.printStackTrace();
assert (false);
}
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
- iterator = ai.iterator();
- assertEquals("1 0 0", iterator.next().getCoveredText());
- assertEquals("100", iterator.next().getCoveredText());
- assertEquals("2 0 0", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(0, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("100", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 4);
- ai = cas.getAnnotationIndex(t);
- assertEquals(2, ai.size());
- iterator = ai.iterator();
- assertEquals("1 0 0", iterator.next().getCoveredText());
- assertEquals("2 0 0", iterator.next().getCoveredText());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "1 0 0", "100", "2 0 0");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "100");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 2, "1 0 0", "2 0 0");
cas.release();
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFirstActionTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.Ruta;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -44,19 +38,8 @@ public class MarkFirstActionTest {
e.printStackTrace();
}
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("Peter", iterator.next().getCoveredText());
-
- if (cas != null) {
- cas.release();
- }
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Peter");
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,27 +27,10 @@ public class MarkLastTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("text", iterator.next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "text");
cas.release();
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,34 +27,11 @@ public class MarkOnceTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(3, ai.size());
- assertEquals("only", iterator.next().getCoveredText());
- assertEquals("some", iterator.next().getCoveredText());
- assertEquals("text", iterator.next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("only some text", iterator.next().getCoveredText());
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "only", "some", "text");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "only some text");
cas.release();
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,28 +27,11 @@ public class MarkScoreTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(2, ai.size());
- assertEquals("Like a Headline:", iterator.next().getCoveredText());
- assertEquals("Headline", iterator.next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 2, "Like a Headline:","Headline");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java Wed Apr 29 11:53:18 2015
@@ -112,10 +112,8 @@ public class MarkTableTest {
v1 = next.getStringValue(f1);
v2 = next.getStringValue(f2);
assertEquals("Joern", v1);
- assertEquals("CAS Editor", v2);
-
-
- cas.release();
+ assertEquals("CAS Editor", v2);
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,35 +27,11 @@ public class MarkTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(3, ai.size());
- assertEquals("only", iterator.next().getCoveredText());
- assertEquals("some", iterator.next().getCoveredText());
- assertEquals("text", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("only some text", iterator.next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "only", "some", "text");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "only some text");
cas.release();
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,24 +27,11 @@ public class MatchedTextTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- cas.release();
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,28 +27,12 @@ public class MergeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
-
- cas.release();
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1);
+
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,24 +27,11 @@ public class RemoveDuplicateTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- cas.release();
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,27 +27,11 @@ public class RemoveFilterTypeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("some text", iterator.next().getCoveredText());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "some text");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,27 +27,11 @@ public class RemoveRetainTypeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals(" text<br/>", iterator.next().getCoveredText());
-
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, " text<br/>");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,24 +27,11 @@ public class RemoveTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(1, ai.size());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1);
+
cas.release();
-
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java Wed Apr 29 11:53:18 2015
@@ -35,17 +35,9 @@ public class ReplaceTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
Type t = null;
AnnotationIndex<AnnotationFS> ai = null;
FSIterator<AnnotationFS> iterator = null;
@@ -59,7 +51,6 @@ public class ReplaceTest {
String stringValue = afs.getStringValue(feature);
assertEquals("MARKUP", stringValue);
- cas.release();
-
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,33 +27,11 @@ public class RetainTypeTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(2, ai.size());
- assertEquals(" some", iterator.next().getCoveredText());
- assertEquals(" text", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("text<br/>", iterator.next().getCoveredText());
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, " some"," text");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "text<br/>");
cas.release();
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift1Test.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,27 +27,11 @@ public class Shift1Test {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("only some text<br/>", iterator.next().getCoveredText());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "only some text<br/>");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift2Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift2Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift2Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/Shift2Test.java Wed Apr 29 11:53:18 2015
@@ -80,6 +80,7 @@ public class Shift2Test {
assertEquals("only some text<br/>", v1.getCoveredText());
assertEquals("unknown", v2);
assertEquals("only some text", next.getCoveredText());
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java Wed Apr 29 11:53:18 2015
@@ -56,44 +56,14 @@ public class TrieTest {
e.printStackTrace();
assert (false);
}
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter", iterator.next().getCoveredText());
- assertEquals("Marshall", iterator.next().getCoveredText());
- assertEquals("Joern", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
- iterator = ai.iterator();
- assertEquals("Kluegl", iterator.next().getCoveredText());
- assertEquals("Schor", iterator.next().getCoveredText());
- assertEquals("Kottmann", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl", iterator.next().getCoveredText());
- assertEquals("Marshall Schor", iterator.next().getCoveredText());
- assertEquals("Joern Kottmann", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 4);
- ai = cas.getAnnotationIndex(t);
- assertEquals(3, ai.size());
- iterator = ai.iterator();
- assertEquals("Peter Kluegl: Ruta", iterator.next().getCoveredText());
- assertEquals("Marshall Schor: UIMA", iterator.next().getCoveredText());
- assertEquals("Joern Kottmann: CAS Editor", iterator.next().getCoveredText());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "Peter", "Marshall", "Joern");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "Kluegl", "Schor", "Kottmann");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "Peter Kluegl", "Marshall Schor", "Joern Kottmann");
+ RutaTestUtils.assertAnnotationsEquals(cas, 4, 3, "Peter Kluegl: Ruta", "Marshall Schor: UIMA",
+ "Joern Kottmann: CAS Editor");
cas.release();
-
}
}
@@ -182,8 +152,6 @@ public class TrieTest {
assertEquals("Joern Kottmann", next.getCoveredText());
assertEquals(6, next.getIntValue(feature));
- if (cas != null) {
- cas.release();
- }
+ cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,39 +27,13 @@ public class TrimTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("some text", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("some text", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("some text", iterator.next().getCoveredText());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "some text");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "some text");
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "some text");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java Wed Apr 29 11:53:18 2015
@@ -19,14 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
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.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -34,43 +27,13 @@ public class UnmarkAllTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
- FSIterator<AnnotationFS> iterator = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(1, ai.size());
- assertEquals("Some", iterator.next().getCoveredText());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(0, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- iterator = ai.iterator();
- assertEquals(6, ai.size());
- assertEquals("Some", iterator.next().getCoveredText());
- assertEquals("text", iterator.next().getCoveredText());
- assertEquals("for", iterator.next().getCoveredText());
- assertEquals("some", iterator.next().getCoveredText());
- assertEquals("test", iterator.next().getCoveredText());
- assertEquals(".", iterator.next().getCoveredText());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some");
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 6, "Some", "text", "for", "some", "test", ".");
+
cas.release();
}
}
Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java Wed Apr 29 11:53:18 2015
@@ -19,13 +19,7 @@
package org.apache.uima.ruta.action;
-import static org.junit.Assert.assertEquals;
-
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.ruta.engine.RutaEngine;
import org.apache.uima.ruta.engine.RutaTestUtils;
import org.junit.Test;
@@ -33,32 +27,13 @@ public class UnmarkTest {
@Test
public void test() {
- String name = this.getClass().getSimpleName();
- String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
-
- CAS cas = null;
- try {
- cas = RutaTestUtils.process(namespace + "/" + name + RutaEngine.SCRIPT_FILE_EXTENSION, namespace + "/" + name
- + ".txt", 50);
- } catch (Exception e) {
- e.printStackTrace();
- assert (false);
- }
- Type t = null;
- AnnotationIndex<AnnotationFS> ai = null;
-
- t = RutaTestUtils.getTestType(cas, 1);
- ai = cas.getAnnotationIndex(t);
- assertEquals(0, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 2);
- ai = cas.getAnnotationIndex(t);
- assertEquals(0, ai.size());
-
- t = RutaTestUtils.getTestType(cas, 3);
- ai = cas.getAnnotationIndex(t);
- assertEquals(0, ai.size());
-
+
+ CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+ RutaTestUtils.assertAnnotationsEquals(cas, 1, 0);
+ RutaTestUtils.assertAnnotationsEquals(cas, 2, 0);
+ RutaTestUtils.assertAnnotationsEquals(cas, 3, 0);
+
cas.release();
}
}