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 2015/01/09 14:46:45 UTC

svn commit: r1650528 - in /uima/ruta/trunk: ruta-core-ext/src/test/java/org/apache/uima/ruta/block/ ruta-core/src/main/java/org/apache/uima/ruta/rule/

Author: pkluegl
Date: Fri Jan  9 13:46:45 2015
New Revision: 1650528

URL: http://svn.apache.org/r1650528
Log:
UIMA-4164
- extended and fixed test for "only once"

Added:
    uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java
      - copied, changed from r1596568, uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java
    uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java
      - copied, changed from r1597526, uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java
Modified:
    uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java

Copied: uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java (from r1596568, uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java)
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java?p2=uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java&p1=uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java&r1=1596568&r2=1650528&rev=1650528&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java (original)
+++ uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java Fri Jan  9 13:46:45 2015
@@ -34,7 +34,7 @@ import org.apache.uima.ruta.engine.RutaE
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.junit.Test;
 
-public class OnlyOnceBlockTest {
+public class OnlyFirstBlockTest {
 
   @Test
   public void test() {

Copied: uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java (from r1597526, uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java)
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java?p2=uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java&p1=uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java&r1=1597526&r2=1650528&rev=1650528&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java (original)
+++ uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java Fri Jan  9 13:46:45 2015
@@ -34,7 +34,7 @@ import org.apache.uima.ruta.engine.RutaE
 import org.apache.uima.ruta.engine.RutaTestUtils;
 import org.junit.Test;
 
-public class OnlyFirstBlockTest {
+public class OnlyOnceBlockTest {
 
   @Test
   public void test() {
@@ -44,6 +44,8 @@ public class OnlyFirstBlockTest {
     script += "NUM{-> T2};\n";
     script += "SW+{-> T3};\n";
     script += "NUM+{-> T4};\n";
+    script += "(SW | CW | NUM)+{-> T5};\n";
+    script += "(ALL & ANY)+{-> T6};\n";
     script += "}";
 
     Map<String, Object> parameters = new HashMap<String, Object>();
@@ -85,6 +87,18 @@ public class OnlyFirstBlockTest {
     iterator = ai.iterator();
     assertEquals("1 2 3 4", iterator.next().getCoveredText());
     
+    t = RutaTestUtils.getTestType(cas, 5);
+    ai = cas.getAnnotationIndex(t);
+    assertEquals(1, ai.size());
+    iterator = ai.iterator();
+    assertEquals("some text with numbers", iterator.next().getCoveredText());
+    
+    t = RutaTestUtils.getTestType(cas, 6);
+    ai = cas.getAnnotationIndex(t);
+    assertEquals(1, ai.size());
+    iterator = ai.iterator();
+    assertEquals("some text with numbers: 1 2 3 4", iterator.next().getCoveredText());
+    
     if (cas != null) {
       cas.release();
     }

Modified: uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java?rev=1650528&r1=1650527&r2=1650528&view=diff
==============================================================================
--- uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java (original)
+++ uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java Fri Jan  9 13:46:45 2015
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -74,7 +75,7 @@ public class ComposedRuleElement extends
               crowd);
     } else if (!conjunct) {
       // disjunctive
-      Map<RuleMatch, ComposedRuleElementMatch> ruleMatches = new HashMap<RuleMatch, ComposedRuleElementMatch>();
+      Map<RuleMatch, ComposedRuleElementMatch> ruleMatches = new LinkedHashMap<RuleMatch, ComposedRuleElementMatch>();
       for (RuleElement each : elements) {
         ComposedRuleElementMatch extendedContainerMatch = containerMatch.copy();
         RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch, true);
@@ -104,7 +105,7 @@ public class ComposedRuleElement extends
       }
     } else if (conjunct) {
       // conjunctive
-      Map<RuleMatch, ComposedRuleElementMatch> ruleMatches = new HashMap<RuleMatch, ComposedRuleElementMatch>();
+      Map<RuleMatch, ComposedRuleElementMatch> ruleMatches = new LinkedHashMap<RuleMatch, ComposedRuleElementMatch>();
       RuleElement anchoringRuleElement = getAnchoringRuleElement(stream);
       RutaRuleElement sideStepOrigin = null;