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 2012/11/28 10:55:44 UTC

svn commit: r1414620 - in /uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test: java/org/apache/uima/textmarker/condition/ParseTest.java resources/org/apache/uima/textmarker/condition/ParseTest.tm

Author: pkluegl
Date: Wed Nov 28 09:55:43 2012
New Revision: 1414620

URL: http://svn.apache.org/viewvc?rev=1414620&view=rev
Log:
UIMA-2507
- fixed junit test for PARSE conditions

Modified:
    uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/ParseTest.java
    uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/ParseTest.tm

Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/ParseTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/ParseTest.java?rev=1414620&r1=1414619&r2=1414620&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/ParseTest.java (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/java/org/apache/uima/textmarker/condition/ParseTest.java Wed Nov 28 09:55:43 2012
@@ -60,17 +60,15 @@ public class ParseTest {
     
     t = TextMarkerTestUtils.getTestType(cas, 2);
     ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
+    assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("2,1", iterator.next().getCoveredText());
-    assertEquals("2.3", iterator.next().getCoveredText());
     
     t = TextMarkerTestUtils.getTestType(cas, 3);
     ai = cas.getAnnotationIndex(t);
-    assertEquals(2, ai.size());
+    assertEquals(1, ai.size());
     iterator = ai.iterator();
     assertEquals("true", iterator.next().getCoveredText());
-    assertEquals("false", iterator.next().getCoveredText());
     
     t = TextMarkerTestUtils.getTestType(cas, 4);
     ai = cas.getAnnotationIndex(t);

Modified: uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/ParseTest.tm
URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/ParseTest.tm?rev=1414620&r1=1414619&r2=1414620&view=diff
==============================================================================
--- uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/ParseTest.tm (original)
+++ uima/sandbox/trunk/TextMarker/uimaj-textmarker/src/test/resources/org/apache/uima/textmarker/condition/ParseTest.tm Wed Nov 28 09:55:43 2012
@@ -8,6 +8,6 @@ STRING s1;
 DECLARE T1, T2, T3, T4;
 
 NUM{PARSE(i1) -> MARK(T1)};
-(NUM PM NUM){PARSE(d1) -> MARK(T2)};
-W{PARSE(b1) -> MARK(T3)};
+(NUM PM NUM){PARSE(d1), IF((d1==2.1)) -> MARK(T2)};
+W{PARSE(b1), IF(b1) -> MARK(T3)};
 ANY+{PARSE(s1), -PARTOF(T4), -PARTOF(SEMICOLON) -> MARK(T4)};
\ No newline at end of file