Merge branch 'develop' into feature/JAL-3551Pymol

[jalview.git] / test / jalview / io / JSONFileTest.java

diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java
index 5e835bf..2d5f7a2 100644 (file)
--- a/test/jalview/io/JSONFileTest.java
+++ b/test/jalview/io/JSONFileTest.java
@@ -22,7 +22,8 @@ package jalview.io;
 
 import static org.testng.AssertJUnit.assertNotNull;
 
-import jalview.api.AlignExportSettingI;
+import jalview.api.AlignExportSettingsI;
+import jalview.datamodel.AlignExportSettingsAdapter;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.AlignmentI;
@@ -94,7 +95,7 @@ public class JSONFileTest
 
   private JSONFile jf;
 
-  private AlignExportSettingI exportSettings;
+  private AlignExportSettingsI exportSettings;
 
   @BeforeTest(alwaysRun = true)
   public void setup() throws Exception
@@ -208,44 +209,7 @@ public class JSONFileTest
     TEST_ANOT_HEIGHT = expectedAnnots.size();
     TEST_CS_HEIGHT = expectedColSel.getNumberOfRegions();
 
-    exportSettings = new AlignExportSettingI()
-    {
-      @Override
-      public boolean isExportHiddenSequences()
-      {
-        return true;
-      }
-
-      @Override
-      public boolean isExportHiddenColumns()
-      {
-        return true;
-      }
-
-      @Override
-      public boolean isExportGroups()
-      {
-        return true;
-      }
-
-      @Override
-      public boolean isExportFeatures()
-      {
-        return true;
-      }
-
-      @Override
-      public boolean isExportAnnotations()
-      {
-        return true;
-      }
-
-      @Override
-      public boolean isCancelled()
-      {
-        return false;
-      }
-    };
+    exportSettings = new AlignExportSettingsAdapter(true);
 
     AppletFormatAdapter formatAdapter = new AppletFormatAdapter();
     try
@@ -272,7 +236,7 @@ public class JSONFileTest
       testAlignment = formatAdapter.readFile(jsonOutput,
               DataSourceType.PASTE, FileFormat.Json);
       testJsonFile = (JSONFile) formatAdapter.getAlignFile();
-      // System.out.println(jsonOutput);
+      System.out.println(jsonOutput);
     } catch (IOException e)
     {
       e.printStackTrace();