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:48:51 UTC

svn commit: r1477077 - /uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/

Author: pkluegl
Date: Mon Apr 29 13:48:50 2013
New Revision: 1477077

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

Modified:
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllActionsTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllConditionsTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest2.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FilteringTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LiteralStringMatchTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest2.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest1.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest2.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest3.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest2.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest3.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest.java

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllActionsTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllActionsTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllActionsTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllActionsTest.java Mon Apr 29 13:48:50 2013
@@ -17,40 +17,40 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
-import org.apache.uima.textmarker.action.AddFilterTypeTest;
-import org.apache.uima.textmarker.action.AddRetainTypeTest;
-import org.apache.uima.textmarker.action.ClearTest;
-import org.apache.uima.textmarker.action.CreateTest;
-import org.apache.uima.textmarker.action.FillTest;
-import org.apache.uima.textmarker.action.FilterTypeTest;
-import org.apache.uima.textmarker.action.GatherTest;
-import org.apache.uima.textmarker.action.GetFeatureTest;
-import org.apache.uima.textmarker.action.GetListTest;
-import org.apache.uima.textmarker.action.GetTest;
-import org.apache.uima.textmarker.action.MarkFastTest;
-import org.apache.uima.textmarker.action.MarkLastTest;
-import org.apache.uima.textmarker.action.MarkOnceTest;
-import org.apache.uima.textmarker.action.MarkScoreTest;
-import org.apache.uima.textmarker.action.MarkTableTest;
-import org.apache.uima.textmarker.action.MarkTest;
-import org.apache.uima.textmarker.action.MatchedTextTest;
-import org.apache.uima.textmarker.action.MergeTest;
-import org.apache.uima.textmarker.action.RemoveDuplicateTest;
-import org.apache.uima.textmarker.action.RemoveFilterTypeTest;
-import org.apache.uima.textmarker.action.RemoveRetainTypeTest;
-import org.apache.uima.textmarker.action.RemoveTest;
-import org.apache.uima.textmarker.action.ReplaceTest;
-import org.apache.uima.textmarker.action.RetainTypeTest;
-import org.apache.uima.textmarker.action.SetFeatureTest;
-import org.apache.uima.textmarker.action.ShiftTest;
-import org.apache.uima.textmarker.action.ShiftTest2;
-import org.apache.uima.textmarker.action.TransferTest;
-import org.apache.uima.textmarker.action.TrieTest;
-import org.apache.uima.textmarker.action.TrimTest;
-import org.apache.uima.textmarker.action.UnmarkAllTest;
-import org.apache.uima.textmarker.action.UnmarkTest;
+import org.apache.uima.ruta.action.AddFilterTypeTest;
+import org.apache.uima.ruta.action.AddRetainTypeTest;
+import org.apache.uima.ruta.action.ClearTest;
+import org.apache.uima.ruta.action.CreateTest;
+import org.apache.uima.ruta.action.FillTest;
+import org.apache.uima.ruta.action.FilterTypeTest;
+import org.apache.uima.ruta.action.GatherTest;
+import org.apache.uima.ruta.action.GetFeatureTest;
+import org.apache.uima.ruta.action.GetListTest;
+import org.apache.uima.ruta.action.GetTest;
+import org.apache.uima.ruta.action.MarkFastTest;
+import org.apache.uima.ruta.action.MarkLastTest;
+import org.apache.uima.ruta.action.MarkOnceTest;
+import org.apache.uima.ruta.action.MarkScoreTest;
+import org.apache.uima.ruta.action.MarkTableTest;
+import org.apache.uima.ruta.action.MarkTest;
+import org.apache.uima.ruta.action.MatchedTextTest;
+import org.apache.uima.ruta.action.MergeTest;
+import org.apache.uima.ruta.action.RemoveDuplicateTest;
+import org.apache.uima.ruta.action.RemoveFilterTypeTest;
+import org.apache.uima.ruta.action.RemoveRetainTypeTest;
+import org.apache.uima.ruta.action.RemoveTest;
+import org.apache.uima.ruta.action.ReplaceTest;
+import org.apache.uima.ruta.action.RetainTypeTest;
+import org.apache.uima.ruta.action.SetFeatureTest;
+import org.apache.uima.ruta.action.ShiftTest;
+import org.apache.uima.ruta.action.ShiftTest2;
+import org.apache.uima.ruta.action.TransferTest;
+import org.apache.uima.ruta.action.TrieTest;
+import org.apache.uima.ruta.action.TrimTest;
+import org.apache.uima.ruta.action.UnmarkAllTest;
+import org.apache.uima.ruta.action.UnmarkTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllConditionsTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllConditionsTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllConditionsTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllConditionsTest.java Mon Apr 29 13:48:50 2013
@@ -17,9 +17,9 @@
  * under the License.
 */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
