JAL-3383 removed FeatureStore.getFeatures() as 'breaks encapsulation'
[jalview.git] / test / jalview / datamodel / features / FeatureStoreTest.java
index 8342018..bc179f6 100644 (file)
@@ -8,11 +8,14 @@ import static org.testng.Assert.assertTrue;
 import jalview.datamodel.SequenceFeature;
 
 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;
+
 public class FeatureStoreTest
 {
   private FeatureStore newFeatureStore()
@@ -415,7 +418,9 @@ public class FeatureStoreTest
     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);
@@ -820,8 +825,10 @@ public class FeatureStoreTest
     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