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 [2/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/LoadResourceFromClassPathTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadResourceFromClassPathTest.java Wed Apr 29 11:53:18 2015
@@ -68,27 +68,14 @@ public class LoadResourceFromClassPathTe
     } catch (Exception e) {
       e.printStackTrace();
     }
+    
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "Peter", "Marshall", "Joern");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "Kluegl", "Schor", "Kottmann");
 
     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());
-    
     AnnotationFS next = null;
     String v1 = null;
     String v2 = null;
@@ -116,19 +103,9 @@ public class LoadResourceFromClassPathTe
     assertEquals("Joern", v1);
     assertEquals("CAS Editor", v2);
     
-    t = RutaTestUtils.getTestType(cas, 3);
-    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());
-
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "Peter", "Marshall", "Joern");
 
+    cas.release();
   }
 
   @Test
@@ -161,26 +138,13 @@ public class LoadResourceFromClassPathTe
       e.printStackTrace();
     }
 
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "Peter", "Marshall", "Joern");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "Kluegl", "Schor", "Kottmann");
+
     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());
-
     AnnotationFS next = null;
     String v1 = null;
     String v2 = null;
@@ -208,18 +172,8 @@ public class LoadResourceFromClassPathTe
     assertEquals("Joern", v1);
     assertEquals("CAS Editor", v2);
 
-    t = RutaTestUtils.getTestType(cas, 3);
-    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());
-
-
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "Peter", "Marshall", "Joern");
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LoadScriptFromClassPathTest.java Wed Apr 29 11:53:18 2015
@@ -19,16 +19,10 @@
 
 package org.apache.uima.ruta;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.HashMap;
 import java.util.Map;
 
 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.RutaEngine;
 import org.apache.uima.ruta.engine.RutaTestUtils;
@@ -54,174 +48,29 @@ public class LoadScriptFromClassPathTest
       e.printStackTrace();
     }
 
