JAL-3383 removed FeatureStore.getFeatures() as 'breaks encapsulation'

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

diff --git a/test/jalview/datamodel/features/FeatureStoreLinkedTest.java b/test/jalview/datamodel/features/FeatureStoreLinkedTest.java
index 74c413f..df4e983 100644 (file)
--- a/test/jalview/datamodel/features/FeatureStoreLinkedTest.java
+++ b/test/jalview/datamodel/features/FeatureStoreLinkedTest.java
@@ -6,20 +6,25 @@ import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
 import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.features.FeatureStore.IntervalStoreType;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
 import org.testng.annotations.Test;
 
+import junit.extensions.PA;
+
+/**
+ * Tests that exercise the 'linked list' version of IntervalStore
+ */
 public class FeatureStoreLinkedTest
 {
-
   private FeatureStore newFeatureStore()
   {
-    return new FeatureStore(
-            FeatureStore.INTERVAL_STORE_LINKED_LIST);
+    return new FeatureStore(IntervalStoreType.INTERVAL_STORE_LINKED_LIST);
   }
 
   @Test(groups = "Functional")
@@ -429,7 +434,9 @@ public class FeatureStoreLinkedTest
     assertEquals(fs.getFeatureCount(true), 3);
     assertTrue(fs.delete(sf1));
     assertEquals(fs.getFeatureCount(true), 2);
-    assertEquals(fs.getFeatures().size(), 2);
+    Collection<SequenceFeature> intervalStore = (Collection<SequenceFeature>) PA
+            .getValue(fs, "features");
+    assertEquals(intervalStore.size(), 2);
     assertFalse(fs.isEmpty());
     assertTrue(fs.delete(sf2));
     assertEquals(fs.getFeatureCount(true), 1);
@@ -834,8 +841,10 @@ public class FeatureStoreLinkedTest
     assertEquals(features.size(), 2);
     assertTrue(features.contains(sf1));
     assertTrue(features.contains(sf2));
-    assertTrue(store.getFeatures().contains(sf1));
-    assertTrue(store.getFeatures().contains(sf2));
+    Collection<SequenceFeature> intervalStore = (Collection<SequenceFeature>) PA
+            .getValue(store, "features");
+    assertTrue(intervalStore.contains(sf1));
+    assertTrue(intervalStore.contains(sf2));
   
     /*
      * delete the first feature