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
Merge branch 'develop' into bug/JAL-2431splitFrameNewView
[jalview.git]
/
test
/
jalview
/
ext
/
rbvi
/
chimera
/
JalviewChimeraView.java
diff --git
a/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
b/test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
index
449b219
..
d85bb10
100644
(file)
--- a/
test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
+++ b/
test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
@@
-35,11
+35,11
@@
import jalview.datamodel.SequenceFeature;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.Desktop;
+import jalview.gui.JvOptionPane;
import jalview.gui.Preferences;
import jalview.gui.StructureViewer;
import jalview.gui.StructureViewer.ViewerType;
import jalview.io.FileLoader;
import jalview.gui.Preferences;
import jalview.gui.StructureViewer;
import jalview.gui.StructureViewer.ViewerType;
import jalview.io.FileLoader;
-import jalview.io.FormatAdapter;
import jalview.structure.StructureMapping;
import jalview.structure.StructureSelectionManager;
import jalview.ws.sifts.SiftsClient;
import jalview.structure.StructureMapping;
import jalview.structure.StructureSelectionManager;
import jalview.ws.sifts.SiftsClient;
@@
-50,6
+50,7
@@
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.Vector;
import java.io.IOException;
import java.util.List;
import java.util.Vector;
+import jalview.io.DataSourceType;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
@@
-60,6
+61,13
@@
import org.testng.annotations.Test;
public class JalviewChimeraView
{
public class JalviewChimeraView
{
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
private JalviewStructureDisplayI chimeraViewer;
/**
private JalviewStructureDisplayI chimeraViewer;
/**
@@
-111,7
+119,7
@@
public class JalviewChimeraView
{
String inFile = "examples/1gaq.txt";
AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(inFile,
{
String inFile = "examples/1gaq.txt";
AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(inFile,
- FormatAdapter.FILE);
+ DataSourceType.FILE);
assertNotNull(af, "Failed to create AlignFrame");
SequenceI sq = af.getViewport().getAlignment().getSequenceAt(0);
assertEquals(sq.getName(), "1GAQ|A");
assertNotNull(af, "Failed to create AlignFrame");
SequenceI sq = af.getViewport().getAlignment().getSequenceAt(0);
assertEquals(sq.getName(), "1GAQ|A");
@@
-162,7
+170,7
@@
public class JalviewChimeraView
{
String inFile = "examples/uniref50.fa";
AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(inFile,
{
String inFile = "examples/uniref50.fa";
AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(inFile,
- FormatAdapter.FILE);
+ DataSourceType.FILE);
assertNotNull(af, "Failed to create AlignFrame");
SequenceI sq = af.getViewport().getAlignment().findName("FER2_ARATH");
assertNotNull(sq, "Didn't find FER2_ARATH");
assertNotNull(af, "Failed to create AlignFrame");
SequenceI sq = af.getViewport().getAlignment().findName("FER2_ARATH");
assertNotNull(sq, "Didn't find FER2_ARATH");
@@
-349,7
+357,7
@@
public class JalviewChimeraView
{
String inFile = "examples/uniref50.fa";
AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(inFile,
{
String inFile = "examples/uniref50.fa";
AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(inFile,
- FormatAdapter.FILE);
+ DataSourceType.FILE);
assertNotNull(af, "Failed to create AlignFrame");
SequenceI fer2Arath = af.getViewport().getAlignment()
.findName("FER2_ARATH");
assertNotNull(af, "Failed to create AlignFrame");
SequenceI fer2Arath = af.getViewport().getAlignment()
.findName("FER2_ARATH");