-    Type t = null;
-    AnnotationIndex<AnnotationFS> ai = null;
-    FSIterator<AnnotationFS> iterator = null;
-
-    t = RutaTestUtils.getTestType(cas, 1);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(4, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(0, ai.size());
-
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(5, ai.size());
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo und Georg", iterator.next().getCoveredText());
-    assertEquals("und Georg", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals(",", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 6);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("Peter, Jochen,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 7);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(5, ai.size());
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 8);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(5, ai.size());
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo und Georg", iterator.next().getCoveredText());
-    assertEquals("und Georg", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 9);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("Peter, Jochen, Flo", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 10);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("Peter, Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 11);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("Peter, Jochen, Flo und Georg.", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo und Georg.", iterator.next().getCoveredText());
-    assertEquals("Flo und Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 12);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(6, ai.size());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 13);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(6, ai.size());
-    assertEquals("Peter,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 14);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("Peter, Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 15);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Peter, Jochen", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 16);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 17);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Flo und Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 18);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-    assertEquals("Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 20);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Peter, Jochen", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 21);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 22);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Flo und Georg.", iterator.next().getCoveredText());
-
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 4, "Peter", "Jochen", "Flo", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 0);
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 5, "Peter", "Jochen", "Flo und Georg", "und Georg", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 2, ",", ",");
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 2, "Peter, Jochen,", "Jochen,");
+    RutaTestUtils.assertAnnotationsEquals(cas, 7, 5, "Peter", "Jochen", "Flo", "und", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 8, 5, "Peter", "Jochen", "Flo und Georg", "und Georg", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 9, 2, "Peter, Jochen, Flo", "Jochen, Flo");
+    RutaTestUtils.assertAnnotationsEquals(cas, 10, 3, "Peter, Jochen, Flo und", "Jochen, Flo und", "Flo und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 11, 3, "Peter, Jochen, Flo und Georg.", "Jochen, Flo und Georg.",
+            "Flo und Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 12, 6, ",", ",", ",", "und", "und", "und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 13, 6, "Peter,", "Jochen,", "Jochen,", "Flo und", "Flo und", "Flo und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 14, 3, "Peter, Jochen, Flo und", "Jochen, Flo und", "Flo und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 15, 1, "Peter, Jochen");
+    RutaTestUtils.assertAnnotationsEquals(cas, 16, 1, "Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 17, 1, "Flo und Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 18, 3, "Peter,", "Jochen,", "Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 20, 1, "Peter, Jochen");
+    RutaTestUtils.assertAnnotationsEquals(cas, 21, 1, "Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 22, 1, "Flo und Georg.");
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ManualAnchoringTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ManualAnchoringTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ManualAnchoringTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ManualAnchoringTest.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;
@@ -47,19 +41,8 @@ public class ManualAnchoringTest {
       e.printStackTrace();
     }
 
-    Type t = null;
-    AnnotationIndex<AnnotationFS> ai = null;
-    FSIterator<AnnotationFS> iterator = null;
-
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("A, B and C", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "A, B and C");
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java Wed Apr 29 11:53:18 2015
@@ -19,21 +19,13 @@
 
 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;
 
 public class MarkInGreedyComposedTest {
 
-  
-  
   @Test
   public void testWildCardFollowedByComposedReversed() {
     String document = "1 x f B e d B x c A b a A 1";
@@ -47,22 +39,11 @@ public class MarkInGreedyComposedTest {
       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(2, ai.size());
-    assertEquals("x f B e d B", iterator.next().getCoveredText());
-    assertEquals("x c A b a A", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "x f B e d B", "x c A b a A");
+
+    cas.release();
   }
-  
+
   @Test
   public void testSimpleFollowedByComposedReversed() {
     String document = "1 x f B x c A 1";
@@ -76,23 +57,11 @@ public class MarkInGreedyComposedTest {
       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(2, ai.size());
-    assertEquals("x f B", iterator.next().getCoveredText());
-    assertEquals("x c A", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "x f B", "x c A");
+
+    cas.release();
   }
-  
-  
+
   @Test
   public void testWildCardFollowedByComposed() {
     String document = "A c b A c x A c b A c x";
@@ -106,26 +75,11 @@ public class MarkInGreedyComposedTest {
       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(2, ai.size());
-    assertEquals("A c b A c x", iterator.next().getCoveredText());
-    assertEquals("A c b A c x", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
-  }
-  
-  
-  
-  
-  
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "A c b A c x", "A c b A c x");
+
+    cas.release();
+  }
+
   @Test
   public void testWildCardFollowedByCondition() {
     String document = "A A b A c X X b X c";
@@ -140,30 +94,12 @@ public class MarkInGreedyComposedTest {
       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(2, ai.size());
-    assertEquals("A A b A c", iterator.next().getCoveredText());
-    assertEquals("X X b X c", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("A A b A c", iterator.next().getCoveredText());
-    assertEquals("X X b X c", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "A A b A c", "X X b X c");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "A A b A c", "X X b X c");
 
+    cas.release();
   }
-  
+
   @Test
   public void testWithWildCard() {
     String document = "1 . 2 .";
@@ -177,23 +113,11 @@ public class MarkInGreedyComposedTest {
       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(2, ai.size());
-    assertEquals("1 .", iterator.next().getCoveredText());
-    assertEquals("2 .", iterator.next().getCoveredText());
-
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "1 .", "2 .");
 
+    cas.release();
   }
-  
+
   @Test
   public void test() {
     String document = "1 . 2 .";
@@ -207,23 +131,8 @@ public class MarkInGreedyComposedTest {
       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(2, ai.size());
-    assertEquals("1 .", iterator.next().getCoveredText());
-    assertEquals("2 .", iterator.next().getCoveredText());
-
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "1 .", "2 .");
 
+    cas.release();
   }
-  
-  
-  
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NBSPWSTest.java Wed Apr 29 11:53:18 2015
@@ -19,12 +19,7 @@
 
 package org.apache.uima.ruta;
 
-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.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.junit.Test;
@@ -45,16 +40,8 @@ public class NBSPWSTest {
       e.printStackTrace();
     }
 
-    Type t = null;
-    AnnotationIndex<AnnotationFS> ai = null;
-
-    t = RutaTestUtils.getTestType(cas, 1);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(5, ai.size());
-
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 5);
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NestedDisjunctiveTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NestedDisjunctiveTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NestedDisjunctiveTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NestedDisjunctiveTest.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;
@@ -49,22 +43,8 @@ public class NestedDisjunctiveTest {
       e.printStackTrace();
     }
 
-    Type t = null;
-    AnnotationIndex<AnnotationFS> ai = null;
-    FSIterator<AnnotationFS> iterator = null;
-
-    t = RutaTestUtils.getTestType(cas, 1);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(4, ai.size());
-    iterator = ai.iterator();
-    assertEquals("X", iterator.next().getCoveredText());
-    assertEquals("X", iterator.next().getCoveredText());
-    assertEquals("X", iterator.next().getCoveredText());
-    assertEquals("X", iterator.next().getCoveredText());
-
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 4, "X", "X", "X", "X");
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/NullExpressionTest.java Wed Apr 29 11:53:18 2015
@@ -19,18 +19,12 @@
 
 package org.apache.uima.ruta;
 
-import static org.junit.Assert.assertEquals;
-
 import java.util.ArrayList;
 import java.util.List;
 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.Ruta;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.apache.uima.ruta.engine.RutaTestUtils.TestFeature;
@@ -77,50 +71,13 @@ public class NullExpressionTest {
       e.printStackTrace();
     }
 
-    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("Some text.", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Some text.", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Some text.", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Some text.", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Some text.", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 6);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Some text.", iterator.next().getCoveredText());
-    
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Some text.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Some text.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "Some text.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "Some text.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 1, "Some text.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 1, "Some text.");
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java Wed Apr 29 11:53:18 2015
@@ -19,62 +19,23 @@
 
 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.RutaEngine;
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.junit.Test;
 
 public class OptionalComposedEndTest {
   @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(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("20,20", iterator.next().getCoveredText());
-    assertEquals("20", iterator.next().getCoveredText());
-    assertEquals("20,20", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("20,20", iterator.next().getCoveredText());
-    assertEquals("20", iterator.next().getCoveredText());
-    assertEquals("20,20", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("20,20", iterator.next().getCoveredText());
-    assertEquals("20", iterator.next().getCoveredText());
-    assertEquals("20,20", iterator.next().getCoveredText());
     
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "20,20", "20", "20,20");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "20,20", "20", "20,20");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "20,20", "20", "20,20");
+
     cas.release();
-  }
-  
+  }  
   
   @Test
   public void testDisjunctive() {
@@ -89,21 +50,8 @@ public class OptionalComposedEndTest {
       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("0.0", iterator.next().getCoveredText());
-    assertEquals("0", iterator.next().getCoveredText());
-    
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "0.0", "0");
 
-    if (cas != null) {
-      cas.release();
-    }
+    cas.release();
   }
-  
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalDisjunctiveBeforeAnchoringTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalDisjunctiveBeforeAnchoringTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalDisjunctiveBeforeAnchoringTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalDisjunctiveBeforeAnchoringTest.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;
@@ -46,33 +40,10 @@ public class OptionalDisjunctiveBeforeAn
       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(2, ai.size());
-    assertEquals("0.3", iterator.next().getCoveredText());
-    assertEquals("0.7", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("0.3-0.7", iterator.next().getCoveredText());
-    assertEquals("0.3", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("0.3-0.7", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "0.3", "0.7");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "0.3-0.7", "0.3");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "0.3-0.7");
 
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java Wed Apr 29 11:53:18 2015
@@ -19,49 +19,19 @@
 
 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;
 
 public class OutOfWindowTest {
   @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);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter, Jochen", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo", iterator.next().getCoveredText());
-    assertEquals("Lena, Beate", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Jochen, Flo", iterator.next().getCoveredText());
 
-    
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "Peter, Jochen", "Jochen, Flo", "Lena, Beate");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "Jochen, Flo");
+
     cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier1Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier1Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier1Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier1Test.java Wed Apr 29 11:53:18 2015
@@ -19,158 +19,33 @@
 
 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;
 
 public class Quantifier1Test {
   @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(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B B", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B B", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 6);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 7);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B B", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 8);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B B", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 9);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B B", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 10);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 11);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B", iterator.next().getCoveredText());