-import org.apache.uima.textmarker.condition.*;
+import org.apache.uima.ruta.condition.*;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/AllTests.java Mon Apr 29 13:48:50 2013
@@ -17,18 +17,18 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
-import org.apache.uima.textmarker.condition.CurrentCountTest;
-import org.apache.uima.textmarker.condition.PartOfTest;
-import org.apache.uima.textmarker.condition.PositionTest;
-import org.apache.uima.textmarker.engine.HtmlAnnotatorTest;
-import org.apache.uima.textmarker.engine.HtmlConverterTest;
-import org.apache.uima.textmarker.engine.TextMarkerModifierTest;
-import org.apache.uima.textmarker.seed.DefaultSeederTest;
-import org.apache.uima.textmarker.verbalizer.ActionVerbalizerTest;
-import org.apache.uima.textmarker.verbalizer.ConditionVerbalizerTest;
-import org.apache.uima.textmarker.verbalizer.ExpressionVerbalizerTest;
+import org.apache.uima.ruta.condition.CurrentCountTest;
+import org.apache.uima.ruta.condition.PartOfTest;
+import org.apache.uima.ruta.condition.PositionTest;
+import org.apache.uima.ruta.engine.HtmlAnnotatorTest;
+import org.apache.uima.ruta.engine.HtmlConverterTest;
+import org.apache.uima.ruta.engine.RutaModifierTest;
+import org.apache.uima.ruta.seed.DefaultSeederTest;
+import org.apache.uima.ruta.verbalizer.ActionVerbalizerTest;
+import org.apache.uima.ruta.verbalizer.ConditionVerbalizerTest;
+import org.apache.uima.ruta.verbalizer.ExpressionVerbalizerTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
@@ -41,7 +41,7 @@ import org.junit.runners.Suite.SuiteClas
     AllActionsTest.class, AllConditionsTest.class, CurrentCountTest.class, PartOfTest.class,
     PositionTest.class, DefaultSeederTest.class, ConditionVerbalizerTest.class,
     ActionVerbalizerTest.class, ExpressionVerbalizerTest.class, HtmlAnnotatorTest.class,
