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 19:14:44 UTC

svn commit: r1477206 - in /uima/sandbox/ruta/trunk/ruta-core/src/test: java/org/apache/uima/ruta/condition/ resources/org/apache/uima/ruta/ resources/org/apache/uima/ruta/action/ resources/org/apache/uima/ruta/condition/

Author: pkluegl
Date: Mon Apr 29 17:14:27 2013
New Revision: 1477206

URL: http://svn.apache.org/r1477206
Log:
UIMA-2850
- fixed tests

Modified:
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCardTest.tm
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MatchedTextTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/table.csv
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/AndTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/BeforeTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContainsTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContextCountTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/CountTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/EndsWithTest.txt
    uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/InListTest.txt

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/ContextCountTest.java Mon Apr 29 17:14:27 2013
@@ -54,7 +54,7 @@ public class ContextCountTest {
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
     assertEquals("And here is another one", iterator.next().getCoveredText());
-    assertEquals("Testing the CONTEXTCOUNT condition of Ruta", iterator.next().getCoveredText());
+    assertEquals("Testing the CONTEXTCOUNT condition of Ruta System", iterator.next().getCoveredText());
     
     t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
@@ -63,7 +63,7 @@ public class ContextCountTest {
     assertEquals("A", iterator.next().getCoveredText());
     assertEquals("And", iterator.next().getCoveredText());
     assertEquals("Testing", iterator.next().getCoveredText());
-    assertEquals("Text", iterator.next().getCoveredText());
+    assertEquals("Ruta", iterator.next().getCoveredText());
     
     t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
@@ -71,7 +71,7 @@ public class ContextCountTest {
     iterator = ai.iterator();
     assertEquals("A single sentence." +
             "And here is another one." +
-            "Testing the CONTEXTCOUNT condition of Ruta.",
+            "Testing the CONTEXTCOUNT condition of Ruta System.",
             iterator.next().getCoveredText().replaceAll("[\n\r]", ""));
     
     cas.release();

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/condition/CountTest.java Mon Apr 29 17:14:27 2013
@@ -54,19 +54,19 @@ public class CountTest {
     iterator = ai.iterator();
     assertEquals("A single sentence", iterator.next().getCoveredText());
     assertEquals("And here is another one", iterator.next().getCoveredText());
-    assertEquals("Testing the COUNT condition of Ruta", iterator.next().getCoveredText());
+    assertEquals("Testing the COUNT condition of Ruta System", iterator.next().getCoveredText());
     
     t = RutaTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("Testing the COUNT condition of Ruta", iterator.next().getCoveredText());
+    assertEquals("Testing the COUNT condition of Ruta System", iterator.next().getCoveredText());
     
     t = RutaTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
     assertEquals(1, ai.size());
     iterator = ai.iterator();
-    assertEquals("Testing the COUNT condition of Ruta", iterator.next().getCoveredText());
+    assertEquals("Testing the COUNT condition of Ruta System", iterator.next().getCoveredText());
     
     cas.release();    
   }

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCardTest.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCardTest.tm?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCardTest.tm (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/WildCardTest.tm Mon Apr 29 17:14:27 2013
@@ -16,7 +16,7 @@ Document{-> DYNAMICANCHORING(true)};
 Document{-> DYNAMICANCHORING(false)};
 #{-> MARK(T7)};
 # #{-> MARK(T8)};
-"Text" "Marker" #{-> MARK(T9)} ".";
+"Ruta" #{-> MARK(T9)} ".";
 #{-PARTOF(T10)-> MARK(T10)} ".";
 CW{-PARTOF(T11)} #{-> MARK(T11,1,2,3)} (PERIOD | COLON);
 #{-PARTOF(T12) -> MARK(T12,1,2)} (PERIOD | COLON);
@@ -38,7 +38,7 @@ BLOCK(window) T15{}{
     Document{-> DYNAMICANCHORING(false)};
     #{-> MARK(T22)};
     # #{-> MARK(T23)};
-    "Text" "Marker" #{-> MARK(T24)} ".";
+    "Ruta" #{-> MARK(T24)} ".";
     #{-PARTOF(T25)-> MARK(T25)} ".";
     CW{-PARTOF(T26)} #{-> MARK(T26,1,2,3)} (PERIOD | COLON);
     #{-PARTOF(T27) -> MARK(T27,1,2)} (PERIOD | COLON);

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MarkTableTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
-Peter Kluegl: TextMarker
+Peter Kluegl: Ruta
 Marshall Schor: UIMA
 Joern Kottmann: CAS Editor
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MatchedTextTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MatchedTextTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MatchedTextTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/MatchedTextTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
-Peter Kluegl: TextMarker
+Peter Kluegl: Ruta
 Marshall Schor: UIMA
 Joern Kottmann: CAS Editor
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/TrieTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
-Peter Kluegl: TextMarker
+Peter Kluegl: Ruta
 Marshall Schor: UIMA
 Joern Kottmann: CAS Editor
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/table.csv
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/table.csv?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/table.csv (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/action/table.csv Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
-Kluegl;Peter;TextMarker
+Kluegl;Peter;Ruta
 Schor;Marshall;UIMA
 Kottmann;Joern;CAS Editor
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/AndTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/AndTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/AndTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/AndTest.txt Mon Apr 29 17:14:27 2013
@@ -1,4 +1,4 @@
 This is a malformed text.
 some sentences do not start with a capital word.
 But others have many of them.
-Like this one that is written to test the AND Condition of TextMarker.
\ No newline at end of file
+Like this one that is written to test the AND Condition of Ruta.
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/BeforeTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/BeforeTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/BeforeTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/BeforeTest.txt Mon Apr 29 17:14:27 2013
@@ -1,2 +1,2 @@
 To mark everything before a special annotation,
-you need the BEFORE condition of TextMarker.
\ No newline at end of file
+you need the BEFORE condition of Ruta.
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContainsTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContainsTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContainsTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContainsTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
 A single sentence.
 And here is another one.
-Testing the CONTAINS condition of TextMarker.
\ No newline at end of file
+Testing the CONTAINS condition of Ruta.
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContextCountTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContextCountTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContextCountTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/ContextCountTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
 A single sentence.
 And here is another one.
-Testing the CONTEXTCOUNT condition of TextMarker.
\ No newline at end of file
+Testing the CONTEXTCOUNT condition of Ruta System.
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/CountTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/CountTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/CountTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/CountTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
 A single sentence.
 And here is another one.
-Testing the COUNT condition of TextMarker.
\ No newline at end of file
+Testing the COUNT condition of Ruta System.
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/EndsWithTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/EndsWithTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/EndsWithTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/EndsWithTest.txt Mon Apr 29 17:14:27 2013
@@ -1,3 +1,3 @@
 A single sentence!
 And here is another one?
-Testing the ENDSWITH condition of TextMarker.
\ No newline at end of file
+Testing the ENDSWITH condition of Ruta.
\ No newline at end of file

Modified: uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/InListTest.txt
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/InListTest.txt?rev=1477206&r1=1477205&r2=1477206&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/InListTest.txt (original)
+++ uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/condition/InListTest.txt Mon Apr 29 17:14:27 2013
@@ -1 +1 @@
-Testing the INLIST condition of TextMarker.
\ No newline at end of file
+Testing the INLIST condition of Ruta.
\ No newline at end of file