-    assertEquals("A B B", iterator.next().getCoveredText());
-    assertEquals("A", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 12);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A C", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 13);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A C", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 14);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A B B C", iterator.next().getCoveredText());
-    assertEquals("A C", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 15);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A B B C", iterator.next().getCoveredText());
-    assertEquals("A C", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 16);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A B B C", iterator.next().getCoveredText());
+    
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
 
-    t = RutaTestUtils.getTestType(cas, 17);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A B B C", iterator.next().getCoveredText());
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "A B", "A B", "A");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 3, "A", "A", "A");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 3, "A B", "A B B", "A");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 3, "A", "A", "A");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 2, "A B", "A B B");
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 2, "A B", "A B");
+    RutaTestUtils.assertAnnotationsEquals(cas, 7, 1, "A B B");
+    RutaTestUtils.assertAnnotationsEquals(cas, 8, 1, "A B B");
+    RutaTestUtils.assertAnnotationsEquals(cas, 9, 2, "A B", "A B B");
+    RutaTestUtils.assertAnnotationsEquals(cas, 10, 3, "A B", "A B", "A");
+    RutaTestUtils.assertAnnotationsEquals(cas, 11, 3, "A B", "A B B", "A");
+    RutaTestUtils.assertAnnotationsEquals(cas, 12, 2, "A B C", "A C");
+    RutaTestUtils.assertAnnotationsEquals(cas, 13, 2, "A B C", "A C");
+    RutaTestUtils.assertAnnotationsEquals(cas, 14, 3, "A B C", "A B B C", "A C");
+    RutaTestUtils.assertAnnotationsEquals(cas, 15, 3, "A B C", "A B B C", "A C");
+    RutaTestUtils.assertAnnotationsEquals(cas, 16, 2, "A B C", "A B B C");
+    RutaTestUtils.assertAnnotationsEquals(cas, 17, 2, "A B C", "A B B C");
 
     cas.release();
   }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier2Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier2Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier2Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier2Test.java Wed Apr 29 11:53:18 2015
