JAL-2164 revert tests depending on import of legacy jalview projects
authorJim Procter <jprocter@issues.jalview.org>
Fri, 29 Jul 2016 15:07:38 +0000 (16:07 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 29 Jul 2016 15:07:38 +0000 (16:07 +0100)
test/jalview/io/Jalview2xmlTests.java

index d941242..38153df 100644 (file)
@@ -41,8 +41,6 @@ import jalview.gui.Desktop;
 import jalview.gui.Jalview2XML;
 import jalview.schemes.AnnotationColourGradient;
 import jalview.schemes.ColourSchemeI;
-import jalview.structure.StructureImportSettings;
-import jalview.structure.StructureImportSettings.StructureParser;
 import jalview.viewmodel.AlignmentViewport;
 
 import java.io.File;
@@ -276,9 +274,6 @@ public class Jalview2xmlTests
             Boolean.TRUE.toString());
     Cache.applicationProperties.setProperty("ADD_SS_ANN",
             Boolean.TRUE.toString());
-     StructureImportSettings.setDefaultStructureFileFormat("PDB");
-    StructureImportSettings
-            .setDefaultPDBFileParser(StructureParser.JALVIEW_PARSER);
     AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
             "examples/exampleFile_2_7.jar", FormatAdapter.FILE);
     assertTrue("Didn't read in the example file correctly.", af != null);
@@ -378,9 +373,6 @@ public class Jalview2xmlTests
   @Test(groups = { "Functional" }, enabled = true)
   public void testStoreAndRecoverExpandedviews() throws Exception
   {
-    StructureImportSettings
-            .setDefaultPDBFileParser(StructureParser.JALVIEW_PARSER);
-    StructureImportSettings.setDefaultStructureFileFormat("PDB");
     AlignFrame af = new jalview.io.FileLoader().LoadFileWaitTillLoaded(
             "examples/exampleFile_2_7.jar", FormatAdapter.FILE);
     assertTrue("Didn't read in the example file correctly.", af != null);
@@ -443,7 +435,6 @@ public class Jalview2xmlTests
   public void testStoreAndRecoverReferenceSeqSettings() throws Exception
   {
     Desktop.instance.closeAll_actionPerformed(null);
-    StructureImportSettings.setDefaultStructureFileFormat("PDB");
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "examples/exampleFile_2_7.jar", FormatAdapter.FILE);
     assertTrue("Didn't read in the example file correctly.", af != null);