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

[jalview.git] / test / jalview / ext / rbvi / chimera / JalviewChimeraBindingTest.java

diff --git a/test/jalview/ext/rbvi/chimera/JalviewChimeraBindingTest.java b/test/jalview/ext/rbvi/chimera/JalviewChimeraBindingTest.java
index 2604243..fde4bb5 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/JalviewChimeraBindingTest.java
+++ b/test/jalview/ext/rbvi/chimera/JalviewChimeraBindingTest.java
@@ -3,17 +3,6 @@ package jalview.ext.rbvi.chimera;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
-import jalview.datamodel.PDBEntry;
-import jalview.datamodel.SequenceI;
-import jalview.gui.AlignFrame;
-import jalview.gui.AlignViewport;
-import jalview.gui.ChimeraViewFrame;
-import jalview.gui.JalviewChimeraBindingModel;
-import jalview.io.DataSourceType;
-import jalview.io.FileLoader;
-import jalview.structure.StructureMapping;
-import jalview.structure.StructureSelectionManager;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -24,6 +13,17 @@ import org.testng.annotations.Test;
 
 import ext.edu.ucsf.rbvi.strucviz2.ChimeraModel;
 import ext.edu.ucsf.rbvi.strucviz2.StructureManager.ModelType;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceI;
+import jalview.gui.AlignFrame;
+import jalview.gui.AlignViewport;
+import jalview.gui.ChimeraViewFrame;
+import jalview.gui.JalviewChimeraBindingModel;
+import jalview.io.DataSourceType;
+import jalview.io.FileLoader;
+import jalview.structure.StructureCommandI;
+import jalview.structure.StructureMapping;
+import jalview.structure.StructureSelectionManager;
 import junit.extensions.PA;
 
 public class JalviewChimeraBindingTest
@@ -55,10 +55,10 @@ public class JalviewChimeraBindingTest
     /*
      * with no structures mapped
      */
-    String cmd = testee.buildShowStructuresCommand(av, true);
-    assertEquals(cmd, "~display; ribbon; focus");
+    StructureCommandI cmd = testee.buildShowStructuresCommand(av, true);
+    assertEquals(cmd.getCommand(), "~display; ribbon; focus");
     cmd = testee.buildShowStructuresCommand(av, false);
-    assertEquals(cmd, "~display; ribbon");
+    assertEquals(cmd.getCommand(), "~display; ribbon");
 
     /*
      * stub out a structure with chains A and B
@@ -116,7 +116,8 @@ public class JalviewChimeraBindingTest
     chainsToHide.add("1A70:B");
     chainsToHide.add("4ZHO:C");
     cmd = testee.buildShowStructuresCommand(av, false);
-    assertEquals(cmd, "~display; ribbon; ~ribbon #0:.B; ~ribbon #1:.C");
+    assertEquals(cmd.getCommand(),
+            "~display; ribbon; ~ribbon #0:.B; ~ribbon #1:.C");
 
     /*
      * show alignment only, no chains hidden
@@ -124,7 +125,8 @@ public class JalviewChimeraBindingTest
     chainsToHide.clear();
     testee.setShowAlignmentOnly(true);
     cmd = testee.buildShowStructuresCommand(av, false);
-    assertEquals(cmd,
+    assertEquals(cmd
+            .getCommand(),
             "~display; ~ribbon; ribbon #0:1-50.A,60-97.A|#1:2-97.B");
 
     /*
@@ -133,7 +135,7 @@ public class JalviewChimeraBindingTest
     chainsToHide.add("4ZHO:C");
     cmd = testee.buildShowStructuresCommand(av, false);
     String expected = "~display; ~ribbon; ribbon #0:1-50.A,60-97.A|#1:2-97.B; ~ribbon #1:.C";
-    assertEquals(cmd, expected);
+    assertEquals(cmd.getCommand(), expected);
 
     /*
      * hide columns in the mapped region - should not change the command (yet)
@@ -142,7 +144,7 @@ public class JalviewChimeraBindingTest
     int toCol = seq1.findIndex(70); // structure residue 20
     av.hideColumns(fromCol - 1, toCol - 1);
     cmd = testee.buildShowStructuresCommand(av, false);
-    assertEquals(cmd, expected);
+    assertEquals(cmd.getCommand(), expected);
 
     /*
      * select 'hide hidden columns'
@@ -151,7 +153,7 @@ public class JalviewChimeraBindingTest
     testee.setHideHiddenRegions(true);
     cmd = testee.buildShowStructuresCommand(av, false);
     expected = "~display; ~ribbon; ribbon #0:1-9.A,21-50.A,60-97.A|#1:2-10.B,22-97.B; ~ribbon #1:.C";
-    assertEquals(cmd, expected);
+    assertEquals(cmd.getCommand(), expected);
 
     /*
      * deselect 'show alignment only'
@@ -159,6 +161,6 @@ public class JalviewChimeraBindingTest
      */
     testee.setShowAlignmentOnly(false);
     cmd = testee.buildShowStructuresCommand(av, false);
-    assertEquals(cmd, "~display; ribbon; ~ribbon #1:.C");
+    assertEquals(cmd.getCommand(), "~display; ribbon; ~ribbon #1:.C");
   }
 }