@@ -19,64 +19,21 @@
 
 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;
 
 public class Quantifier2Test {
   @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(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A3 A4", iterator.next().getCoveredText());
-    assertEquals("A4 A5", iterator.next().getCoveredText());
-    assertEquals("A6 A7", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A1 B B A2", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(0, ai.size());
-
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(4, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A1 B B A2", iterator.next().getCoveredText());
-    assertEquals("A3 A4", iterator.next().getCoveredText());
-    assertEquals("A4 A5", iterator.next().getCoveredText());
-    assertEquals("A6 A7", iterator.next().getCoveredText());
+    
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
 
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(0, ai.size());
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 3, "A3 A4", "A4 A5", "A6 A7");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "A1 B B A2");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 0);
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 4, "A1 B B A2", "A3 A4", "A4 A5", "A6 A7");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 0);
 
     cas.release();
   }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier3Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier3Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier3Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier3Test.java Wed Apr 29 11:53:18 2015
@@ -19,60 +19,22 @@
 
 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;
 
 public class Quantifier3Test {
   @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("Big Big Big", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Big Big Big", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(0, ai.size());
-
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Big Big Big", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(0, ai.size());
-    
+
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "Big Big Big");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "Big Big Big");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 0);
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "Big Big Big");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 0);
+
     cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier4Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier4Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier4Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier4Test.java Wed Apr 29 11:53:18 2015
@@ -19,40 +19,18 @@
 
 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;
 
 public class Quantifier4Test {
   @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("org.apache.uima.ruta.type.CW", iterator.next().getCoveredText());
-    
+
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "org.apache.uima.ruta.type.CW");
+
     cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier5Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier5Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier5Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier5Test.java Wed Apr 29 11:53:18 2015
@@ -19,55 +19,20 @@
 
 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;
 
 public class Quantifier5Test {
   @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, 5);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter geht zur Arbeit", iterator.next().getCoveredText());
