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-1499 corrected domainend parsing, add gene name to domain desc
[jalview.git]
/
test
/
jalview
/
io
/
MegaFileTest.java
diff --git
a/test/jalview/io/MegaFileTest.java
b/test/jalview/io/MegaFileTest.java
index
14cb27e
..
2766610
100644
(file)
--- a/
test/jalview/io/MegaFileTest.java
+++ b/
test/jalview/io/MegaFileTest.java
@@
-655,24
+655,24
@@
public class MegaFileTest
for (SequenceI seq : seqs) {
SequenceFeature[] sfs = seq.getSequenceFeatures();
// features are added in the order in which their end is found
for (SequenceI seq : seqs) {
SequenceFeature[] sfs = seq.getSequenceFeatures();
// features are added in the order in which their end is found
- // (Gene before Domain when they end together)
+ // (Domain before Gene when they end together)
assertEquals(5, sfs.length);
// TODO settle which way round type/description go!
assertEquals(5, sfs.length);
// TODO settle which way round type/description go!
- assertEquals("Exon1", sfs[0].type);
+ assertEquals("Exon1 (Adh)", sfs[0].type);
assertEquals("Domain", sfs[0].description);
assertEquals(7, sfs[0].begin);
assertEquals(12, sfs[0].end);
assertEquals("Domain", sfs[0].description);
assertEquals(7, sfs[0].begin);
assertEquals(12, sfs[0].end);
- assertEquals("Intron1", sfs[1].type);
+ assertEquals("Intron1 (Adh)", sfs[1].type);
assertEquals("Domain", sfs[1].description);
assertEquals(13, sfs[1].begin);
assertEquals(18, sfs[1].end);
assertEquals("Domain", sfs[1].description);
assertEquals(13, sfs[1].begin);
assertEquals(18, sfs[1].end);
- assertEquals("Adh", sfs[2].type);
- assertEquals("Gene", sfs[2].description);
- assertEquals(7, sfs[2].begin);
+ assertEquals("Exon2 (Adh)", sfs[2].type);
+ assertEquals("Domain", sfs[2].description);
+ assertEquals(19, sfs[2].begin);
assertEquals(24, sfs[2].end);
assertEquals(24, sfs[2].end);
- assertEquals("Exon2", sfs[3].type);
- assertEquals("Domain", sfs[3].description);
- assertEquals(19, sfs[3].begin);
+ assertEquals("Adh", sfs[3].type);
+ assertEquals("Gene", sfs[3].description);
+ assertEquals(7, sfs[3].begin);
assertEquals(24, sfs[3].end);
assertEquals("BindingSite", sfs[4].type);
assertEquals("Domain", sfs[4].description);
assertEquals(24, sfs[3].end);
assertEquals("BindingSite", sfs[4].type);
assertEquals("Domain", sfs[4].description);