JAL-3253-applet JAL-3423 TestNG/Win

[jalview.git] / test / jalview / datamodel / features / FeatureStoreJSTest.java

diff --git a/test/jalview/datamodel/features/FeatureStoreJSTest.java b/test/jalview/datamodel/features/FeatureStoreJSTest.java
index 221d7a4..2b0c9ea 100644 (file)
--- a/test/jalview/datamodel/features/FeatureStoreJSTest.java
+++ b/test/jalview/datamodel/features/FeatureStoreJSTest.java
@@ -36,10 +36,12 @@ public class FeatureStoreJSTest
     assertEquals(overlaps.get(1).getEnd(), 20);
 
     overlaps = fs.findOverlappingFeatures(12, 16);
+
     assertEquals(overlaps.size(), 3);
-    assertEquals(overlaps.get(0).getEnd(), 20);
+    // BH note, this is reversed from IS-NCList 2 1 0, not 0 1 2
+    assertEquals(overlaps.get(2).getEnd(), 20);
     assertEquals(overlaps.get(1).getEnd(), 20);
-    assertEquals(overlaps.get(2).getEnd(), 25);
+    assertEquals(overlaps.get(0).getEnd(), 25);
 
     overlaps = fs.findOverlappingFeatures(33, 33);
     assertEquals(overlaps.size(), 1);
@@ -645,14 +647,15 @@ public class FeatureStoreJSTest
   @Test(groups = "Functional")
   public void testListContains()
   {
-    assertFalse(FeatureStore.listContains(null, null));
+    FeatureStoreI featureStore = newFeatureStore();
+    assertFalse(featureStore.listContains(null, null));
     List<SequenceFeature> features = new ArrayList<>();
-    assertFalse(FeatureStore.listContains(features, null));
+    assertFalse(featureStore.listContains(features, null));
 
     SequenceFeature sf1 = new SequenceFeature("type1", "desc1", 20, 30, 3f,
             "group1");
-    assertFalse(FeatureStore.listContains(null, sf1));
-    assertFalse(FeatureStore.listContains(features, sf1));
+    assertFalse(featureStore.listContains(null, sf1));
+    assertFalse(featureStore.listContains(features, sf1));
 
     features.add(sf1);
     SequenceFeature sf2 = new SequenceFeature("type1", "desc1", 20, 30, 3f,
@@ -661,8 +664,8 @@ public class FeatureStoreJSTest
             "group1");
 
     // sf2.equals(sf1) so contains should return true
-    assertTrue(FeatureStore.listContains(features, sf2));
-    assertFalse(FeatureStore.listContains(features, sf3));
+    assertTrue(featureStore.listContains(features, sf2));
+    assertFalse(featureStore.listContains(features, sf3));
   }
 
   @Test(groups = "Functional")