X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolVsJalviewPDBParserEndToEndTest.java;fp=test%2Fjalview%2Fext%2Fjmol%2FJmolVsJalviewPDBParserEndToEndTest.java;h=d285b04f9d04e39122e93bdb51bec6a72620db5f;hb=2595e9d4ee0dbbd3406a98c4e49a61ccde806479;hp=254e08297d1d34043a32dcadf4584628ad3a27b6;hpb=e20075ba805d744d7cc4976e2b8d5e5840fb0a8d;p=jalview.git diff --git a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java index 254e082..d285b04 100644 --- a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java +++ b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java @@ -21,7 +21,8 @@ package jalview.ext.jmol; import jalview.datamodel.SequenceI; -import jalview.io.AppletFormatAdapter; +import jalview.gui.JvOptionPane; +import jalview.io.DataSourceType; import java.io.File; import java.io.IOException; @@ -29,6 +30,8 @@ import java.util.HashSet; import java.util.Set; import java.util.Vector; +import org.testng.annotations.BeforeClass; + import MCview.PDBfile; /** @@ -43,6 +46,13 @@ import MCview.PDBfile; public class JmolVsJalviewPDBParserEndToEndTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + public static void main(String[] args) { if (args == null || args[0] == null) @@ -71,9 +81,8 @@ public class JmolVsJalviewPDBParserEndToEndTest JmolParser jtest = null; try { - mctest = new PDBfile(false, false, false, testFile, - AppletFormatAdapter.FILE); - jtest = new JmolParser(testFile, AppletFormatAdapter.FILE); + mctest = new PDBfile(false, false, false, testFile, DataSourceType.FILE); + jtest = new JmolParser(testFile, DataSourceType.FILE); } catch (IOException e) { System.err.println("Exception thrown while parsing : " + pdbStr);