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 (parent:
141f91e
)
Test suite try/catch reverted
author
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Mon, 4 Feb 2019 14:45:20 +0000
(08:45 -0600)
committer
hansonr
<hansonr@STO24954W.ad.stolaf.edu>
Mon, 4 Feb 2019 14:45:20 +0000
(08:45 -0600)
test/jalview/analysis/AlignmentUtilsTests.java
patch
|
blob
|
history
test/jalview/analysis/CrossRefTest.java
patch
|
blob
|
history
test/jalview/datamodel/SequenceTest.java
patch
|
blob
|
history
test/jalview/gui/StructureChooserTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/analysis/AlignmentUtilsTests.java
b/test/jalview/analysis/AlignmentUtilsTests.java
index
7c6f624
..
cc438be
100644
(file)
--- a/
test/jalview/analysis/AlignmentUtilsTests.java
+++ b/
test/jalview/analysis/AlignmentUtilsTests.java
@@
-975,12
+975,7
@@
public class AlignmentUtilsTests
assertTrue(AlignmentUtils.haveCrossRef(seq2, seq1));
// now the other way round
assertTrue(AlignmentUtils.haveCrossRef(seq2, seq1));
// now the other way round
- try {
- seq1.setDBRefs(null);
- } catch (InvalidArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ seq1.setDBRefs(null);
seq2.addDBRef(new DBRefEntry("EMBL", "1", "A12345"));
assertTrue(AlignmentUtils.haveCrossRef(seq1, seq2));
assertTrue(AlignmentUtils.haveCrossRef(seq2, seq1));
seq2.addDBRef(new DBRefEntry("EMBL", "1", "A12345"));
assertTrue(AlignmentUtils.haveCrossRef(seq1, seq2));
assertTrue(AlignmentUtils.haveCrossRef(seq2, seq1));
diff --git
a/test/jalview/analysis/CrossRefTest.java
b/test/jalview/analysis/CrossRefTest.java
index
a398cc9
..
fed31b1
100644
(file)
--- a/
test/jalview/analysis/CrossRefTest.java
+++ b/
test/jalview/analysis/CrossRefTest.java
@@
-143,12
+143,7
@@
public class CrossRefTest
* and others to dna coding databases
*/
sources.clear();
* and others to dna coding databases
*/
sources.clear();
- try {
- seq.setDBRefs(null);
- } catch (InvalidArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ seq.setDBRefs(null);
seq.addDBRef(new DBRefEntry("UNIPROT", "0", "A1234"));
seq.addDBRef(new DBRefEntry("EMBLCDS", "0", "E2347"));
SequenceI seq2 = new Sequence("Seq2", "MGKYQARLSS");
seq.addDBRef(new DBRefEntry("UNIPROT", "0", "A1234"));
seq.addDBRef(new DBRefEntry("EMBLCDS", "0", "E2347"));
SequenceI seq2 = new Sequence("Seq2", "MGKYQARLSS");
diff --git
a/test/jalview/datamodel/SequenceTest.java
b/test/jalview/datamodel/SequenceTest.java
index
bf6d403
..
e262659
100644
(file)
--- a/
test/jalview/datamodel/SequenceTest.java
+++ b/
test/jalview/datamodel/SequenceTest.java
@@
-1225,12
+1225,7
@@
public class SequenceTest
assertTrue(primaryDBRefs.isEmpty());
// empty dbrefs
assertTrue(primaryDBRefs.isEmpty());
// empty dbrefs
- try {
- sq.setDBRefs(new ArrayList<DBRefEntry>());
- } catch (InvalidArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ sq.setDBRefs(null);
primaryDBRefs = sq.getPrimaryDBRefs();
assertTrue(primaryDBRefs.isEmpty());
primaryDBRefs = sq.getPrimaryDBRefs();
assertTrue(primaryDBRefs.isEmpty());
diff --git
a/test/jalview/gui/StructureChooserTest.java
b/test/jalview/gui/StructureChooserTest.java
index
3f7a3f8
..
073bde8
100644
(file)
--- a/
test/jalview/gui/StructureChooserTest.java
+++ b/
test/jalview/gui/StructureChooserTest.java
@@
-94,12
+94,7
@@
public class StructureChooserTest
assertEquals(
"text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4 OR text:4kqy",
query);
assertEquals(
"text:XYZ_1 OR text:XYZ_2 OR text:XYZ_3 OR text:XYZ_4 OR text:4kqy",
query);
- try {
- seq.setDBRefs(null);
- } catch (InvalidArgumentException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ seq.setDBRefs(null);
query = StructureChooser.buildQuery(seq);
assertEquals("text:4kqy", query);
query = StructureChooser.buildQuery(seq);
assertEquals("text:4kqy", query);