-    assertEquals("Peter zur Arbeit", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 6);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter geht zur Arbeit", iterator.next().getCoveredText());
-    assertEquals("Peter zur Arbeit", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 7);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter geht zur Arbeit", iterator.next().getCoveredText());
-    assertEquals("zur Arbeit", iterator.next().getCoveredText());
-    
+
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 2, "Peter geht zur Arbeit", "Peter zur Arbeit");
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 2, "Peter geht zur Arbeit", "Peter zur Arbeit");
+    RutaTestUtils.assertAnnotationsEquals(cas, 7, 2, "Peter geht zur Arbeit", "zur Arbeit");
+
     cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier6Test.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;
@@ -45,19 +39,9 @@ public class Quantifier6Test {
     } 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(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A1B-2C3-D4E", iterator.next().getCoveredText());
-    
-    if(cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "A1B-2C3-D4E");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier7Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier7Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier7Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier7Test.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;
@@ -47,20 +41,9 @@ public class Quantifier7Test {
     } catch (Exception e) {
       e.printStackTrace();
     }
-    
-    Type t = null;
-    AnnotationIndex<AnnotationFS> ai = null;
-    FSIterator<AnnotationFS> iterator = null;
-    
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
 
-    assertEquals(1, ai.size());
-    iterator = ai.iterator();
-    assertEquals("H 1 2 3, i 1 2 3, i 1 2 3, i 1 2 3,", iterator.next().getCoveredText());
-    
-    if(cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "H 1 2 3, i 1 2 3, i 1 2 3, i 1 2 3,");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier8Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier8Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier8Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/Quantifier8Test.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;
@@ -46,34 +40,11 @@ public class Quantifier8Test {
     } 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("A B C D", iterator.next().getCoveredText());
-    assertEquals("A B D", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C D", iterator.next().getCoveredText());
-    assertEquals("A B D", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C D", iterator.next().getCoveredText());
-    assertEquals("A B D", iterator.next().getCoveredText());
-    
-    if(cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 2, "A B C D", "A B D");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 2, "A B C D", "A B D");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 2, "A B C D", "A B D");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java Wed Apr 29 11:53:18 2015
@@ -80,42 +80,11 @@ public class RegExpRuleTest {
     assertEquals(1, ai.size());
     assertEquals(26, iterator.next().getCoveredText().length());
 
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("y", iterator.next().getCoveredText());
-    assertEquals("z", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("y", iterator.next().getCoveredText());
-    assertEquals("z", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("B", iterator.next().getCoveredText());
-    assertEquals("B", iterator.next().getCoveredText());
-    assertEquals("B", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 6);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("y", iterator.next().getCoveredText());
-    assertEquals("z", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 7);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("ByB", iterator.next().getCoveredText());
-    assertEquals("BzB", iterator.next().getCoveredText());
-    assertEquals("BB", iterator.next().getCoveredText());
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 2, "y", "z");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 2, "y", "z");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 3, "B", "B", "B");
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 2, "y", "z");
+    RutaTestUtils.assertAnnotationsEquals(cas, 7, 3, "ByB", "BzB", "BB");
 
     t = cas.getTypeSystem().getType(typeName);
     ai = cas.getAnnotationIndex(t);
@@ -169,10 +138,6 @@ public class RegExpRuleTest {
     booleanValue = next.getBooleanValue(t.getFeatureByBaseName(fn2));
     assertEquals(false, booleanValue);
 
-    
-    if (cas != null) {
-      cas.release();
-    }
-
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RemoveDocumentAnnotationTest.java Wed Apr 29 11:53:18 2015
@@ -19,21 +19,13 @@
 
 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;
 
 public class RemoveDocumentAnnotationTest {
 
-  
-  
   @Test
   public void testWildCardFollowedByComposedReversed() {
     String document = "some text";
@@ -52,46 +44,11 @@ public class RemoveDocumentAnnotationTes
       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("some", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("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());
-    
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("some text", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("some text", iterator.next().getCoveredText());
-    
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 1, "some");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "text");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 1, "some text");
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 1, "some text");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 1, "some text");
+    cas.release();
   }
-  
- 
-  
-  
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ReverseQuantifierTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ReverseQuantifierTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ReverseQuantifierTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/ReverseQuantifierTest.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;
@@ -45,32 +39,10 @@ public class ReverseQuantifierTest {
     } 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(4, ai.size());
