JAL-2295 extracted AtomSpecModel for reuse in Chimera commands

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

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
index 29c7d16..3c6f830 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -21,12 +21,9 @@
 package jalview.ext.rbvi.chimera;
 
 import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
 
 import java.awt.Color;
-import java.util.Arrays;
 import java.util.LinkedHashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.testng.annotations.Test;
@@ -34,58 +31,10 @@ import org.testng.annotations.Test;
 public class ChimeraCommandsTest
 {
   @Test(groups = { "Functional" })
-  public void testAddColourRange()
-  {
-    Map<Color, Map<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, Map<Integer, Map<String, List<int[]>>>>();
-    ChimeraCommands.addColourRange(map, Color.pink, 1, 2, 4, "A");
-    ChimeraCommands.addColourRange(map, Color.pink, 1, 8, 8, "A");
-    ChimeraCommands.addColourRange(map, Color.pink, 1, 5, 7, "B");
-    ChimeraCommands.addColourRange(map, Color.red, 1, 3, 5, "A");
-    ChimeraCommands.addColourRange(map, Color.red, 0, 1, 4, "B");
-    ChimeraCommands.addColourRange(map, Color.orange, 0, 5, 9, "C");
-
-    // three colours mapped
-    assertEquals(3, map.keySet().size());
-
-    // Red has two models, Pink and Orange one each
-    assertEquals(2, map.get(Color.red).keySet().size());
-    assertEquals(1, map.get(Color.orange).keySet().size());
-    assertEquals(1, map.get(Color.pink).keySet().size());
-
-    // pink model 1 has two chains, red.0 / red.1 / orange.0 one each
-    assertEquals(2, map.get(Color.pink).get(1).keySet().size());
-    assertEquals(1, map.get(Color.red).get(0).keySet().size());
-    assertEquals(1, map.get(Color.red).get(1).keySet().size());
-    assertEquals(1, map.get(Color.orange).get(0).keySet().size());
-
-    // inspect positions
-    List<int[]> posList = map.get(Color.pink).get(1).get("A");
-    assertEquals(2, posList.size());
-    assertTrue(Arrays.equals(new int[] { 2, 4 }, posList.get(0)));
-    assertTrue(Arrays.equals(new int[] { 8, 8 }, posList.get(1)));
-
-    posList = map.get(Color.pink).get(1).get("B");
-    assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[] { 5, 7 }, posList.get(0)));
-
-    posList = map.get(Color.red).get(0).get("B");
-    assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[] { 1, 4 }, posList.get(0)));
-
-    posList = map.get(Color.red).get(1).get("A");
-    assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[] { 3, 5 }, posList.get(0)));
-
-    posList = map.get(Color.orange).get(0).get("C");
-    assertEquals(1, posList.size());
-    assertTrue(Arrays.equals(new int[] { 5, 9 }, posList.get(0)));
-  }
-
-  @Test(groups = { "Functional" })
   public void testBuildColourCommands()
   {
 
-    Map<Color, Map<Integer, Map<String, List<int[]>>>> map = new LinkedHashMap<Color, Map<Integer, Map<String, List<int[]>>>>();
+    Map<Color, AtomSpecModel> map = new LinkedHashMap<Color, AtomSpecModel>();
     ChimeraCommands.addColourRange(map, Color.blue, 0, 2, 5, "A");
     ChimeraCommands.addColourRange(map, Color.blue, 0, 7, 7, "B");
     ChimeraCommands.addColourRange(map, Color.blue, 0, 9, 23, "A");
@@ -94,13 +43,13 @@ public class ChimeraCommandsTest
     ChimeraCommands.addColourRange(map, Color.yellow, 1, 8, 8, "A");
     ChimeraCommands.addColourRange(map, Color.yellow, 1, 3, 5, "A");
     ChimeraCommands.addColourRange(map, Color.red, 0, 3, 5, "A");
+    ChimeraCommands.addColourRange(map, Color.red, 0, 6, 9, "A");
 
     // Colours should appear in the Chimera command in the order in which
-    // they were added; within colour, by model, by chain, and positions as
-    // added
+    // they were added; within colour, by model, by chain, ranges in start order
     String command = ChimeraCommands.buildColourCommands(map).get(0);
     assertEquals(
-            "color #0000ff #0:2-5.A,9-23.A,7.B|#1:1.A,4-7.B; color #ffff00 #1:8.A,3-5.A; color #ff0000 #0:3-5.A",
+            "color #0000ff #0:2-5.A,9-23.A,7.B|#1:1.A,4-7.B; color #ffff00 #1:3-5.A,8.A; color #ff0000 #0:3-9.A",
             command);
   }
 }