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-2629 hmmalign can now be run from the sequence pop-up menu
[jalview.git]
/
test
/
jalview
/
structure
/
StructureSelectionManagerTest.java
diff --git
a/test/jalview/structure/StructureSelectionManagerTest.java
b/test/jalview/structure/StructureSelectionManagerTest.java
index
d07f919
..
a7e52ff
100644
(file)
--- a/
test/jalview/structure/StructureSelectionManagerTest.java
+++ b/
test/jalview/structure/StructureSelectionManagerTest.java
@@
-27,24
+27,34
@@
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.io.FormatAdapter;
+import jalview.gui.JvOptionPane;
+import jalview.io.DataSourceType;
import jalview.io.StructureFile;
import jalview.util.MapList;
import java.util.ArrayList;
import java.util.List;
import jalview.io.StructureFile;
import jalview.util.MapList;
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)
public void setUp()
{
private StructureSelectionManager ssm;
@BeforeMethod(alwaysRun = true)
public void setUp()
{
- StructureViewSettings.setShowSeqFeatures(true);
+ StructureImportSettings.setShowSeqFeatures(true);
ssm = new StructureSelectionManager();
}
ssm = new StructureSelectionManager();
}
@@
-124,7
+134,7
@@
public class StructureSelectionManagerTest
sm.setProcessSecondaryStructure(true);
sm.setAddTempFacAnnot(true);
StructureFile pmap = sm.setMapping(true, new SequenceI[] { seq },
sm.setProcessSecondaryStructure(true);
sm.setAddTempFacAnnot(true);
StructureFile pmap = sm.setMapping(true, new SequenceI[] { seq },
- new String[] { null }, "examples/1gaq.txt", FormatAdapter.FILE);
+ new String[] { null }, "examples/1gaq.txt", DataSourceType.FILE);
assertTrue(pmap != null);
assertEquals(3, pmap.getSeqs().size());
assertTrue(pmap != null);
assertEquals(3, pmap.getSeqs().size());