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:59 UTC

svn commit: r1477082 - in /uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer: ActionVerbalizerTest.java ConditionVerbalizerTest.java ExpressionVerbalizerTest.java

Author: pkluegl
Date: Mon Apr 29 13:50:59 2013
New Revision: 1477082

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

Modified:
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java?rev=1477082&r1=1477081&r2=1477082&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ActionVerbalizerTest.java Mon Apr 29 13:50:59 2013
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.verbalizer;
+package org.apache.uima.ruta.verbalizer;
 
 import static org.junit.Assert.assertEquals;
 
@@ -27,64 +27,64 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 
-import org.apache.uima.textmarker.action.AbstractTextMarkerAction;
-import org.apache.uima.textmarker.action.AddAction;
-import org.apache.uima.textmarker.action.AssignAction;
-import org.apache.uima.textmarker.action.CallAction;
-import org.apache.uima.textmarker.action.ClearAction;
-import org.apache.uima.textmarker.action.ColorAction;
-import org.apache.uima.textmarker.action.ConfigureAction;
-import org.apache.uima.textmarker.action.CreateAction;
-import org.apache.uima.textmarker.action.DelAction;
-import org.apache.uima.textmarker.action.DynamicAnchoringAction;
-import org.apache.uima.textmarker.action.ExecAction;
-import org.apache.uima.textmarker.action.FillAction;
-import org.apache.uima.textmarker.action.FilterTypeAction;
-import org.apache.uima.textmarker.action.GatherAction;
-import org.apache.uima.textmarker.action.GetAction;
-import org.apache.uima.textmarker.action.GetFeatureAction;
-import org.apache.uima.textmarker.action.GetListAction;
-import org.apache.uima.textmarker.action.LogAction;
-import org.apache.uima.textmarker.action.MarkAction;
-import org.apache.uima.textmarker.action.MarkFastAction;
-import org.apache.uima.textmarker.action.MarkLastAction;
-import org.apache.uima.textmarker.action.MarkOnceAction;
-import org.apache.uima.textmarker.action.MarkTableAction;
-import org.apache.uima.textmarker.action.MatchedTextAction;
-import org.apache.uima.textmarker.action.MergeAction;
-import org.apache.uima.textmarker.action.RemoveAction;
-import org.apache.uima.textmarker.action.RemoveDuplicateAction;
-import org.apache.uima.textmarker.action.ReplaceAction;
-import org.apache.uima.textmarker.action.RetainTypeAction;
-import org.apache.uima.textmarker.action.SetFeatureAction;
-import org.apache.uima.textmarker.action.ShiftAction;
-import org.apache.uima.textmarker.action.TransferAction;
-import org.apache.uima.textmarker.action.TrieAction;
-import org.apache.uima.textmarker.action.UnmarkAction;
-import org.apache.uima.textmarker.action.UnmarkAllAction;
-import org.apache.uima.textmarker.expression.TextMarkerExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.list.ListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleStringListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleTypeListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.ReferenceNumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-import org.apache.uima.textmarker.expression.resource.LiteralWordTableExpression;
-import org.apache.uima.textmarker.expression.resource.ReferenceWordListExpression;
-import org.apache.uima.textmarker.expression.resource.ReferenceWordTableExpression;
-import org.apache.uima.textmarker.expression.resource.WordListExpression;
-import org.apache.uima.textmarker.expression.resource.WordTableExpression;
-import org.apache.uima.textmarker.expression.string.SimpleStringExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.ReferenceTypeExpression;
-import org.apache.uima.textmarker.expression.type.SimpleTypeExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.resource.CSVTable;
-import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
+import org.apache.uima.ruta.action.AbstractRutaAction;
+import org.apache.uima.ruta.action.AddAction;
+import org.apache.uima.ruta.action.AssignAction;
+import org.apache.uima.ruta.action.CallAction;
+import org.apache.uima.ruta.action.ClearAction;
+import org.apache.uima.ruta.action.ColorAction;
+import org.apache.uima.ruta.action.ConfigureAction;
+import org.apache.uima.ruta.action.CreateAction;
+import org.apache.uima.ruta.action.DelAction;
+import org.apache.uima.ruta.action.DynamicAnchoringAction;
+import org.apache.uima.ruta.action.ExecAction;
+import org.apache.uima.ruta.action.FillAction;
+import org.apache.uima.ruta.action.FilterTypeAction;
+import org.apache.uima.ruta.action.GatherAction;
+import org.apache.uima.ruta.action.GetAction;
+import org.apache.uima.ruta.action.GetFeatureAction;
+import org.apache.uima.ruta.action.GetListAction;
+import org.apache.uima.ruta.action.LogAction;
+import org.apache.uima.ruta.action.MarkAction;
+import org.apache.uima.ruta.action.MarkFastAction;
+import org.apache.uima.ruta.action.MarkLastAction;
+import org.apache.uima.ruta.action.MarkOnceAction;
+import org.apache.uima.ruta.action.MarkTableAction;
+import org.apache.uima.ruta.action.MatchedTextAction;
+import org.apache.uima.ruta.action.MergeAction;
+import org.apache.uima.ruta.action.RemoveAction;
+import org.apache.uima.ruta.action.RemoveDuplicateAction;
+import org.apache.uima.ruta.action.ReplaceAction;
+import org.apache.uima.ruta.action.RetainTypeAction;
+import org.apache.uima.ruta.action.SetFeatureAction;
+import org.apache.uima.ruta.action.ShiftAction;
+import org.apache.uima.ruta.action.TransferAction;
+import org.apache.uima.ruta.action.TrieAction;
+import org.apache.uima.ruta.action.UnmarkAction;
+import org.apache.uima.ruta.action.UnmarkAllAction;
+import org.apache.uima.ruta.expression.RutaExpression;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+import org.apache.uima.ruta.expression.list.ListExpression;
+import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
+import org.apache.uima.ruta.expression.list.SimpleTypeListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.expression.resource.LiteralWordTableExpression;
+import org.apache.uima.ruta.expression.resource.ReferenceWordListExpression;
+import org.apache.uima.ruta.expression.resource.ReferenceWordTableExpression;
+import org.apache.uima.ruta.expression.resource.WordListExpression;
+import org.apache.uima.ruta.expression.resource.WordTableExpression;
+import org.apache.uima.ruta.expression.string.SimpleStringExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.resource.CSVTable;
+import org.apache.uima.ruta.verbalize.RutaVerbalizer;
 import org.junit.Test;
 
 public class ActionVerbalizerTest {
@@ -92,10 +92,10 @@ public class ActionVerbalizerTest {
   @SuppressWarnings("unchecked")
   @Test
   public void test() {
-    TextMarkerVerbalizer v = new TextMarkerVerbalizer();
+    RutaVerbalizer v = new RutaVerbalizer();
     List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
     List<StringExpression> stringExprList = new ArrayList<StringExpression>();
-    List<TextMarkerExpression> exprList = new ArrayList<TextMarkerExpression>();
+    List<RutaExpression> exprList = new ArrayList<RutaExpression>();
     List<NumberExpression> indexes = new ArrayList<NumberExpression>();
     String var = "anyVar";
     TypeExpression typeExpr1 = new SimpleTypeExpression("Type1");
@@ -112,7 +112,7 @@ public class ActionVerbalizerTest {
     WordListExpression wordListExpr = new ReferenceWordListExpression(var);
     TypeListExpression typeListExpr = new SimpleTypeListExpression(typeExprList);
     StringListExpression stringListExpr = new SimpleStringListExpression(stringExprList);
-    Map<StringExpression, TextMarkerExpression> stringExprMap = new HashMap<StringExpression, TextMarkerExpression>();
+    Map<StringExpression, RutaExpression> stringExprMap = new HashMap<StringExpression, RutaExpression>();
     Map<StringExpression, NumberExpression> stringExprNumExprMap = new HashMap<StringExpression, NumberExpression>();
     Map<StringExpression, TypeExpression> stringExprTypeExprMap = new HashMap<StringExpression, TypeExpression>();
     @SuppressWarnings("rawtypes")
@@ -125,7 +125,7 @@ public class ActionVerbalizerTest {
     stringExprTypeExprMap.put(stringExpr, typeExpr1);
     indexes.add(numExpr1);
     indexes.add(numExpr2);
-    AbstractTextMarkerAction a = null;
+    AbstractRutaAction a = null;
     String s = null;
 
     // ADD

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java?rev=1477082&r1=1477081&r2=1477082&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ConditionVerbalizerTest.java Mon Apr 29 13:50:59 2013
@@ -17,63 +17,63 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.verbalizer;
+package org.apache.uima.ruta.verbalizer;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.uima.textmarker.condition.AbstractTextMarkerCondition;
-import org.apache.uima.textmarker.condition.AfterCondition;
-import org.apache.uima.textmarker.condition.AndCondition;
-import org.apache.uima.textmarker.condition.BeforeCondition;
-import org.apache.uima.textmarker.condition.ContainsCondition;
-import org.apache.uima.textmarker.condition.ContextCountCondition;
-import org.apache.uima.textmarker.condition.CountCondition;
-import org.apache.uima.textmarker.condition.CurrentCountCondition;
-import org.apache.uima.textmarker.condition.EndsWithCondition;
-import org.apache.uima.textmarker.condition.FeatureCondition;
-import org.apache.uima.textmarker.condition.IfCondition;
-import org.apache.uima.textmarker.condition.InListCondition;
-import org.apache.uima.textmarker.condition.IsCondition;
-import org.apache.uima.textmarker.condition.LastCondition;
-import org.apache.uima.textmarker.condition.MOfNCondition;
-import org.apache.uima.textmarker.condition.NearCondition;
-import org.apache.uima.textmarker.condition.NotCondition;
-import org.apache.uima.textmarker.condition.OrCondition;
-import org.apache.uima.textmarker.condition.ParseCondition;
-import org.apache.uima.textmarker.condition.PartOfCondition;
-import org.apache.uima.textmarker.condition.PartOfNeqCondition;
-import org.apache.uima.textmarker.condition.PositionCondition;
-import org.apache.uima.textmarker.condition.RegExpCondition;
-import org.apache.uima.textmarker.condition.ScoreCondition;
-import org.apache.uima.textmarker.condition.SizeCondition;
-import org.apache.uima.textmarker.condition.StartsWithCondition;
-import org.apache.uima.textmarker.condition.TotalCountCondition;
-import org.apache.uima.textmarker.condition.VoteCondition;
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.list.SimpleStringListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleTypeListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.ReferenceNumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-import org.apache.uima.textmarker.expression.string.SimpleStringExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.ReferenceTypeExpression;
-import org.apache.uima.textmarker.expression.type.SimpleTypeExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
+import org.apache.uima.ruta.condition.AbstractRutaCondition;
+import org.apache.uima.ruta.condition.AfterCondition;
+import org.apache.uima.ruta.condition.AndCondition;
+import org.apache.uima.ruta.condition.BeforeCondition;
+import org.apache.uima.ruta.condition.ContainsCondition;
+import org.apache.uima.ruta.condition.ContextCountCondition;
+import org.apache.uima.ruta.condition.CountCondition;
+import org.apache.uima.ruta.condition.CurrentCountCondition;
+import org.apache.uima.ruta.condition.EndsWithCondition;
+import org.apache.uima.ruta.condition.FeatureCondition;
+import org.apache.uima.ruta.condition.IfCondition;
+import org.apache.uima.ruta.condition.InListCondition;
+import org.apache.uima.ruta.condition.IsCondition;
+import org.apache.uima.ruta.condition.LastCondition;
+import org.apache.uima.ruta.condition.MOfNCondition;
+import org.apache.uima.ruta.condition.NearCondition;
+import org.apache.uima.ruta.condition.NotCondition;
+import org.apache.uima.ruta.condition.OrCondition;
+import org.apache.uima.ruta.condition.ParseCondition;
+import org.apache.uima.ruta.condition.PartOfCondition;
+import org.apache.uima.ruta.condition.PartOfNeqCondition;
+import org.apache.uima.ruta.condition.PositionCondition;
+import org.apache.uima.ruta.condition.RegExpCondition;
+import org.apache.uima.ruta.condition.ScoreCondition;
+import org.apache.uima.ruta.condition.SizeCondition;
+import org.apache.uima.ruta.condition.StartsWithCondition;
+import org.apache.uima.ruta.condition.TotalCountCondition;
+import org.apache.uima.ruta.condition.VoteCondition;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
+import org.apache.uima.ruta.expression.list.SimpleTypeListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.expression.string.SimpleStringExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.verbalize.RutaVerbalizer;
 import org.junit.Test;
 
 public class ConditionVerbalizerTest {
 
   @Test
   public void test() {
-    TextMarkerVerbalizer v = new TextMarkerVerbalizer();
+    RutaVerbalizer v = new RutaVerbalizer();
     List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
     List<StringExpression> stringExprList = new ArrayList<StringExpression>();
     String var = "anyVar";
@@ -88,7 +88,7 @@ public class ConditionVerbalizerTest {
     stringExprList.add(stringExpr);
     TypeListExpression typeListExpr = new SimpleTypeListExpression(typeExprList);
     StringListExpression stringListExpr = new SimpleStringListExpression(stringExprList);
-    AbstractTextMarkerCondition c = null;
+    AbstractRutaCondition c = null;
     String s = null;
 
     // AFTER
@@ -105,9 +105,9 @@ public class ConditionVerbalizerTest {
     assertEquals("AFTER({Type1, typeVar})", s);
 
     // AND
-    List<AbstractTextMarkerCondition> conds = new ArrayList<AbstractTextMarkerCondition>();
-    AbstractTextMarkerCondition c1 = new AfterCondition(typeExpr2);
-    AbstractTextMarkerCondition c2 = new AfterCondition(typeListExpr);
+    List<AbstractRutaCondition> conds = new ArrayList<AbstractRutaCondition>();
+    AbstractRutaCondition c1 = new AfterCondition(typeExpr2);
+    AbstractRutaCondition c2 = new AfterCondition(typeListExpr);
     conds.add(c1);
     conds.add(c2);
     c = new AndCondition(conds);

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java?rev=1477082&r1=1477081&r2=1477082&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/verbalizer/ExpressionVerbalizerTest.java Mon Apr 29 13:50:59 2013
@@ -17,42 +17,42 @@
  * under the License.
  */
 
-package org.apache.uima.textmarker.verbalizer;
+package org.apache.uima.ruta.verbalizer;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.uima.textmarker.expression.bool.BooleanExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanNumberExpression;
-import org.apache.uima.textmarker.expression.bool.BooleanTypeExpression;
-import org.apache.uima.textmarker.expression.bool.ReferenceBooleanExpression;
-import org.apache.uima.textmarker.expression.bool.SimpleBooleanExpression;
-import org.apache.uima.textmarker.expression.list.BooleanListExpression;
-import org.apache.uima.textmarker.expression.list.NumberListExpression;
-import org.apache.uima.textmarker.expression.list.ReferenceBooleanListExpression;
-import org.apache.uima.textmarker.expression.list.ReferenceNumberListExpression;
-import org.apache.uima.textmarker.expression.list.ReferenceStringListExpression;
-import org.apache.uima.textmarker.expression.list.ReferenceTypeListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleBooleanListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleNumberListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleStringListExpression;
-import org.apache.uima.textmarker.expression.list.SimpleTypeListExpression;
-import org.apache.uima.textmarker.expression.list.StringListExpression;
-import org.apache.uima.textmarker.expression.list.TypeListExpression;
-import org.apache.uima.textmarker.expression.number.ComposedNumberExpression;
-import org.apache.uima.textmarker.expression.number.NumberExpression;
-import org.apache.uima.textmarker.expression.number.ReferenceNumberExpression;
-import org.apache.uima.textmarker.expression.number.SimpleNumberExpression;
-import org.apache.uima.textmarker.expression.string.ComposedStringExpression;
-import org.apache.uima.textmarker.expression.string.ReferenceStringExpression;
-import org.apache.uima.textmarker.expression.string.SimpleStringExpression;
-import org.apache.uima.textmarker.expression.string.StringExpression;
-import org.apache.uima.textmarker.expression.type.ReferenceTypeExpression;
-import org.apache.uima.textmarker.expression.type.SimpleTypeExpression;
-import org.apache.uima.textmarker.expression.type.TypeExpression;
-import org.apache.uima.textmarker.verbalize.TextMarkerVerbalizer;
+import org.apache.uima.ruta.expression.bool.BooleanExpression;
+import org.apache.uima.ruta.expression.bool.BooleanNumberExpression;
+import org.apache.uima.ruta.expression.bool.BooleanTypeExpression;
+import org.apache.uima.ruta.expression.bool.ReferenceBooleanExpression;
+import org.apache.uima.ruta.expression.bool.SimpleBooleanExpression;
+import org.apache.uima.ruta.expression.list.BooleanListExpression;
+import org.apache.uima.ruta.expression.list.NumberListExpression;
+import org.apache.uima.ruta.expression.list.ReferenceBooleanListExpression;
+import org.apache.uima.ruta.expression.list.ReferenceNumberListExpression;
+import org.apache.uima.ruta.expression.list.ReferenceStringListExpression;
+import org.apache.uima.ruta.expression.list.ReferenceTypeListExpression;
+import org.apache.uima.ruta.expression.list.SimpleBooleanListExpression;
+import org.apache.uima.ruta.expression.list.SimpleNumberListExpression;
+import org.apache.uima.ruta.expression.list.SimpleStringListExpression;
+import org.apache.uima.ruta.expression.list.SimpleTypeListExpression;
+import org.apache.uima.ruta.expression.list.StringListExpression;
+import org.apache.uima.ruta.expression.list.TypeListExpression;
+import org.apache.uima.ruta.expression.number.ComposedNumberExpression;
+import org.apache.uima.ruta.expression.number.NumberExpression;
+import org.apache.uima.ruta.expression.number.ReferenceNumberExpression;
+import org.apache.uima.ruta.expression.number.SimpleNumberExpression;
+import org.apache.uima.ruta.expression.string.ComposedStringExpression;
+import org.apache.uima.ruta.expression.string.ReferenceStringExpression;
+import org.apache.uima.ruta.expression.string.SimpleStringExpression;
+import org.apache.uima.ruta.expression.string.StringExpression;
+import org.apache.uima.ruta.expression.type.ReferenceTypeExpression;
+import org.apache.uima.ruta.expression.type.SimpleTypeExpression;
+import org.apache.uima.ruta.expression.type.TypeExpression;
+import org.apache.uima.ruta.verbalize.RutaVerbalizer;
 import org.junit.Test;
 
 public class ExpressionVerbalizerTest {
@@ -60,10 +60,10 @@ public class ExpressionVerbalizerTest {
   @SuppressWarnings("unchecked")
   @Test
   public void test() {
-    TextMarkerVerbalizer v = new TextMarkerVerbalizer();
+    RutaVerbalizer v = new RutaVerbalizer();
 //    List<TypeExpression> typeExprList = new ArrayList<TypeExpression>();
 //    List<StringExpression> stringExprList = new ArrayList<StringExpression>();
-//    List<TextMarkerExpression> exprList = new ArrayList<TextMarkerExpression>();
+//    List<RutaExpression> exprList = new ArrayList<RutaExpression>();
 //    List<NumberExpression> indexes = new ArrayList<NumberExpression>();
 
 //    
@@ -78,7 +78,7 @@ public class ExpressionVerbalizerTest {
 //    WordListExpression wordListExpr = new ReferenceWordListExpression(var);
 //    TypeListExpression typeListExpr = new SimpleTypeListExpression(typeExprList);
 //    StringListExpression stringListExpr = new SimpleStringListExpression(stringExprList);
-//    Map<StringExpression, TextMarkerExpression> stringExprMap = new HashMap<StringExpression, TextMarkerExpression>();
+//    Map<StringExpression, RutaExpression> stringExprMap = new HashMap<StringExpression, RutaExpression>();
 //    Map<StringExpression, NumberExpression> stringExprNumExprMap = new HashMap<StringExpression, NumberExpression>();
 //    Map<StringExpression, TypeExpression> stringExprTypeExprMap = new HashMap<StringExpression, TypeExpression>();
 //    @SuppressWarnings("rawtypes")