Merge branch 'features/JAL-2295setChimeraAttributes' into

[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 70c6922..fb442e3 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -49,15 +49,15 @@ public class ChimeraCommandsTest
   {
 
     Map<Object, AtomSpecModel> map = new LinkedHashMap<Object, AtomSpecModel>();
-    ChimeraCommands.addRange(map, Color.blue, 0, 2, 5, "A");
-    ChimeraCommands.addRange(map, Color.blue, 0, 7, 7, "B");
-    ChimeraCommands.addRange(map, Color.blue, 0, 9, 23, "A");
-    ChimeraCommands.addRange(map, Color.blue, 1, 1, 1, "A");
-    ChimeraCommands.addRange(map, Color.blue, 1, 4, 7, "B");
-    ChimeraCommands.addRange(map, Color.yellow, 1, 8, 8, "A");
-    ChimeraCommands.addRange(map, Color.yellow, 1, 3, 5, "A");
-    ChimeraCommands.addRange(map, Color.red, 0, 3, 5, "A");
-    ChimeraCommands.addRange(map, Color.red, 0, 6, 9, "A");
+    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");
+    ChimeraCommands.addColourRange(map, Color.blue, 1, 1, 1, "A");
+    ChimeraCommands.addColourRange(map, Color.blue, 1, 4, 7, "B");
+    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, ranges in start order
@@ -80,7 +80,7 @@ public class ChimeraCommandsTest
      * start with just one feature/value...
      */
     featuresMap.put("chain", featureValues);
-    ChimeraCommands.addRange(featureValues, "X", 0, 8, 20, "A");
+    ChimeraCommands.addColourRange(featureValues, "X", 0, 8, 20, "A");
   
     List<String> commands = ChimeraCommands
             .buildSetAttributeCommands(featuresMap);
@@ -93,24 +93,24 @@ public class ChimeraCommandsTest
     assertEquals(commands.get(0), "setattr r jv_chain \"X\" #0:8-20.A");
 
     // add same feature value, overlapping range
-    ChimeraCommands.addRange(featureValues, "X", 0, 3, 9, "A");
+    ChimeraCommands.addColourRange(featureValues, "X", 0, 3, 9, "A");
     // same feature value, contiguous range
-    ChimeraCommands.addRange(featureValues, "X", 0, 21, 25, "A");
+    ChimeraCommands.addColourRange(featureValues, "X", 0, 21, 25, "A");
     commands = ChimeraCommands.buildSetAttributeCommands(featuresMap);
     assertEquals(1, commands.size());
     assertEquals(commands.get(0), "setattr r jv_chain \"X\" #0:3-25.A");
 
     // same feature value and model, different chain
-    ChimeraCommands.addRange(featureValues, "X", 0, 21, 25, "B");
+    ChimeraCommands.addColourRange(featureValues, "X", 0, 21, 25, "B");
     // same feature value and chain, different model
-    ChimeraCommands.addRange(featureValues, "X", 1, 26, 30, "A");
+    ChimeraCommands.addColourRange(featureValues, "X", 1, 26, 30, "A");
     commands = ChimeraCommands.buildSetAttributeCommands(featuresMap);
     assertEquals(1, commands.size());
     assertEquals(commands.get(0),
             "setattr r jv_chain \"X\" #0:3-25.A,21-25.B|#1:26-30.A");
 
     // same feature, different value
-    ChimeraCommands.addRange(featureValues, "Y", 0, 40, 50, "A");
+    ChimeraCommands.addColourRange(featureValues, "Y", 0, 40, 50, "A");
     commands = ChimeraCommands.buildSetAttributeCommands(featuresMap);
     assertEquals(2, commands.size());
     // commands are ordered by feature type but not by value
@@ -122,7 +122,8 @@ public class ChimeraCommandsTest
     featuresMap.clear();
     featureValues.clear();
     featuresMap.put("side-chain binding!", featureValues);
-    ChimeraCommands.addRange(featureValues, "metal ion!", 0, 7, 15, "A");
+    ChimeraCommands.addColourRange(featureValues, "metal ion!", 0, 7, 15,
+            "A");
     // feature names are sanitised to change space or hyphen to underscore
     commands = ChimeraCommands.buildSetAttributeCommands(featuresMap);
     assertTrue(commands