git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d6eb029
)
JAL-653 updated test to match parsing of multi-valued GFF attribute
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 1 Apr 2016 10:57:02 +0000
(11:57 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Fri, 1 Apr 2016 10:57:02 +0000
(11:57 +0100)
test/jalview/io/FeaturesFileTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/io/FeaturesFileTest.java
b/test/jalview/io/FeaturesFileTest.java
index
7112c77
..
6da160d
100644
(file)
--- a/
test/jalview/io/FeaturesFileTest.java
+++ b/
test/jalview/io/FeaturesFileTest.java
@@
-24,14
+24,10
@@
import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertNull;
import static org.testng.AssertJUnit.assertFalse;
import static org.testng.AssertJUnit.assertNotNull;
import static org.testng.AssertJUnit.assertNull;
-import static org.testng.AssertJUnit.assertSame;
import static org.testng.AssertJUnit.assertTrue;
import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
-import jalview.datamodel.AlignedCodonFrame;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
-import jalview.datamodel.Mapping;
import jalview.datamodel.SequenceDummy;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.datamodel.SequenceDummy;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
@@
-42,9
+38,7
@@
import jalview.schemes.GraduatedColor;
import java.awt.Color;
import java.io.File;
import java.io.IOException;
import java.awt.Color;
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map;
-import java.util.Set;
import org.testng.annotations.Test;
import org.testng.annotations.Test;
@@
-167,7
+161,7
@@
public class FeaturesFileTest
.getSequenceFeatures();
assertEquals(1, sfs.length);
SequenceFeature sf = sfs[0];
.getSequenceFeatures();
assertEquals(1, sfs.length);
SequenceFeature sf = sfs[0];
- assertEquals("Iron-sulfur; 2Fe-2S", sf.description);
+ assertEquals("Iron-sulfur,2Fe-2S", sf.description);
assertEquals(44, sf.begin);
assertEquals(45, sf.end);
assertEquals("uniprot", sf.featureGroup);
assertEquals(44, sf.begin);
assertEquals(45, sf.end);
assertEquals("uniprot", sf.featureGroup);
@@
-268,7
+262,7
@@
public class FeaturesFileTest
assertEquals(1, sfs.length);
SequenceFeature sf = sfs[0];
// description parsed from Note attribute
assertEquals(1, sfs.length);
SequenceFeature sf = sfs[0];
// description parsed from Note attribute
- assertEquals("Iron-sulfur (2Fe-2S); another note", sf.description);
+ assertEquals("Iron-sulfur (2Fe-2S),another note", sf.description);
assertEquals(39, sf.begin);
assertEquals(39, sf.end);
assertEquals("uniprot", sf.featureGroup);
assertEquals(39, sf.begin);
assertEquals(39, sf.end);
assertEquals("uniprot", sf.featureGroup);