Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

[jalview.git] / test / jalview / ext / jmol / JmolVsJalviewPDBParserEndToEndTest.java

diff --git a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
index 58ff990..382e208 100644 (file)
--- a/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
+++ b/test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
@@ -22,7 +22,7 @@ package jalview.ext.jmol;
 
 import jalview.datamodel.SequenceI;
 import jalview.gui.JvOptionPane;
-import jalview.io.AppletFormatAdapter;
+import jalview.io.DataSourceType;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,7 +32,7 @@ import java.util.Vector;
 
 import org.testng.annotations.BeforeClass;
 
-import MCview.PDBfile;
+import mc_view.PDBfile;
 
 /**
  * This is not a unit test, rather it is a bulk End-to-End scan for sequences
@@ -53,6 +53,11 @@ public class JmolVsJalviewPDBParserEndToEndTest
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
   }
 
+  /**
+   * 
+   * @param args
+   * @j2sIgnore
+   */
   public static void main(String[] args)
   {
     if (args == null || args[0] == null)
@@ -72,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)
     {
@@ -81,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);