You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by co...@apache.org on 2011/08/17 13:36:22 UTC

svn commit: r1158640 - in /incubator/opennlp/trunk/opennlp-tools/src: main/java/opennlp/tools/util/Span.java test/java/opennlp/tools/util/SpanTest.java

Author: colen
Date: Wed Aug 17 11:36:22 2011
New Revision: 1158640

URL: http://svn.apache.org/viewvc?rev=1158640&view=rev
Log:
OPENNLP-248 equals does not check span type correctly if one has null type

Modified:
    incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/Span.java
    incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java

Modified: incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/Span.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/Span.java?rev=1158640&r1=1158639&r2=1158640&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/Span.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/util/Span.java Wed Aug 17 11:36:22 2011
@@ -227,7 +227,8 @@ public class Span implements Comparable<
 
       result = (getStart() == s.getStart()) && 
           (getEnd() == s.getEnd()) &&
-          (getType() != null ? type.equals(s.getType()) : true);
+          (getType() != null ? type.equals(s.getType()) : true) &&
+          (s.getType() != null ? s.getType().equals(getType()) : true);
     }
     else {
       result = false;

Modified: incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java
URL: http://svn.apache.org/viewvc/incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java?rev=1158640&r1=1158639&r2=1158640&view=diff
==============================================================================
--- incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java (original)
+++ incubator/opennlp/trunk/opennlp-tools/src/test/java/opennlp/tools/util/SpanTest.java Wed Aug 17 11:36:22 2011
@@ -225,12 +225,19 @@ public class SpanTest {
 
     assertTrue(a1.equals(a2));
     
+    // end is different
     Span b1 = new Span(100, 100, "test");
     assertFalse(a1.equals(b1));
     
+    // type is different
     Span c1 = new Span(100, 1000, "Test");
     assertFalse(a1.equals(c1));
     
+    Span d1 = new Span(100, 1000);
+    
+    assertFalse(d1.equals(a1));
+    assertFalse(a1.equals(d1));
+    
   }
 
   /**