Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

[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 c1ad03a..aea12b4 100644 (file)
--- a/test/jalview/structures/models/AAStructureBindingModelTest.java
+++ b/test/jalview/structures/models/AAStructureBindingModelTest.java
@@ -23,7 +23,7 @@ package jalview.structures.models;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.awt.Color;
 import java.io.IOException;
@@ -135,61 +135,13 @@ public class AAStructureBindingModelTest
     // ideally, we would match on the actual data for the 'File' handle for
     // pasted files,
     // see JAL-623 - pasting is still not correctly handled...
-    PDBEntry importedPDB = new PDBEntry("3A6S", "", Type.PDB,
-            "Paste");
-    AAStructureBindingModel binder = new AAStructureBindingModel(
-            new StructureSelectionManager(), new PDBEntry[]
+    PDBEntry importedPDB = new PDBEntry("3A6S", "", Type.PDB, "Paste");
+    AAStructureBindingModel binder = newBindingModel(new PDBEntry[]
             { importedPDB },
             new SequenceI[][]
-            { importedAl.getSequencesArray() }, null)
-    {
-      
-      @Override
-      public void updateColours(Object source)
-      {
-      }
-      
-      @Override
-      public void releaseReferences(Object svl)
-      {
-      }
-      
-      @Override
-      public String[] getStructureFiles()
-      {
-        return null;
-      }
-      
-      @Override
-      public void highlightAtoms(List<AtomSpec> atoms)
-      {
-      }
-      
-      @Override
-      public SequenceRenderer getSequenceRenderer(AlignmentViewPanel alignment)
-      {
-        return null;
-      }
+            { importedAl.getSequencesArray() },
+            new StructureSelectionManager(), null);
 
-      @Override
-      protected List<String> executeCommand(StructureCommandI command,
-              boolean getReply)
-      {
-        return null;
-      }
-
-      @Override
-      protected String getModelIdForFile(String chainId)
-      {
-        return "";
-      }
-
-      @Override
-      protected ViewerType getViewerType()
-      {
-        return null;
-      }
-    };
     String[][] chains = binder.getChains();
     assertFalse(chains == null || chains[0] == null,
             "No chains discovered by binding");
@@ -279,6 +231,11 @@ public class AAStructureBindingModelTest
       }
 
       @Override
+      public void setBackgroundColour(Color col)
+      {
+      }
+
+      @Override
       public SequenceRenderer getSequenceRenderer(
               AlignmentViewPanel avp)
       {