Author: pkluegl
Date: Mon May 13 10:53:02 2013
New Revision: 1481788
URL: http://svn.apache.org/r1481788
Log:
UIMA-2758
- extended test
- reverted changes for semantic highlighting
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatchTest.java
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FeatureMatchTest.ruta
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaReferenceVisitor.java
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatchTest.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatchTest.java?rev=1481788&r1=1481787&r2=1481788&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatchTest.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/FeatureMatchTest.java
Mon May 13 10:53:02 2013
@@ -167,6 +167,44 @@ public class FeatureMatchTest {
iterator = ai.iterator();
assertEquals("Marshall", iterator.next().getCoveredText());
+
+ t = RutaTestUtils.getTestType(cas, 13);
+ ai = cas.getAnnotationIndex(t);
+ iterator = ai.iterator();
+ assertEquals(3, ai.size());
+ assertEquals("Peter", iterator.next().getCoveredText());
+ assertEquals("Joern", iterator.next().getCoveredText());
+ assertEquals("Marshall", iterator.next().getCoveredText());
+
+ t = RutaTestUtils.getTestType(cas, 14);
+ ai = cas.getAnnotationIndex(t);
+ iterator = ai.iterator();
+ assertEquals(3, ai.size());
+ assertEquals("Kluegl", iterator.next().getCoveredText());
+ assertEquals("Kottmann", iterator.next().getCoveredText());
+ assertEquals("Schor", iterator.next().getCoveredText());
+
+ t = RutaTestUtils.getTestType(cas, 15);
+ ai = cas.getAnnotationIndex(t);
+ iterator = ai.iterator();
+ assertEquals(3, ai.size());
+ assertEquals("Peter", iterator.next().getCoveredText());
+ assertEquals("Joern", iterator.next().getCoveredText());
+ assertEquals("Marshall", iterator.next().getCoveredText());
+
+
+ t = RutaTestUtils.getTestType(cas, 16);
+ ai = cas.getAnnotationIndex(t);
+ assertEquals(1, ai.size());
+ iterator = ai.iterator();
+ assertEquals("Peter Kluegl, Joern Kottmann, Marshall",
iterator.next().getCoveredText());
+
+ t = RutaTestUtils.getTestType(cas, 17);
+ ai = cas.getAnnotationIndex(t);
+ assertEquals(1, ai.size());
+ iterator = ai.iterator();
+ assertEquals("Peter Kluegl, Joern Kottmann, Marshall Schor",
iterator.next().getCoveredText());
+
if (cas != null) {
cas.release();
Modified:
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FeatureMatchTest.ruta
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FeatureMatchTest.ruta?rev=1481788&r1=1481787&r2=1481788&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FeatureMatchTest.ruta
(original)
+++
uima/sandbox/ruta/trunk/ruta-core/src/test/resources/org/apache/uima/ruta/FeatureMatchTest.ruta
Mon May 13 10:53:02 2013
@@ -29,3 +29,10 @@ C.ci==3{-> MARK(T10)};
B.bc.ci==3{-> MARK(T11)};
A.ab.bc.ci==3{-> MARK(T12)};
+A.ab.bc{-> MARK(T13)};
+A.ab{-> MARK(T14)};
+A.ac{-> MARK(T15)};
+
+(A.ac.ci==1 # A.ac.ci==2 # A.ac.ci==3){-> MARK(T16)};
+(A.ac.ci==1 # A.ac # A.ab){-> MARK(T17)};
+
Modified:
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaReferenceVisitor.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaReferenceVisitor.java?rev=1481788&r1=1481787&r2=1481788&view=diff
==============================================================================
---
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaReferenceVisitor.java
(original)
+++
uima/sandbox/ruta/trunk/ruta-ep-ide/src/main/java/org/apache/uima/ruta/ide/core/codeassist/RutaReferenceVisitor.java
Mon May 13 10:53:02 2013
@@ -69,7 +69,7 @@ public class RutaReferenceVisitor extend
&& ((RutaCondition) s).getNameStart()-1 == start
&& start == ((RutaCondition) s).getNameEnd()-1) {
result = s;
- } else if(s instanceof RutaExpression && s.sourceStart() <= start && start
<= s.sourceEnd()) {
+ } else if(s instanceof RutaExpression && s.sourceStart() == start &&
s.sourceEnd() == start) {
result = s;
}
return super.visit(s);
