Merge pull request #85 from mjdenham/master

VerseRange fix to prevent missing Search results if RangedPassage is used. This has had significant testing in And Bible.
crosswire · Sep 9, 2014 · 2dd8b0c · 2dd8b0c
2 parents b0d6b28 + db521e1
commit 2dd8b0c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/org/crosswire/jsword/passage/VerseRange.java b/src/main/java/org/crosswire/jsword/passage/VerseRange.java
@@ -624,7 +624,7 @@ public static VerseRange intersection(VerseRange a, VerseRange b) {
         Verse new_start = v11n.max(a.getStart(), b.getStart());
         Verse new_end = v11n.min(a.getEnd(), b.getEnd());
 
-        if (v11n.distance(new_start, new_end) <= 0) {
+        if (v11n.distance(new_start, new_end) >= 0) {
             return new VerseRange(a.getVersification(), new_start, new_end);
         }
 

diff --git a/src/test/java/org/crosswire/jsword/passage/VerseRangeTest.java b/src/test/java/org/crosswire/jsword/passage/VerseRangeTest.java
@@ -674,4 +674,9 @@ public void testKeyContainsVerse() {
         Key gen_allKey = gen_all;
         assertTrue(gen_allKey.contains(gen11));
     }
+
+    @Test
+    public void testIntersection() {
+        assertTrue(VerseRange.intersection(gen_all, gen_exo).contains(gen_all));
+    }
 }