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-2602 check for null or empty description when copying consensus
[jalview.git]
/
test
/
jalview
/
structure
/
StructureSelectionManagerTest.java
diff --git
a/test/jalview/structure/StructureSelectionManagerTest.java
b/test/jalview/structure/StructureSelectionManagerTest.java
index
aecdbf9
..
a7e52ff
100644
(file)
--- a/
test/jalview/structure/StructureSelectionManagerTest.java
+++ b/
test/jalview/structure/StructureSelectionManagerTest.java
@@
-27,6
+27,7
@@
import jalview.datamodel.AlignedCodonFrame;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.datamodel.Sequence;
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
+import jalview.gui.JvOptionPane;
import jalview.io.DataSourceType;
import jalview.io.StructureFile;
import jalview.util.MapList;
import jalview.io.DataSourceType;
import jalview.io.StructureFile;
import jalview.util.MapList;
@@
-34,11
+35,20
@@
import jalview.util.MapList;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
+import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class StructureSelectionManagerTest
{
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class StructureSelectionManagerTest
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private StructureSelectionManager ssm;
@BeforeMethod(alwaysRun = true)
private StructureSelectionManager ssm;
@BeforeMethod(alwaysRun = true)
@@
-138,7
+148,7
@@
public class StructureSelectionManagerTest
SequenceFeature sf = pmap.getSeqs().get(0).getSequenceFeatures()[0];
assertEquals("RESNUM", sf.getType());
assertEquals("1gaq", sf.getFeatureGroup());
SequenceFeature sf = pmap.getSeqs().get(0).getSequenceFeatures()[0];
assertEquals("RESNUM", sf.getType());
assertEquals("1gaq", sf.getFeatureGroup());
- assertEquals("GLU:19 1gaqA", sf.getDescription());
+ assertEquals("GLU: 19 1gaqA", sf.getDescription());
/*
* Verify a RESNUM sequence feature in the StructureSelectionManager mapped
/*
* Verify a RESNUM sequence feature in the StructureSelectionManager mapped
@@
-148,6
+158,6
@@
public class StructureSelectionManagerTest
sf = map.sequence.getSequenceFeatures()[0];
assertEquals("RESNUM", sf.getType());
assertEquals("1gaq", sf.getFeatureGroup());
sf = map.sequence.getSequenceFeatures()[0];
assertEquals("RESNUM", sf.getType());
assertEquals("1gaq", sf.getFeatureGroup());
- assertEquals("ALA:1 1gaqB", sf.getDescription());
+ assertEquals("ALA: 1 1gaqB", sf.getDescription());
}
}
}
}