-    iterator = ai.iterator();
-    assertEquals("A B C", iterator.next().getCoveredText());
-    assertEquals("A C", iterator.next().getCoveredText());
-    assertEquals("B C", iterator.next().getCoveredText());
-    assertEquals("C", iterator.next().getCoveredText());
-    
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(4, ai.size());
-    iterator = ai.iterator();
-    // TODO: is this really correct? the rule elements should not match at all!
-    assertEquals("B C", iterator.next().getCoveredText());
-    assertEquals("C", iterator.next().getCoveredText());
-    assertEquals("B C", iterator.next().getCoveredText());
-    assertEquals("C", iterator.next().getCoveredText());
-    
-    if(cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 4, "A B C", "A C", "B C", "C");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 4, "B C", "C", "B C", "C");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference1Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference1Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference1Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference1Test.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,184 +27,32 @@ public class RuleInference1Test {
 
   @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(4, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 3);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(0, ai.size());
-
-    t = RutaTestUtils.getTestType(cas, 4);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(5, ai.size());
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo und Georg", iterator.next().getCoveredText());
-    assertEquals("und Georg", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 5);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals(",", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 6);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("Peter, Jochen,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 7);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(5, ai.size());
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 8);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(5, ai.size());
-    assertEquals("Peter", iterator.next().getCoveredText());
-    assertEquals("Jochen", iterator.next().getCoveredText());
-    assertEquals("Flo und Georg", iterator.next().getCoveredText());
-    assertEquals("und Georg", iterator.next().getCoveredText());
-    assertEquals("Georg", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 9);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(2, ai.size());
-    assertEquals("Peter, Jochen, Flo", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 10);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("Peter, Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 11);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("Peter, Jochen, Flo und Georg.", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo und Georg.", iterator.next().getCoveredText());
-    assertEquals("Flo und Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 12);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(6, ai.size());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals(",", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-    assertEquals("und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 13);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(6, ai.size());
-    assertEquals("Peter,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 14);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(3, ai.size());
-    assertEquals("Peter, Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
-    assertEquals("Flo und", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 15);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Peter, Jochen", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 16);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 17);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Flo und Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 18);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(3, ai.size());
-    iterator = ai.iterator();
-    assertEquals("Peter,", iterator.next().getCoveredText());
-    assertEquals("Jochen,", iterator.next().getCoveredText());
-    assertEquals("Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 20);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Peter, Jochen", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 21);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Georg.", iterator.next().getCoveredText());
-
-    t = RutaTestUtils.getTestType(cas, 22);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("Flo und Georg.", iterator.next().getCoveredText());
-
-    if (cas != null) {
-      cas.release();
-    }
 
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 1, 4, "Peter", "Jochen", "Flo", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 3, 0);
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 5, "Peter", "Jochen", "Flo und Georg", "und Georg", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 5, 2, ",", ",");
+    RutaTestUtils.assertAnnotationsEquals(cas, 6, 2, "Peter, Jochen,", "Jochen,");
+    RutaTestUtils.assertAnnotationsEquals(cas, 7, 5, "Peter", "Jochen", "Flo", "und", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 8, 5, "Peter", "Jochen", "Flo und Georg", "und Georg", "Georg");
+    RutaTestUtils.assertAnnotationsEquals(cas, 9, 2, "Peter, Jochen, Flo", "Jochen, Flo");
+    RutaTestUtils.assertAnnotationsEquals(cas, 10, 3, "Peter, Jochen, Flo und", "Jochen, Flo und", "Flo und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 11, 3, "Peter, Jochen, Flo und Georg.", "Jochen, Flo und Georg.",
+            "Flo und Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 12, 6, ",", ",", ",", "und", "und", "und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 13, 6, "Peter,", "Jochen,", "Jochen,", "Flo und", "Flo und", "Flo und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 14, 3, "Peter, Jochen, Flo und", "Jochen, Flo und", "Flo und");
+    RutaTestUtils.assertAnnotationsEquals(cas, 15, 1, "Peter, Jochen");
+    RutaTestUtils.assertAnnotationsEquals(cas, 16, 1, "Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 17, 1, "Flo und Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 18, 3, "Peter,", "Jochen,", "Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 20, 1, "Peter, Jochen");
+    RutaTestUtils.assertAnnotationsEquals(cas, 21, 1, "Georg.");
+    RutaTestUtils.assertAnnotationsEquals(cas, 22, 1, "Flo und Georg.");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference2Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference2Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference2Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference2Test.java Wed Apr 29 11:53:18 2015
@@ -19,53 +19,27 @@
 
 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;
 
 public class RuleInference2Test {
 
+  
   @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(8, ai.size());
-    iterator = ai.iterator();
-    assertEquals("References", iterator.next().getCoveredText());
-    assertEquals("Bergmark, D. (2000). Automatic extraction of reference linking information from online docu-", iterator.next().getCoveredText());
-    assertEquals("ments. Technical Report CSTR2000-1821, Cornell Digital Library Research Group.", iterator.next().getCoveredText());
-    assertEquals("Bergmark, D., Phempoonpanich, P., and Zhao, S. (2001). Scraping the ACM digital library.", iterator.next().getCoveredText());
-    assertEquals("SIGIR Forum, 35(2):1–7.", iterator.next().getCoveredText());
-    assertEquals("Berkowitz, E. and Elkhadiri, M. R. (2004). Creation of a style independent intelligent au-", iterator.next().getCoveredText());
-    assertEquals("tonomous citation indexer to support academic research. In Proceedings of the the Fifteenth", iterator.next().getCoveredText());
-    assertEquals("Midwest Artificial Intelligence and Cognitive Science conference MAICS 2004, pages 68–73.", iterator.next().getCoveredText());
-
-   
-
-    if (cas != null) {
-      cas.release();
-    }
 
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 8, "References",
+            "Bergmark, D. (2000). Automatic extraction of reference linking information from online docu-",
+            "ments. Technical Report CSTR2000-1821, Cornell Digital Library Research Group.",
+            "Bergmark, D., Phempoonpanich, P., and Zhao, S. (2001). Scraping the ACM digital library.",
+            "SIGIR Forum, 35(2):1–7.",
+            "Berkowitz, E. and Elkhadiri, M. R. (2004). Creation of a style independent intelligent au-",
+            "tonomous citation indexer to support academic research. In Proceedings of the the Fifteenth",
+            "Midwest Artificial Intelligence and Cognitive Science conference MAICS 2004, pages 68–73.");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference3Test.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference3Test.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference3Test.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInference3Test.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,35 +27,11 @@ public class RuleInference3Test {
 
   @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, 4);
-    ai = cas.getAnnotationIndex(t);
-    assertEquals(4, ai.size());
-       
-    iterator = ai.iterator();
-    assertEquals("[1]", iterator.next().getCoveredText());
-    assertEquals("[2]", iterator.next().getCoveredText());
-    assertEquals("[3]", iterator.next().getCoveredText());
-    assertEquals("[4]", iterator.next().getCoveredText());
-
-   
-
-    if (cas != null) {
-      cas.release();
-    }
 
+    CAS cas = RutaTestUtils.processTestScript(this.getClass());
+
+    RutaTestUtils.assertAnnotationsEquals(cas, 4, 4, "[1]", "[2]", "[3]", "[4]");
+
+    cas.release();
   }
 }

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SidestepInComposedTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SidestepInComposedTest.java?rev=1676719&r1=1676718&r2=1676719&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SidestepInComposedTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SidestepInComposedTest.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;
@@ -44,19 +38,9 @@ public class SidestepInComposedTest {
     } catch (Exception e) {
       e.printStackTrace();
     }
-
-    Type t = null;
-    AnnotationIndex<AnnotationFS> ai = null;
-    FSIterator<AnnotationFS> iterator = null;
-
-    t = RutaTestUtils.getTestType(cas, 2);
-    ai = cas.getAnnotationIndex(t);
-    iterator = ai.iterator();
-    assertEquals(1, ai.size());
-    assertEquals("15", iterator.next().getCoveredText());
     
-    if (cas != null) {
-      cas.release();
-    }
+    RutaTestUtils.assertAnnotationsEquals(cas, 2, 1, "15");
+      
+    cas.release();
   }
 }