JAL-2422 JAL-3551 unit tests updated for code changes

[jalview.git] / test / jalview / ext / jmol / JmolCommandsTest.java

diff --git a/test/jalview/ext/jmol/JmolCommandsTest.java b/test/jalview/ext/jmol/JmolCommandsTest.java
index 211e918..1ade00e 100644 (file)
--- a/test/jalview/ext/jmol/JmolCommandsTest.java
+++ b/test/jalview/ext/jmol/JmolCommandsTest.java
@@ -23,6 +23,15 @@ package jalview.ext.jmol;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
+import java.awt.Color;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
 import jalview.datamodel.Alignment;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.ColumnSelection;
@@ -38,15 +47,6 @@ import jalview.structure.StructureCommandsI;
 import jalview.structure.StructureMapping;
 import jalview.structure.StructureSelectionManager;
 
-import java.awt.Color;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
 public class JmolCommandsTest
 {
 
@@ -182,13 +182,12 @@ public class JmolCommandsTest
     // they were added; within colour, by model, by chain, ranges in start order
     List<StructureCommandI> commands = new JmolCommands()
             .colourBySequence(map);
-    assertEquals(commands.size(), 3);
+    assertEquals(commands.size(), 1);
     String expected1 = "select 2-5:A/1.1|9-23:A/1.1|7:B/1.1|1:A/2.1|4-7:B/2.1;color[0,0,255]";
     String expected2 = "select 3-5:A/2.1|8:A/2.1;color[255,255,0]";
     String expected3 = "select 3-9:A/1.1;color[255,0,0]";
-    assertEquals(commands.get(0).getCommand(), expected1);
-    assertEquals(commands.get(1).getCommand(), expected2);
-    assertEquals(commands.get(2).getCommand(), expected3);
+    assertEquals(commands.get(0).getCommand(),
+            expected1 + ";" + expected2 + ";" + expected3);
   }
 
   @Test(groups = { "Functional" })