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 2013/04/29 15:50:19 UTC

svn commit: r1477079 [1/2] - in /uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta: action/ condition/

Author: pkluegl
Date: Mon Apr 29 13:50:17 2013
New Revision: 1477079

URL: http://svn.apache.org/r1477079
Log:
UIMA-2850
- renaming

Modified:
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/SetFeatureTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest2.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AfterTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AndTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/BeforeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CurrentCountTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/EndsWithTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/FeatureTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/IfTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/InListTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/IsTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/LastTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/MOfNTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/NearTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/NotTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/OrTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ParseTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/PartOfNEQTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/PartOfTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/PositionTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/RegExpTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ScoreTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/SizeTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/StartsWithTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/TotalCountTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/VoteTest.java

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddFilterTypeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class AddFilterTypeTest {
@@ -38,7 +38,7 @@ public class AddFilterTypeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class AddFilterTypeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/AddRetainTypeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class AddRetainTypeTest {
@@ -38,7 +38,7 @@ public class AddRetainTypeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class AddRetainTypeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ClearTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class ClearTest {
@@ -37,7 +37,7 @@ public class ClearTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,11 +45,11 @@ public class ClearTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/CreateTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,8 +32,8 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
-import org.apache.uima.textmarker.TextMarkerTestUtils.TestFeature;
+import org.apache.uima.ruta.RutaTestUtils;
+import org.apache.uima.ruta.RutaTestUtils.TestFeature;
 import org.junit.Test;
 
 public class CreateTest {
@@ -48,7 +48,7 @@ public class CreateTest {
     complexTypes.put(typeName, "uima.tcas.Annotation");
     
     Map<String, List<TestFeature>> features = new TreeMap<String, List<TestFeature>>();
-    List<TestFeature> list = new ArrayList<TextMarkerTestUtils.TestFeature>();
+    List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
     features.put(typeName, list);
     String fn1 = "a";
     list.add(new TestFeature(fn1, "", "uima.tcas.Annotation"));
@@ -59,7 +59,7 @@ public class CreateTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, features, namespace + "/");
     } catch (Exception e) {
       e.printStackTrace();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FillTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,7 +30,7 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class FillTest {
@@ -44,7 +44,7 @@ public class FillTest {
     complexTypes.put(type, "uima.tcas.DocumentAnnotation");
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, null);
     } catch (Exception e) {
       e.printStackTrace();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/FilterTypeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class FilterTypeTest {
@@ -38,7 +38,7 @@ public class FilterTypeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class FilterTypeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GatherTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,8 +32,8 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
-import org.apache.uima.textmarker.TextMarkerTestUtils.TestFeature;
+import org.apache.uima.ruta.RutaTestUtils;
+import org.apache.uima.ruta.RutaTestUtils.TestFeature;
 import org.junit.Test;
 
 public class GatherTest {
@@ -48,7 +48,7 @@ public class GatherTest {
     complexTypes.put(typeName, "uima.tcas.Annotation");
     
     Map<String, List<TestFeature>> features = new TreeMap<String, List<TestFeature>>();
-    List<TestFeature> list = new ArrayList<TextMarkerTestUtils.TestFeature>();
+    List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
     features.put(typeName, list);
     String fn1 = "a";
     list.add(new TestFeature(fn1, "", "uima.tcas.Annotation"));
@@ -57,7 +57,7 @@ public class GatherTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, features, namespace + "/");
     } catch (Exception e) {
       e.printStackTrace();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetFeatureTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class GetFeatureTest {
@@ -36,7 +36,7 @@ public class GetFeatureTest {
     String namespace = this.getClass().getPackage().getName().replaceAll("\\.", "/");
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, null, null);
     } catch (Exception e) {
       e.printStackTrace();
@@ -44,7 +44,7 @@ public class GetFeatureTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
    

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetListTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class GetListTest {
@@ -37,7 +37,7 @@ public class GetListTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,15 +45,15 @@ public class GetListTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/GetTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class GetTest {
@@ -37,7 +37,7 @@ public class GetTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class GetTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     assertEquals("Only", ai.iterator().next().getCoveredText());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkFastTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MarkFastTest {
@@ -38,7 +38,7 @@ public class MarkFastTest {
 
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, null, namespace + "/");
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class MarkFastTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -56,11 +56,11 @@ public class MarkFastTest {
     assertEquals("100", iterator.next().getCoveredText());
     assertEquals("2 0 0", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -68,7 +68,7 @@ public class MarkFastTest {
     assertEquals("100", iterator.next().getCoveredText());
     assertEquals("2 0 0", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
     iterator = ai.iterator();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkLastTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MarkLastTest {
@@ -38,7 +38,7 @@ public class MarkLastTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class MarkLastTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkOnceTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MarkOnceTest {
@@ -38,7 +38,7 @@ public class MarkOnceTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class MarkOnceTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -56,7 +56,7 @@ public class MarkOnceTest {
     assertEquals("some", iterator.next().getCoveredText());
     assertEquals("text", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkScoreTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MarkScoreTest {
@@ -38,7 +38,7 @@ public class MarkScoreTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class MarkScoreTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(2, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTableTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,8 +32,8 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
-import org.apache.uima.textmarker.TextMarkerTestUtils.TestFeature;
+import org.apache.uima.ruta.RutaTestUtils;
+import org.apache.uima.ruta.RutaTestUtils.TestFeature;
 import org.junit.Test;
 
 public class MarkTableTest {
@@ -48,7 +48,7 @@ public class MarkTableTest {
     complexTypes.put(typeName, "uima.tcas.Annotation");
     
     Map<String, List<TestFeature>> features = new TreeMap<String, List<TestFeature>>();
-    List<TestFeature> list = new ArrayList<TextMarkerTestUtils.TestFeature>();
+    List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
     features.put(typeName, list);
     String fn1 = "firstname";
     list.add(new TestFeature(fn1, "", "uima.cas.String"));
@@ -57,7 +57,7 @@ public class MarkTableTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, features, namespace + "/");
     } catch (Exception e) {
       e.printStackTrace();
@@ -79,7 +79,7 @@ public class MarkTableTest {
     v1 = next.getStringValue(f1);
     v2 = next.getStringValue(f2);
     assertEquals("Peter", v1);
-    assertEquals("TextMarker", v2);
+    assertEquals("Ruta", v2);
     
     next = iterator.next();
     v1 = next.getStringValue(f1);

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MarkTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MarkTest {
@@ -38,7 +38,7 @@ public class MarkTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class MarkTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -56,7 +56,7 @@ public class MarkTest {
     assertEquals("some", iterator.next().getCoveredText());
     assertEquals("text", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MatchedTextTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MatchedTextTest {
@@ -37,7 +37,7 @@ public class MatchedTextTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class MatchedTextTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/MergeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class MergeTest {
@@ -37,7 +37,7 @@ public class MergeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,11 +45,11 @@ public class MergeTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveDuplicateTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class RemoveDuplicateTest {
@@ -37,7 +37,7 @@ public class RemoveDuplicateTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class RemoveDuplicateTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveFilterTypeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class RemoveFilterTypeTest {
@@ -38,7 +38,7 @@ public class RemoveFilterTypeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class RemoveFilterTypeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveRetainTypeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class RemoveRetainTypeTest {
@@ -38,7 +38,7 @@ public class RemoveRetainTypeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class RemoveRetainTypeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RemoveTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class RemoveTest {
@@ -37,7 +37,7 @@ public class RemoveTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class RemoveTest {
     }
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ReplaceTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -27,8 +27,8 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
-import org.apache.uima.textmarker.engine.TextMarkerEngine;
+import org.apache.uima.ruta.RutaTestUtils;
+import org.apache.uima.ruta.engine.RutaEngine;
 import org.junit.Test;
 
 public class ReplaceTest {
@@ -40,7 +40,7 @@ public class ReplaceTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -50,7 +50,7 @@ public class ReplaceTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = cas.getTypeSystem().getType(TextMarkerEngine.BASIC_TYPE);
+    t = cas.getTypeSystem().getType(RutaEngine.BASIC_TYPE);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     iterator.moveToLast();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/RetainTypeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class RetainTypeTest {
@@ -38,7 +38,7 @@ public class RetainTypeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,14 +48,14 @@ public class RetainTypeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    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 = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/SetFeatureTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/SetFeatureTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/SetFeatureTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/SetFeatureTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,7 +30,7 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class SetFeatureTest {
@@ -44,7 +44,7 @@ public class SetFeatureTest {
     complexTypes.put(type, "uima.tcas.DocumentAnnotation");
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, null);
     } catch (Exception e) {
       e.printStackTrace();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class ShiftTest {
@@ -38,7 +38,7 @@ public class ShiftTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class ShiftTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest2.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest2.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/ShiftTest2.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -33,8 +33,8 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
-import org.apache.uima.textmarker.TextMarkerTestUtils.TestFeature;
+import org.apache.uima.ruta.RutaTestUtils;
+import org.apache.uima.ruta.RutaTestUtils.TestFeature;
 import org.junit.Test;
 
 public class ShiftTest2 {
@@ -49,7 +49,7 @@ public class ShiftTest2 {
     complexTypes.put(typeName, "uima.tcas.Annotation");
     
     Map<String, List<TestFeature>> features = new TreeMap<String, List<TestFeature>>();
-    List<TestFeature> list = new ArrayList<TextMarkerTestUtils.TestFeature>();
+    List<TestFeature> list = new ArrayList<RutaTestUtils.TestFeature>();
     features.put(typeName, list);
     String fn1 = "doc";
     list.add(new TestFeature(fn1, "", "uima.tcas.Annotation"));
@@ -58,7 +58,7 @@ public class ShiftTest2 {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, features, namespace + "/");
     } catch (Exception e) {
       e.printStackTrace();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TransferTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,7 +30,7 @@ import org.apache.uima.cas.Feature;
 import org.apache.uima.cas.Type;
 import org.apache.uima.cas.text.AnnotationFS;
 import org.apache.uima.cas.text.AnnotationIndex;
-import org.apache.uima.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class TransferTest {
@@ -44,7 +44,7 @@ public class TransferTest {
     complexTypes.put(type, "uima.tcas.DocumentAnnotation");
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, null);
     } catch (Exception e) {
       e.printStackTrace();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrieTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class TrieTest {
@@ -38,7 +38,7 @@ public class TrieTest {
 
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, null, namespace + "/");
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,7 +48,7 @@ public class TrieTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -56,7 +56,7 @@ public class TrieTest {
     assertEquals("Marshall", iterator.next().getCoveredText());
     assertEquals("Joern", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/TrimTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class TrimTest {
@@ -38,7 +38,7 @@ public class TrimTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,19 +48,19 @@ public class TrimTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("some text", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("some text", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkAllTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class UnmarkAllTest {
@@ -38,7 +38,7 @@ public class UnmarkAllTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,13 +48,13 @@ public class UnmarkAllTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Some", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     for (AnnotationFS annotationFS : ai) {
       System.out.println(annotationFS);
@@ -62,7 +62,7 @@ public class UnmarkAllTest {
     iterator = ai.iterator();
     assertEquals(0, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(6, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/action/UnmarkTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.action;
+package org.apache.uima.ruta.action;
 
 import static org.junit.Assert.assertEquals;
 
@@ -25,7 +25,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class UnmarkTest {
@@ -37,7 +37,7 @@ public class UnmarkTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,15 +46,15 @@ public class UnmarkTest {
     Type t = null;
     AnnotationIndex<AnnotationFS> ai = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AfterTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AfterTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AfterTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AfterTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class AfterTest {
@@ -38,7 +38,7 @@ public class AfterTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,14 +48,14 @@ public class AfterTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
     iterator = ai.iterator();
     assertEquals(".", iterator.next().getCoveredText());
     assertEquals(".", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(8, ai.size());
     iterator = ai.iterator();
@@ -68,7 +68,7 @@ public class AfterTest {
     assertEquals("is", iterator.next().getCoveredText());
     assertEquals("marked", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(9, ai.size());
     iterator = ai.iterator();
@@ -82,7 +82,7 @@ public class AfterTest {
     assertEquals("is", iterator.next().getCoveredText());
     assertEquals("marked", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(9, ai.size());
     iterator = ai.iterator();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AndTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AndTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AndTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/AndTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class AndTest {
@@ -38,7 +38,7 @@ public class AndTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,22 +48,22 @@ public class AndTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
     assertEquals("This is a malformed text", iterator.next().getCoveredText());
     assertEquals("But others have many of them", iterator.next().getCoveredText());
-    assertEquals("Like this one that is written to test the AND Condition of TextMarker",
+    assertEquals("Like this one that is written to test the AND Condition of Ruta",
             iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("some sentences do not start with a capital word", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     iterator = ai.iterator();
@@ -72,7 +72,7 @@ public class AndTest {
     assertEquals("But", iterator.next().getCoveredText());
     assertEquals("Like", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -80,7 +80,7 @@ public class AndTest {
     assertEquals("But", iterator.next().getCoveredText());
     assertEquals("Like", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/BeforeTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/BeforeTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/BeforeTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/BeforeTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class BeforeTest {
@@ -38,7 +38,7 @@ public class BeforeTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,29 +48,29 @@ public class BeforeTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("To mark everything before a special annotation",
             iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
     iterator = ai.iterator();
     assertEquals("To mark everything before a special annotation",
             iterator.next().getCoveredText());
-    assertEquals("you need the BEFORE condition of TextMarker",
+    assertEquals("you need the BEFORE condition of Ruta",
             iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
     iterator = ai.iterator();
     assertEquals("To mark everything before a special annotation",
             iterator.next().getCoveredText());
-    assertEquals("you need the BEFORE condition of TextMarker",
+    assertEquals("you need the BEFORE condition of Ruta",
             iterator.next().getCoveredText());
     
     cas.release();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContainsTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class ContainsTest {
@@ -38,7 +38,7 @@ public class ContainsTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,36 +48,36 @@ public class ContainsTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
     assertEquals("And here is another one", iterator.next().getCoveredText());
-    assertEquals("Testing the CONTAINS condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the CONTAINS condition of Ruta", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
     assertEquals("And here is another one", iterator.next().getCoveredText());
-    assertEquals("Testing the CONTAINS condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the CONTAINS condition of Ruta", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("Testing the CONTAINS condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the CONTAINS condition of Ruta", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
-    assertEquals("Testing the CONTAINS condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the CONTAINS condition of Ruta", iterator.next().getCoveredText());
     
-    //TODO CONTAINS with TextMarkerExpression?
+    //TODO CONTAINS with RutaExpression?
     
     cas.release();
   }

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class ContextCountTest {
@@ -38,7 +38,7 @@ public class ContextCountTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,15 +48,15 @@ public class ContextCountTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
     assertEquals("And here is another one", iterator.next().getCoveredText());
-    assertEquals("Testing the CONTEXTCOUNT condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the CONTEXTCOUNT condition of Ruta", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     iterator = ai.iterator();
@@ -65,13 +65,13 @@ public class ContextCountTest {
     assertEquals("Testing", iterator.next().getCoveredText());
     assertEquals("Text", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("A single sentence." +
             "And here is another one." +
-            "Testing the CONTEXTCOUNT condition of TextMarker.",
+            "Testing the CONTEXTCOUNT condition of Ruta.",
             iterator.next().getCoveredText().replaceAll("[\n\r]", ""));
     
     cas.release();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java?rev=1477079&r1=1477078&r2=1477079&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java Mon Apr 29 13:50:17 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.condition;
+package org.apache.uima.ruta.condition;
 
 import static org.junit.Assert.assertEquals;
 
@@ -26,7 +26,7 @@ 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.textmarker.TextMarkerTestUtils;
+import org.apache.uima.ruta.RutaTestUtils;
 import org.junit.Test;
 
 public class CountTest {
@@ -38,7 +38,7 @@ public class CountTest {
     
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50);
     } catch (Exception e) {
       e.printStackTrace();
@@ -48,25 +48,25 @@ public class CountTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
     assertEquals("And here is another one", iterator.next().getCoveredText());
-    assertEquals("Testing the COUNT condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the COUNT condition of Ruta", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("Testing the COUNT condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the COUNT condition of Ruta", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("Testing the COUNT condition of TextMarker", iterator.next().getCoveredText());
+    assertEquals("Testing the COUNT condition of Ruta", iterator.next().getCoveredText());
     
     cas.release();    
   }