-    HtmlConverterTest.class, EmptyDocumentTest.class, TextMarkerModifierTest.class,
+    HtmlConverterTest.class, EmptyDocumentTest.class, RutaModifierTest.class,
     RegExpRuleTest.class, WildCardTest.class })
 public class AllTests {
 

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class DynamicAnchoringTest {
     String namespace = RuleInferenceTest.class.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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,7 +46,7 @@ public class DynamicAnchoringTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     iterator = ai.iterator();
@@ -55,18 +55,18 @@ public class DynamicAnchoringTest {
     assertEquals("Flo", iterator.next().getCoveredText());
     assertEquals("Georg", 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("und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(0, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -76,21 +76,21 @@ public class DynamicAnchoringTest {
     assertEquals("und Georg", iterator.next().getCoveredText());
     assertEquals("Georg", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    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 = TextMarkerTestUtils.getTestType(cas, 6);
+    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 = TextMarkerTestUtils.getTestType(cas, 7);
+    t = RutaTestUtils.getTestType(cas, 7);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -100,7 +100,7 @@ public class DynamicAnchoringTest {
     assertEquals("und", iterator.next().getCoveredText());
     assertEquals("Georg", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 8);
+    t = RutaTestUtils.getTestType(cas, 8);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -110,14 +110,14 @@ public class DynamicAnchoringTest {
     assertEquals("und Georg", iterator.next().getCoveredText());
     assertEquals("Georg", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 9);
+    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 = TextMarkerTestUtils.getTestType(cas, 10);
+    t = RutaTestUtils.getTestType(cas, 10);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -125,7 +125,7 @@ public class DynamicAnchoringTest {
     assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
     assertEquals("Flo und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 11);
+    t = RutaTestUtils.getTestType(cas, 11);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -133,7 +133,7 @@ public class DynamicAnchoringTest {
     assertEquals("Jochen, Flo und Georg.", iterator.next().getCoveredText());
     assertEquals("Flo und Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 12);
+    t = RutaTestUtils.getTestType(cas, 12);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(6, ai.size());
@@ -144,7 +144,7 @@ public class DynamicAnchoringTest {
     assertEquals("und", iterator.next().getCoveredText());
     assertEquals("und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 13);
+    t = RutaTestUtils.getTestType(cas, 13);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(6, ai.size());
@@ -155,7 +155,7 @@ public class DynamicAnchoringTest {
     assertEquals("Flo und", iterator.next().getCoveredText());
     assertEquals("Flo und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 14);
+    t = RutaTestUtils.getTestType(cas, 14);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -163,25 +163,25 @@ public class DynamicAnchoringTest {
     assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
     assertEquals("Flo und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 15);
+    t = RutaTestUtils.getTestType(cas, 15);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Peter, Jochen", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 16);
+    t = RutaTestUtils.getTestType(cas, 16);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 17);
+    t = RutaTestUtils.getTestType(cas, 17);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Flo und Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 18);
+    t = RutaTestUtils.getTestType(cas, 18);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -189,19 +189,19 @@ public class DynamicAnchoringTest {
     assertEquals("Jochen,", iterator.next().getCoveredText());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 20);
+    t = RutaTestUtils.getTestType(cas, 20);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Peter, Jochen", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 21);
+    t = RutaTestUtils.getTestType(cas, 21);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 22);
+    t = RutaTestUtils.getTestType(cas, 22);
     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/DynamicAnchoringTest2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest2.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest2.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/DynamicAnchoringTest2.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class DynamicAnchoringTest2 {
     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, true, false, null, null);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,19 +46,19 @@ public class DynamicAnchoringTest2 {
     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("A b", 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("b A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     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/EmptyDocumentTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/EmptyDocumentTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,7 +35,7 @@ public class EmptyDocumentTest {
     String namespace = RuleInferenceTest.class.getPackage().getName().replaceAll("\\.", "/");
     CAS cas = null;
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/"
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/"
               + "EmptyDocumentTest.txt", 50);
 
     } catch (Exception e) {

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FilteringTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FilteringTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FilteringTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FilteringTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class FilteringTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,30 +46,30 @@ public class FilteringTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = 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);
     iterator = ai.iterator();
     assertEquals(2, ai.size());
     assertEquals("Peter, Jochen", iterator.next().getCoveredText());
     assertEquals("Jochen, Flo", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(0, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(2, ai.size());
     assertEquals(", Jochen, ", iterator.next().getCoveredText());
     assertEquals(", ", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(4, ai.size());
@@ -79,19 +79,19 @@ public class FilteringTest {
     assertEquals("Georg.", iterator.next().getCoveredText());
 
   
-    t = TextMarkerTestUtils.getTestType(cas, 15);
+    t = RutaTestUtils.getTestType(cas, 15);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Peter, Jochen", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 16);
+    t = RutaTestUtils.getTestType(cas, 16);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 17);
+    t = RutaTestUtils.getTestType(cas, 17);
     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/IncompletePartitioningTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/IncompletePartitioningTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -37,7 +37,7 @@ import org.apache.uima.cas.text.Annotati
 import org.apache.uima.cas.text.AnnotationIndex;
 import org.apache.uima.resource.ResourceSpecifier;
 import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.textmarker.engine.TextMarkerEngine;
+import org.apache.uima.ruta.engine.RutaEngine;
 import org.apache.uima.util.CasCreationUtils;
 import org.apache.uima.util.FileUtils;
 import org.apache.uima.util.XMLInputSource;
@@ -52,14 +52,14 @@ public class IncompletePartitioningTest 
 
     String ruleFileName = namespace + "/" + className + ".tm";
     String textFileName = namespace + "/" + className + ".txt";
-    URL ruleURL = TextMarkerTestUtils.class.getClassLoader().getResource(ruleFileName);
+    URL ruleURL = RutaTestUtils.class.getClassLoader().getResource(ruleFileName);
     File ruleFile = new File(ruleURL.toURI());
-    URL textURL = TextMarkerTestUtils.class.getClassLoader().getResource(textFileName);
+    URL textURL = RutaTestUtils.class.getClassLoader().getResource(textFileName);
     File textFile = new File(textURL.toURI());
-    URL url = TextMarkerEngine.class.getClassLoader().getResource("BasicEngine.xml");
+    URL url = RutaEngine.class.getClassLoader().getResource("BasicEngine.xml");
     if (url == null) {
-      url = TextMarkerTestUtils.class.getClassLoader().getResource(
-              "org/apache/uima/textmarker/TestEngine.xml");
+      url = RutaTestUtils.class.getClassLoader().getResource(
+              "org/apache/uima/ruta/TestEngine.xml");
     }
     XMLInputSource in = new XMLInputSource(url);
     ResourceSpecifier specifier = UIMAFramework.getXMLParser().parseResourceSpecifier(in);
@@ -67,7 +67,7 @@ public class IncompletePartitioningTest 
 
     TypeSystemDescription basicTypeSystem = aed.getAnalysisEngineMetaData().getTypeSystem();
     for (int i = 1; i <= 50; i++) {
-      basicTypeSystem.addType(TextMarkerTestUtils.TYPE + i, "Type for Testing",
+      basicTypeSystem.addType(RutaTestUtils.TYPE + i, "Type for Testing",
               "uima.tcas.Annotation");
     }
     Collection<TypeSystemDescription> tsds = new ArrayList<TypeSystemDescription>();
@@ -76,22 +76,22 @@ public class IncompletePartitioningTest 
     aed.getAnalysisEngineMetaData().setTypeSystem(mergeTypeSystems);
 
     AnalysisEngine ae = UIMAFramework.produceAnalysisEngine(specifier);
-    ae.setConfigParameterValue(TextMarkerEngine.SCRIPT_PATHS, new String[] { ruleFile
+    ae.setConfigParameterValue(RutaEngine.SCRIPT_PATHS, new String[] { ruleFile
             .getParentFile().getPath() });
     String name = ruleFile.getName();
     if (name.endsWith(".tm")) {
       name = name.substring(0, name.length() - 3);
     }
-    ae.setConfigParameterValue(TextMarkerEngine.MAIN_SCRIPT, name);
-    ae.setConfigParameterValue(TextMarkerEngine.SEEDERS, new String[0]);
-    ae.setConfigParameterValue(TextMarkerEngine.DEFAULT_FILTERED_TYPES, new String[0]);
+    ae.setConfigParameterValue(RutaEngine.MAIN_SCRIPT, name);
+    ae.setConfigParameterValue(RutaEngine.SEEDERS, new String[0]);
+    ae.setConfigParameterValue(RutaEngine.DEFAULT_FILTERED_TYPES, new String[0]);
 
     ae.reconfigure();
     CAS cas = ae.newCAS();
     cas.setDocumentText(FileUtils.file2String(textFile, "UTF-8"));
     
-    Type typeCW = cas.getTypeSystem().getType("org.apache.uima.textmarker.type.CW");
-    Type typeSW = cas.getTypeSystem().getType("org.apache.uima.textmarker.type.SW");
+    Type typeCW = cas.getTypeSystem().getType("org.apache.uima.ruta.type.CW");
+    Type typeSW = cas.getTypeSystem().getType("org.apache.uima.ruta.type.SW");
     cas.addFsToIndexes(cas.createAnnotation(typeCW, 0, 5));
     cas.addFsToIndexes(cas.createAnnotation(typeCW, 7, 13));
     cas.addFsToIndexes(cas.createAnnotation(typeCW, 15, 18));
@@ -104,7 +104,7 @@ public class IncompletePartitioningTest 
     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();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LiteralStringMatchTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LiteralStringMatchTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LiteralStringMatchTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LiteralStringMatchTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * SWer the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class LiteralStringMatchTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -47,7 +47,7 @@ public class LiteralStringMatchTest {
     FSIterator<AnnotationFS> iterator = null;
 
  
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     iterator = ai.iterator();
@@ -56,26 +56,26 @@ public class LiteralStringMatchTest {
     assertEquals("CW", iterator.next().getCoveredText());
     assertEquals("CW", 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("SW", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(0, ai.size());
 
    
-    t = TextMarkerTestUtils.getTestType(cas, 6);
+    t = RutaTestUtils.getTestType(cas, 6);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(2, ai.size());
     assertEquals("CW COMMA CW COMMA", iterator.next().getCoveredText());
     assertEquals("CW COMMA", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 7);
+    t = RutaTestUtils.getTestType(cas, 7);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -85,7 +85,7 @@ public class LiteralStringMatchTest {
     assertEquals("SW", iterator.next().getCoveredText());
     assertEquals("CW", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 8);
+    t = RutaTestUtils.getTestType(cas, 8);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -95,14 +95,14 @@ public class LiteralStringMatchTest {
     assertEquals("SW CW", iterator.next().getCoveredText());
     assertEquals("CW", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 9);
+    t = RutaTestUtils.getTestType(cas, 9);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(2, ai.size());
     assertEquals("CW COMMA CW COMMA CW", iterator.next().getCoveredText());
     assertEquals("CW COMMA CW", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 10);
+    t = RutaTestUtils.getTestType(cas, 10);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -110,7 +110,7 @@ public class LiteralStringMatchTest {
     assertEquals("CW COMMA CW SW", iterator.next().getCoveredText());
     assertEquals("CW SW", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 11);
+    t = RutaTestUtils.getTestType(cas, 11);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -118,7 +118,7 @@ public class LiteralStringMatchTest {
     assertEquals("CW COMMA CW SW CW PERIOD", iterator.next().getCoveredText());
     assertEquals("CW SW CW PERIOD", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 13);
+    t = RutaTestUtils.getTestType(cas, 13);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(6, ai.size());
@@ -129,7 +129,7 @@ public class LiteralStringMatchTest {
     assertEquals("CW SW", iterator.next().getCoveredText());
     assertEquals("CW SW", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 14);
+    t = RutaTestUtils.getTestType(cas, 14);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
@@ -34,7 +34,7 @@ public class LongGreedyTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -44,7 +44,7 @@ public class LongGreedyTest {
     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();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest2.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest2.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/LongGreedyTest2.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import org.apache.uima.cas.CAS;
 import org.apache.uima.cas.FSIterator;
@@ -34,7 +34,7 @@ public class LongGreedyTest2 {
     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, true, null, null);
     } catch (Exception e) {
       e.printStackTrace();
@@ -44,7 +44,7 @@ public class LongGreedyTest2 {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    // t = TextMarkerTestUtils.getTestType(cas, 2);
+    // t = RutaTestUtils.getTestType(cas, 2);
     // 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/OptionalComposedEndTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OptionalComposedEndTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,7 +35,7 @@ public class OptionalComposedEndTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class OptionalComposedEndTest {
     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();
@@ -53,7 +53,7 @@ public class OptionalComposedEndTest {
     assertEquals("20", iterator.next().getCoveredText());
     assertEquals("20,20", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -61,7 +61,7 @@ public class OptionalComposedEndTest {
     assertEquals("20", iterator.next().getCoveredText());
     assertEquals("20,20", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     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/OutOfWindowTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/OutOfWindowTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,7 +35,7 @@ public class OutOfWindowTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class OutOfWindowTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -53,7 +53,7 @@ public class OutOfWindowTest {
     assertEquals("Jochen, Flo", iterator.next().getCoveredText());
     assertEquals("Lena, Beate", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     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/QuantifierTest1.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest1.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest1.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest1.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,7 +35,7 @@ public class QuantifierTest1 {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class QuantifierTest1 {
     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();
@@ -53,7 +53,7 @@ public class QuantifierTest1 {
     assertEquals("A B", iterator.next().getCoveredText());
     assertEquals("A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -61,7 +61,7 @@ public class QuantifierTest1 {
     assertEquals("A", iterator.next().getCoveredText());
     assertEquals("A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -69,7 +69,7 @@ public class QuantifierTest1 {
     assertEquals("A B B", iterator.next().getCoveredText());
     assertEquals("A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -77,40 +77,40 @@ public class QuantifierTest1 {
     assertEquals("A", iterator.next().getCoveredText());
     assertEquals("A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    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 = TextMarkerTestUtils.getTestType(cas, 6);
+    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 = TextMarkerTestUtils.getTestType(cas, 7);
+    t = RutaTestUtils.getTestType(cas, 7);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("A B B", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 8);
+    t = RutaTestUtils.getTestType(cas, 8);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("A B B", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 9);
+    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 = TextMarkerTestUtils.getTestType(cas, 10);
+    t = RutaTestUtils.getTestType(cas, 10);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -118,7 +118,7 @@ public class QuantifierTest1 {
     assertEquals("A B", iterator.next().getCoveredText());
     assertEquals("A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 11);
+    t = RutaTestUtils.getTestType(cas, 11);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -126,21 +126,21 @@ public class QuantifierTest1 {
     assertEquals("A B B", iterator.next().getCoveredText());
     assertEquals("A", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 12);
+    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 = TextMarkerTestUtils.getTestType(cas, 13);
+    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 = TextMarkerTestUtils.getTestType(cas, 14);
+    t = RutaTestUtils.getTestType(cas, 14);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -148,7 +148,7 @@ public class QuantifierTest1 {
     assertEquals("A B B C", iterator.next().getCoveredText());
     assertEquals("A C", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 15);
+    t = RutaTestUtils.getTestType(cas, 15);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -156,14 +156,14 @@ public class QuantifierTest1 {
     assertEquals("A B B C", iterator.next().getCoveredText());
     assertEquals("A C", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 16);
+    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());
 
-    t = TextMarkerTestUtils.getTestType(cas, 17);
+    t = RutaTestUtils.getTestType(cas, 17);
     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/QuantifierTest2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest2.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest2.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest2.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,7 +35,7 @@ public class QuantifierTest2 {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,7 +45,7 @@ public class QuantifierTest2 {
     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();
@@ -53,17 +53,17 @@ public class QuantifierTest2 {
     assertEquals("A4 A5", iterator.next().getCoveredText());
     assertEquals("A6 A7", 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("A1 B B A2", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     iterator = ai.iterator();
@@ -72,7 +72,7 @@ public class QuantifierTest2 {
     assertEquals("A4 A5", iterator.next().getCoveredText());
     assertEquals("A6 A7", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
 

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest3.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest3.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest3.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/QuantifierTest3.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -35,7 +35,7 @@ public class QuantifierTest3 {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -45,29 +45,29 @@ public class QuantifierTest3 {
     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("Big Big Big", 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("Big Big Big", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("Big Big Big", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RegExpRuleTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class RegExpRuleTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,33 +46,33 @@ public class RegExpRuleTest {
     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(28, iterator.next().getCoveredText().length());
    
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals(26, iterator.next().getCoveredText().length());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    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 = TextMarkerTestUtils.getTestType(cas, 4);
+    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 = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -80,14 +80,14 @@ public class RegExpRuleTest {
     assertEquals("B", iterator.next().getCoveredText());
     assertEquals("B", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 6);
+    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 = TextMarkerTestUtils.getTestType(cas, 7);
+    t = RutaTestUtils.getTestType(cas, 7);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class RuleInferenceTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,7 +46,7 @@ public class RuleInferenceTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     iterator = ai.iterator();
@@ -55,18 +55,18 @@ public class RuleInferenceTest {
     assertEquals("Flo", iterator.next().getCoveredText());
     assertEquals("Georg", 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("und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 3);
+    t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(0, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -76,21 +76,21 @@ public class RuleInferenceTest {
     assertEquals("und Georg", iterator.next().getCoveredText());
     assertEquals("Georg", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    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 = TextMarkerTestUtils.getTestType(cas, 6);
+    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 = TextMarkerTestUtils.getTestType(cas, 7);
+    t = RutaTestUtils.getTestType(cas, 7);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -100,7 +100,7 @@ public class RuleInferenceTest {
     assertEquals("und", iterator.next().getCoveredText());
     assertEquals("Georg", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 8);
+    t = RutaTestUtils.getTestType(cas, 8);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(5, ai.size());
@@ -110,14 +110,14 @@ public class RuleInferenceTest {
     assertEquals("und Georg", iterator.next().getCoveredText());
     assertEquals("Georg", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 9);
+    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 = TextMarkerTestUtils.getTestType(cas, 10);
+    t = RutaTestUtils.getTestType(cas, 10);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -125,7 +125,7 @@ public class RuleInferenceTest {
     assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
     assertEquals("Flo und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 11);
+    t = RutaTestUtils.getTestType(cas, 11);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -133,7 +133,7 @@ public class RuleInferenceTest {
     assertEquals("Jochen, Flo und Georg.", iterator.next().getCoveredText());
     assertEquals("Flo und Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 12);
+    t = RutaTestUtils.getTestType(cas, 12);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(6, ai.size());
@@ -144,7 +144,7 @@ public class RuleInferenceTest {
     assertEquals("und", iterator.next().getCoveredText());
     assertEquals("und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 13);
+    t = RutaTestUtils.getTestType(cas, 13);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(6, ai.size());
@@ -155,7 +155,7 @@ public class RuleInferenceTest {
     assertEquals("Flo und", iterator.next().getCoveredText());
     assertEquals("Flo und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 14);
+    t = RutaTestUtils.getTestType(cas, 14);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(3, ai.size());
@@ -163,25 +163,25 @@ public class RuleInferenceTest {
     assertEquals("Jochen, Flo und", iterator.next().getCoveredText());
     assertEquals("Flo und", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 15);
+    t = RutaTestUtils.getTestType(cas, 15);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Peter, Jochen", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 16);
+    t = RutaTestUtils.getTestType(cas, 16);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 17);
+    t = RutaTestUtils.getTestType(cas, 17);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Flo und Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 18);
+    t = RutaTestUtils.getTestType(cas, 18);
     ai = cas.getAnnotationIndex(t);
     assertEquals(3, ai.size());
     iterator = ai.iterator();
@@ -189,19 +189,19 @@ public class RuleInferenceTest {
     assertEquals("Jochen,", iterator.next().getCoveredText());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 20);
+    t = RutaTestUtils.getTestType(cas, 20);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Peter, Jochen", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 21);
+    t = RutaTestUtils.getTestType(cas, 21);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(1, ai.size());
     assertEquals("Georg.", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 22);
+    t = RutaTestUtils.getTestType(cas, 22);
     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/RuleInferenceTest2.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest2.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest2.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest2.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class RuleInferenceTest2 {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,7 +46,7 @@ public class RuleInferenceTest2 {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(8, ai.size());
     iterator = ai.iterator();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest3.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest3.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest3.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/RuleInferenceTest3.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class RuleInferenceTest3 {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,7 +46,7 @@ public class RuleInferenceTest3 {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
 
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
        

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/SubAtomicTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -43,7 +43,7 @@ public class SubAtomicTest {
     
     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();
@@ -53,7 +53,7 @@ public class SubAtomicTest {
     AnnotationIndex<AnnotationFS> ai = null;
     FSIterator<AnnotationFS> iterator = null;
     
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
     
@@ -65,7 +65,7 @@ public class SubAtomicTest {
     cas.addFsToIndexes(a2);
     
     try {
-      cas = TextMarkerTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
+      cas = RutaTestUtils.process(namespace + "/" + name + ".tm", namespace + "/" + name
               + ".txt", 50, false, false, complexTypes, null, null, cas);
     } catch (Exception e) {
       e.printStackTrace();
@@ -74,31 +74,31 @@ public class SubAtomicTest {
     
 
 
-    t = TextMarkerTestUtils.getTestType(cas, 1);
+    t = RutaTestUtils.getTestType(cas, 1);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("Jochen", 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("hen", 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("Joc", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("Jochen", iterator.next().getCoveredText());
 
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     assertEquals(0, ai.size());
     

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest.java?rev=1477077&r1=1477076&r2=1477077&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/WildCardTest.java Mon Apr 29 13:48:50 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker;
+package org.apache.uima.ruta;
 
 import static org.junit.Assert.assertEquals;
 
@@ -36,7 +36,7 @@ public class WildCardTest {
     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);
     } catch (Exception e) {
       e.printStackTrace();
@@ -46,87 +46,87 @@ public class WildCardTest {
     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(cas.getDocumentText().length(), iterator.next().getCoveredText().length());
    
-    t = TextMarkerTestUtils.getTestType(cas, 2);
+    t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("The", 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("The TextMarker language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
+    assertEquals("The Ruta language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 4);
+    t = RutaTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);
     assertEquals(8, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 5);
+    t = RutaTestUtils.getTestType(cas, 5);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("The TextMarker language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
+    assertEquals("The Ruta language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 6);
+    t = RutaTestUtils.getTestType(cas, 6);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("The TextMarker language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
+    assertEquals("The Ruta language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 7);
+    t = RutaTestUtils.getTestType(cas, 7);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals(cas.getDocumentText(), iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 8);
+    t = RutaTestUtils.getTestType(cas, 8);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals(cas.getDocumentText(), iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 9);
+    t = RutaTestUtils.getTestType(cas, 9);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 10);
+    t = RutaTestUtils.getTestType(cas, 10);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("The TextMarker language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
+    assertEquals("The Ruta language is an imperative rule language extended with scripting elements", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 11);
+    t = RutaTestUtils.getTestType(cas, 11);
     ai = cas.getAnnotationIndex(t);
     assertEquals(9, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 12);
+    t = RutaTestUtils.getTestType(cas, 12);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("The TextMarker language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
+    assertEquals("The Ruta language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 13);
+    t = RutaTestUtils.getTestType(cas, 13);
     ai = cas.getAnnotationIndex(t);
     assertEquals(8, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 14);
+    t = RutaTestUtils.getTestType(cas, 14);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("The TextMarker language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
+    assertEquals("The Ruta language is an imperative rule language extended with scripting elements.", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 16);
+    t = RutaTestUtils.getTestType(cas, 16);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 17);
+    t = RutaTestUtils.getTestType(cas, 17);
     ai = cas.getAnnotationIndex(t);
     iterator = ai.iterator();
     assertEquals(4, ai.size());
@@ -135,51 +135,51 @@ public class WildCardTest {
     assertEquals("The", iterator.next().getCoveredText());
     assertEquals("The", iterator.next().getCoveredText());
     
-    t = TextMarkerTestUtils.getTestType(cas, 18);
+    t = RutaTestUtils.getTestType(cas, 18);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 19);
+    t = RutaTestUtils.getTestType(cas, 19);
     ai = cas.getAnnotationIndex(t);
     assertEquals(8, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 20);
+    t = RutaTestUtils.getTestType(cas, 20);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 21);
+    t = RutaTestUtils.getTestType(cas, 21);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 22);
+    t = RutaTestUtils.getTestType(cas, 22);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 23);
+    t = RutaTestUtils.getTestType(cas, 23);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 24);
+    t = RutaTestUtils.getTestType(cas, 24);
     ai = cas.getAnnotationIndex(t);
     assertEquals(2, ai.size());
 
-    t = TextMarkerTestUtils.getTestType(cas, 25);
+    t = RutaTestUtils.getTestType(cas, 25);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 26);
+    t = RutaTestUtils.getTestType(cas, 26);
     ai = cas.getAnnotationIndex(t);
     assertEquals(9, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 27);
+    t = RutaTestUtils.getTestType(cas, 27);
     ai = cas.getAnnotationIndex(t);
     assertEquals(4, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 28);
+    t = RutaTestUtils.getTestType(cas, 28);
     ai = cas.getAnnotationIndex(t);
     assertEquals(8, ai.size());
     
-    t = TextMarkerTestUtils.getTestType(cas, 29);
+    t = RutaTestUtils.getTestType(cas, 29);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());