You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ap...@apache.org on 2013/12/10 04:16:27 UTC

svn commit: r1549752 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java

Author: apatry
Date: Tue Dec 10 03:16:25 2013
New Revision: 1549752

URL: http://svn.apache.org/r1549752
Log:
Fix a broken unit test (UIMA-3303)

Modified:
    uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java

Modified: uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java?rev=1549752&r1=1549751&r2=1549752&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java (original)
+++ uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/StrictImportTest.java Tue Dec 10 03:16:25 2013
@@ -72,7 +72,8 @@ public class StrictImportTest {
   @Test
   public void testUndeclaredTypeSystemWithStrictImportOff() throws Exception {
     CAS cas;
-    AnalysisEngine ae = createAE(NAMESPACE + "/" + NAME + "UndeclaredTypeSystem", false);
+    String script = NAMESPACE + "/" + NAME + "UndeclaredTypeSystem";
+    AnalysisEngine ae = createAE(script, false);
     try {
       cas = ae.newCAS();
       cas.setDocumentText("Word");
@@ -83,19 +84,15 @@ public class StrictImportTest {
       }
     }
 
-    List<String> myTypes = new ArrayList<String>();
-    for (AnnotationFS annotation : CasUtil.select(cas, cas.getTypeSystem().getType("org.apache.uima.ruta.MyType"))) {
-      myTypes.add(annotation.getCoveredText());
-    }
-
     assertEquals(Arrays.asList("Word"), selectText(cas, "org.apache.uima.ruta.MyType"));
-    assertEquals(Arrays.asList("Word"), selectText(cas, NAME + ".T1"));
+    assertEquals(Arrays.asList("Word"), selectText(cas, script.replaceAll("/", ".") + ".T1"));
   }
 
   @Test
   public void testDeclaredTypeSystem() throws Exception {
     CAS cas;
-    AnalysisEngine ae = createAE(NAMESPACE + "/" + NAME + "DeclaredTypeSystem", true);
+    String script = NAMESPACE + "/" + NAME + "DeclaredTypeSystem";
+    AnalysisEngine ae = createAE(script, true);
     try {
       cas = ae.newCAS();
       cas.setDocumentText("Word");
@@ -107,12 +104,12 @@ public class StrictImportTest {
     }
 
     assertEquals(Arrays.asList("Word"), selectText(cas, "org.apache.uima.ruta.MyType"));
-    assertEquals(Arrays.asList("Word"), selectText(cas, NAME + ".T1"));
+    assertEquals(Arrays.asList("Word"), selectText(cas, script.replaceAll("/", ".") + ".T1"));
   }
 
   private List<String> selectText(CAS cas, String type) {
     List<String> values = new ArrayList<String>();
-    for (AnnotationFS annotation : CasUtil.select(cas, cas.getTypeSystem().getType("org.apache.uima.ruta.MyType"))) {
+    for (AnnotationFS annotation : CasUtil.select(cas, cas.getTypeSystem().getType(type))) {
       values.add(annotation.getCoveredText());
     }