From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 20 Jul 2018 10:15:20 +0000 (+0100)
Subject: JAL-3048 test updated for AlignExportSettings changes
X-Git-Tag: Release_2_11_4_0~45^2~18^2~525
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=91fb50c7dfcda9dcb3399d284f252075e89d54ff;p=jalview.git

JAL-3048 test updated for AlignExportSettings changes
---

diff --git a/test/jalview/io/JSONFileTest.java b/test/jalview/io/JSONFileTest.java
index cbe2441..560a6a8 100644
--- a/test/jalview/io/JSONFileTest.java
+++ b/test/jalview/io/JSONFileTest.java
@@ -22,10 +22,10 @@ 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.AlignmentExportData;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.Annotation;
 import jalview.datamodel.HiddenColumns;
@@ -40,7 +40,6 @@ import jalview.json.binding.biojson.v1.ColourSchemeMapper;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.ResidueColourScheme;
 
-import java.awt.event.ActionListener;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -96,7 +95,7 @@ public class JSONFileTest
 
   private JSONFile jf;
 
-  private AlignExportSettingI exportSettings;
+  private AlignExportSettingsI exportSettings;
 
   @BeforeTest(alwaysRun = true)
   public void setup() throws Exception
@@ -210,65 +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;
-      }
-
-      @Override
-      public AlignmentExportData getAlignExportData()
-      {
-        // TODO Auto-generated method stub
-        return null;
-      }
-
-      @Override
-      public void addActionListener(ActionListener actionListener)
-      {
-        // TODO Auto-generated method stub
-        
-      }
-
-      @Override
-      public void doShowSettings()
-      {
-        // TODO Auto-generated method stub
-        
-      }
-    };
+    exportSettings = new AlignExportSettingsAdapter(true);
 
     AppletFormatAdapter formatAdapter = new AppletFormatAdapter();
     try