git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
d3927fe
..
eaa5276
100644
(file)
--- a/
test/jalview/datamodel/features/SequenceFeaturesTest.java
+++ b/
test/jalview/datamodel/features/SequenceFeaturesTest.java
@@
-896,14
+896,14
@@
public class SequenceFeaturesTest
assertFalse(iterator.hasNext());
/*
assertFalse(iterator.hasNext());
/*
- * two types specified
+ * two types specified - get sorted alphabetically
*/
types = sf.varargToTypes("Metal", "Helix");
iterator = types.iterator();
assertTrue(iterator.hasNext());
*/
types = sf.varargToTypes("Metal", "Helix");
iterator = types.iterator();
assertTrue(iterator.hasNext());
- assertEquals(iterator.next(), "Metal");
- assertTrue(iterator.hasNext());
assertEquals(iterator.next(), "Helix");
assertEquals(iterator.next(), "Helix");
+ assertTrue(iterator.hasNext());
+ assertEquals(iterator.next(), "Metal");
assertFalse(iterator.hasNext());
/*
assertFalse(iterator.hasNext());
/*
@@
-912,9
+912,9
@@
public class SequenceFeaturesTest
types = sf.varargToTypes("Metal", null, "Helix");
iterator = types.iterator();
assertTrue(iterator.hasNext());
types = sf.varargToTypes("Metal", null, "Helix");
iterator = types.iterator();
assertTrue(iterator.hasNext());
- assertEquals(iterator.next(), "Metal");
- assertTrue(iterator.hasNext());
assertEquals(iterator.next(), "Helix");
assertEquals(iterator.next(), "Helix");
+ assertTrue(iterator.hasNext());
+ assertEquals(iterator.next(), "Metal");
assertFalse(iterator.hasNext());
}
assertFalse(iterator.hasNext());
}