JAL-2490 tidy code and tests for feature export in Jalview format

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

diff --git a/test/jalview/datamodel/features/SequenceFeaturesTest.java b/test/jalview/datamodel/features/SequenceFeaturesTest.java
index 5ff2d7b..eaa5276 100644 (file)
--- a/test/jalview/datamodel/features/SequenceFeaturesTest.java
+++ b/test/jalview/datamodel/features/SequenceFeaturesTest.java
@@ -689,8 +689,14 @@ public class SequenceFeaturesTest
     features = store.getAllFeatures();
     assertEquals(features.size(), 5);
     assertTrue(features.contains(sf5));
+
+    /*
+     * select by type does not apply to non-positional features
+     */
     features = store.getAllFeatures("Cath");
-    assertTrue(features.isEmpty());
+    assertEquals(features.size(), 1);
+    assertTrue(features.contains(sf3));
+
     features = store.getAllFeatures("Pfam", "Cath", "Metal");
     assertEquals(features.size(), 3);
     assertTrue(features.contains(sf1));
@@ -890,14 +896,14 @@ public class SequenceFeaturesTest
     assertFalse(iterator.hasNext());
 
     /*
-     * two types specified
+     * two types specified - get sorted alphabetically
      */
     types = sf.varargToTypes("Metal", "Helix");
     iterator = types.iterator();
     assertTrue(iterator.hasNext());
-    assertEquals(iterator.next(), "Metal");
-    assertTrue(iterator.hasNext());
     assertEquals(iterator.next(), "Helix");
+    assertTrue(iterator.hasNext());
+    assertEquals(iterator.next(), "Metal");
     assertFalse(iterator.hasNext());
 
     /*
@@ -906,9 +912,9 @@ public class SequenceFeaturesTest
     types = sf.varargToTypes("Metal", null, "Helix");
     iterator = types.iterator();
     assertTrue(iterator.hasNext());
-    assertEquals(iterator.next(), "Metal");
-    assertTrue(iterator.hasNext());
     assertEquals(iterator.next(), "Helix");
+    assertTrue(iterator.hasNext());
+    assertEquals(iterator.next(), "Metal");
     assertFalse(iterator.hasNext());
   }