JAL-3518 basic refactoring / pull up of superposeStructures; to tidy!

[jalview.git] / test / jalview / structures / models / AAStructureBindingModelTest.java

diff --git a/test/jalview/structures/models/AAStructureBindingModelTest.java b/test/jalview/structures/models/AAStructureBindingModelTest.java
index c890536..c201926 100644 (file)
--- a/test/jalview/structures/models/AAStructureBindingModelTest.java
+++ b/test/jalview/structures/models/AAStructureBindingModelTest.java
@@ -28,17 +28,17 @@ import jalview.api.AlignmentViewPanel;
 import jalview.api.SequenceRenderer;
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
-import jalview.datamodel.HiddenColumns;
 import jalview.datamodel.PDBEntry;
 import jalview.datamodel.PDBEntry.Type;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceI;
 import jalview.gui.JvOptionPane;
+import jalview.gui.StructureViewer.ViewerType;
 import jalview.io.DataSourceType;
 import jalview.io.FileFormats;
 import jalview.structure.AtomSpec;
+import jalview.structure.StructureCommandsI.SuperposeData;
 import jalview.structure.StructureSelectionManager;
-import jalview.structures.models.AAStructureBindingModel.SuperposeData;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -149,13 +149,6 @@ public class AAStructureBindingModelTest
       }
       
       @Override
-      public String superposeStructures(AlignmentI[] alignments,
-              int[] structureIndices, HiddenColumns[] hiddenCols)
-      {
-        return null;
-      }
-      
-      @Override
       public void highlightAtoms(List<AtomSpec> atoms)
       {
       }
@@ -178,6 +171,12 @@ public class AAStructureBindingModelTest
       {
         return 0;
       }
+
+      @Override
+      protected ViewerType getViewerType()
+      {
+        return null;
+      }
     };
     String[][] chains = binder.getChains();
     assertFalse(chains == null || chains[0] == null,
@@ -247,13 +246,6 @@ public class AAStructureBindingModelTest
       }
 
       @Override
-      public String superposeStructures(AlignmentI[] als, int[] alm,
-              HiddenColumns[] alc)
-      {
-        return null;
-      }
-
-      @Override
       public SequenceRenderer getSequenceRenderer(
               AlignmentViewPanel alignment)
       {
@@ -272,6 +264,12 @@ public class AAStructureBindingModelTest
       {
         return 0;
       }
+
+      @Override
+      protected ViewerType getViewerType()
+      {
+        return null;
+      }
     };
   }
 
@@ -288,7 +286,7 @@ public class AAStructureBindingModelTest
     SuperposeData[] structs = new SuperposeData[testee.getStructureFiles().length];
     for (int i = 0; i < structs.length; i++)
     {
-      structs[i] = testee.new SuperposeData(al.getWidth());
+      structs[i] = new SuperposeData(al.getWidth(), 0);
     }
     /*
      * initialise BitSet of 'superposable columns' to true (would be false for
@@ -335,7 +333,7 @@ public class AAStructureBindingModelTest
     SuperposeData[] structs = new SuperposeData[al.getHeight()];
     for (int i = 0; i < structs.length; i++)
     {
-      structs[i] = testee.new SuperposeData(al.getWidth());
+      structs[i] = new SuperposeData(al.getWidth(), 0);
     }
     /*
      * initialise BitSet of 'superposable columns' to true (would be false for
@@ -363,4 +361,4 @@ public class AAStructureBindingModelTest
     assertFalse(matched.get(4)); // superposable, but hidden, column
     assertTrue(matched.get(5));
   }
-}
+}
\ No newline at end of file