X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolVsJalviewPDBParserEndToEndTest.java;h=0bc41a3c4260eed58ab7ebd90d0a699a6ea29429;hb=cd669a0e8c7b91b379bca8fe6e702cf0fcbd1ce0;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..0bc41a3 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,12 +46,24 @@ 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)
     {
-      System.err
-              .println("You must provide a PDB directory in the launch argument");
+      System.err.println(
+              "You must provide a PDB directory in the launch argument");
       return;
     }
 
@@ -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)
     {
@@ -72,8 +87,8 @@ public class JmolVsJalviewPDBParserEndToEndTest
       try
       {
         mctest = new PDBfile(false, false, false, testFile,
-                AppletFormatAdapter.FILE);
-        jtest = new JmolParser(testFile, AppletFormatAdapter.FILE);
+                DataSourceType.FILE);
+        jtest = new JmolParser(testFile, DataSourceType.FILE);
       } catch (IOException e)
       {
         System.err.println("Exception thrown while parsing : " + pdbStr);
@@ -104,13 +119,12 @@ public class JmolVsJalviewPDBParserEndToEndTest
     int count = 0;
 
     System.out.println("\n\nTotal sequence Scanned : " + totalSeqScanned);
-    System.out.println("Total sequence passed : "
-            + (totalSeqScanned - totalFail));
+    System.out.println(
+            "Total sequence passed : " + (totalSeqScanned - totalFail));
     System.out.println("Total sequence failed : " + totalFail);
-    System.out
-            .println("Success rate: "
-                    + ((totalSeqScanned - totalFail) * 100)
-                    / totalSeqScanned + "%");
+    System.out.println("Success rate: "
+            + ((totalSeqScanned - totalFail) * 100) / totalSeqScanned
+            + "%");
     System.out.println("\nList of " + failedFiles.size()
             + " file(s) with sequence diffs:");
     for (String problemFile : failedFiles)