X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolVsJalviewPDBParserEndToEndTest.java;h=382e20866dcacda9974624ca3f8b7f2c077b134e;hb=55ebdfcc6bd979605c9bb2b4092a422b035bc27e;hp=254e08297d1d34043a32dcadf4584628ad3a27b6;hpb=604cbee405a837565ba1a74aa9bddd62aed685ab;p=jalview.git

diff --git a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
index 254e082..382e208 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,7 +30,9 @@ import java.util.HashSet;
 import java.util.Set;
 import java.util.Vector;
 
-import MCview.PDBfile;
+import org.testng.annotations.BeforeClass;
+
+import mc_view.PDBfile;
 
 /**
  * This is not a unit test, rather it is a bulk End-to-End scan for sequences
@@ -43,6 +46,18 @@ import MCview.PDBfile;
 public class JmolVsJalviewPDBParserEndToEndTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
+  /**
+   * 
+   * @param args
+   * @j2sIgnore
+   */
   public static void main(String[] args)
   {
     if (args == null || args[0] == null)
@@ -62,7 +77,7 @@ public class JmolVsJalviewPDBParserEndToEndTest
 
   public static void testFileParser(String testDir, String[] testFiles)
   {
-    Set<String> failedFiles = new HashSet<String>();
+    Set<String> failedFiles = new HashSet<>();
     int totalSeqScanned = 0, totalFail = 0;
     for (String pdbStr : testFiles)
     {
@@ -71,9 +86,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);