JAL-3551 working proof of concept of Jalview driving PyMOL

[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 f901cbd..5e0e52f 100644 (file)
--- a/test/jalview/structures/models/AAStructureBindingModelTest.java
+++ b/test/jalview/structures/models/AAStructureBindingModelTest.java
@@ -43,7 +43,7 @@ import jalview.io.FileFormats;
 import jalview.schemes.JalviewColourScheme;
 import jalview.structure.AtomSpec;
 import jalview.structure.AtomSpecModel;
-import jalview.structure.StructureCommandsI.SuperposeData;
+import jalview.structure.StructureCommandI;
 import jalview.structure.StructureMapping;
 import jalview.structure.StructureSelectionManager;
 
@@ -172,16 +172,16 @@ public class AAStructureBindingModelTest
       }
 
       @Override
-      protected List<String> executeCommand(String command,
+      protected List<String> executeCommand(StructureCommandI command,
               boolean getReply)
       {
         return null;
       }
 
       @Override
-      protected int getModelNoForFile(String chainId)
+      protected String getModelIdForFile(String chainId)
       {
-        return 0;
+        return "";
       }
 
       @Override
@@ -280,16 +280,16 @@ public class AAStructureBindingModelTest
       }
 
       @Override
-      protected List<String> executeCommand(String command,
+      protected List<String> executeCommand(StructureCommandI command,
               boolean getReply)
       {
         return null;
       }
 
       @Override
-      protected int getModelNoForFile(String chainId)
+      protected String getModelIdForFile(String chainId)
       {
-        return 0;
+        return "";
       }
 
       @Override
@@ -312,10 +312,10 @@ public class AAStructureBindingModelTest
     /*
      * create a data bean to hold data per structure file
      */
-    SuperposeData[] structs = new SuperposeData[testee.getStructureFiles().length];
+    AAStructureBindingModel.SuperposeData[] structs = new AAStructureBindingModel.SuperposeData[testee.getStructureFiles().length];
     for (int i = 0; i < structs.length; i++)
     {
-      structs[i] = new SuperposeData(al.getWidth(), 0);
+      structs[i] = new AAStructureBindingModel.SuperposeData(al.getWidth(), "0");
     }
     /*
      * initialise BitSet of 'superposable columns' to true (would be false for
@@ -360,10 +360,10 @@ public class AAStructureBindingModelTest
   @Test(groups = { "Functional" })
   public void testFindSuperposableResidues_hiddenColumn()
   {
-    SuperposeData[] structs = new SuperposeData[al.getHeight()];
+    AAStructureBindingModel.SuperposeData[] structs = new AAStructureBindingModel.SuperposeData[al.getHeight()];
     for (int i = 0; i < structs.length; i++)
     {
-      structs[i] = new SuperposeData(al.getWidth(), 0);
+      structs[i] = new AAStructureBindingModel.SuperposeData(al.getWidth(), "0");
     }
     /*
      * initialise BitSet of 'superposable columns' to true (would be false for