You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2017/11/09 20:18:03 UTC

svn commit: r1814770 - in /uima/uimafit/trunk/uimafit-core/src: main/java/org/apache/uima/fit/util/CasUtil.java test/java/org/apache/uima/fit/util/JCasUtilTest.java

Author: rec
Date: Thu Nov  9 20:18:03 2017
New Revision: 1814770

URL: http://svn.apache.org/viewvc?rev=1814770&view=rev
Log:
[UIMA-5637] JCasUtil.selectAt has different meaning than expected

- Replace && with || to fix the bug
- Extended unit test to cover the the problematic case

Modified:
    uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/util/CasUtil.java
    uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java

Modified: uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/util/CasUtil.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/util/CasUtil.java?rev=1814770&r1=1814769&r2=1814770&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/util/CasUtil.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/main/java/org/apache/uima/fit/util/CasUtil.java Thu Nov  9 20:18:03 2017
@@ -299,7 +299,7 @@ public final class CasUtil {
     while (it.isValid()) {
       AnnotationFS a = it.get();
       // If the offsets do not match the specified offets, we're done
-      if (a.getBegin() != aBegin && a.getEnd() != aEnd) {
+      if (a.getBegin() != aBegin || a.getEnd() != aEnd) {
         break;
       }
       it.moveToNext();

Modified: uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java
URL: http://svn.apache.org/viewvc/uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java?rev=1814770&r1=1814769&r2=1814770&view=diff
==============================================================================
--- uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java (original)
+++ uima/uimafit/trunk/uimafit-core/src/test/java/org/apache/uima/fit/util/JCasUtilTest.java Thu Nov  9 20:18:03 2017
@@ -828,12 +828,13 @@ public class JCasUtilTest extends Compon
     Token a = new Token(this.jCas, 0, 1);
     Token b = new Token(this.jCas, 2, 3);
     Token bc = new Token(this.jCas, 2, 5);
-    Token c = new Token(this.jCas, 4, 5);
-    Token c1 = new Token(this.jCas, 4, 5);
-    Token d = new Token(this.jCas, 4, 7);
-    Token cd = new Token(this.jCas, 6, 7);
-    Token e = new Token(this.jCas, 8, 9);
-    for (Token token : Arrays.asList(a, b, bc, c, c1, d, cd, e)) {
+    Token c = new Token(this.jCas, 4, 6);
+    Token c1 = new Token(this.jCas, 4, 6);
+    Token d = new Token(this.jCas, 4, 5);
+    Token e = new Token(this.jCas, 4, 7);
+    Token cde = new Token(this.jCas, 6, 7);
+    Token f = new Token(this.jCas, 8, 9);
+    for (Token token : Arrays.asList(a, b, bc, c, c1, d, e, cde, e, f)) {
       token.addToIndexes();
     }
 
@@ -852,12 +853,13 @@ public class JCasUtilTest extends Compon
     Token a = new Token(this.jCas, 0, 1);
     Token b = new Token(this.jCas, 2, 3);
     Token bc = new Token(this.jCas, 2, 5);
-    Token c = new Token(this.jCas, 4, 5);
-    Token c1 = new Token(this.jCas, 4, 5);
-    Token d = new Token(this.jCas, 4, 7);
-    Token cd = new Token(this.jCas, 6, 7);
-    Token e = new Token(this.jCas, 8, 9);
-    for (Token token : Arrays.asList(a, b, bc, c, c1, d, cd, e)) {
+    Token c = new Token(this.jCas, 4, 6);
+    Token c1 = new Token(this.jCas, 4, 6);
+    Token d = new Token(this.jCas, 4, 5);
+    Token e = new Token(this.jCas, 4, 7);
+    Token cde = new Token(this.jCas, 6, 7);
+    Token f = new Token(this.jCas, 8, 9);
+    for (Token token : Arrays.asList(a, b, bc, c, c1, d, e, cde, e, f)) {
       token.addToIndexes();
     }