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
Merge branch 'Jalview-JS/develop' into merge_js_develop
[jalview.git]
/
test
/
jalview
/
datamodel
/
SequenceTest.java
diff --git
a/test/jalview/datamodel/SequenceTest.java
b/test/jalview/datamodel/SequenceTest.java
index
7238d27
..
e7cdc6a
100644
(file)
--- a/
test/jalview/datamodel/SequenceTest.java
+++ b/
test/jalview/datamodel/SequenceTest.java
@@
-47,6
+47,7
@@
import jalview.commands.EditCommand.Action;
import jalview.datamodel.PDBEntry.Type;
import jalview.gui.JvOptionPane;
import jalview.util.MapList;
import jalview.datamodel.PDBEntry.Type;
import jalview.gui.JvOptionPane;
import jalview.util.MapList;
+
import junit.extensions.PA;
public class SequenceTest
import junit.extensions.PA;
public class SequenceTest
@@
-297,8
+298,6
@@
public class SequenceTest
* invalid inputs
*/
assertNull(sq.findPositions(6, 5));
* invalid inputs
*/
assertNull(sq.findPositions(6, 5));
- assertNull(sq.findPositions(0, 5));
- assertNull(sq.findPositions(-1, 5));
/*
* all gapped ranges
/*
* all gapped ranges
@@
-341,6
+340,16
@@
public class SequenceTest
assertEquals(new Range(11, 12), sq.findPositions(5, 10)); // DE
assertEquals(new Range(8, 13), sq.findPositions(1, 13)); // the lot
assertEquals(new Range(8, 13), sq.findPositions(1, 99));
assertEquals(new Range(11, 12), sq.findPositions(5, 10)); // DE
assertEquals(new Range(8, 13), sq.findPositions(1, 13)); // the lot
assertEquals(new Range(8, 13), sq.findPositions(1, 99));
+
+ /**
+ * now try on a sequence with no gaps
+ */
+ sq.createDatasetSequence();
+ assertEquals(new Range(8, 13),
+ sq.getDatasetSequence().findPositions(1, 99));
+ assertEquals(new Range(8, 13),
+ sq.getDatasetSequence().findPositions(0, 99));
+
}
/**
}
/**