git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-3518 more extraction of ChimeraX commands as overrides
[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 6a02576..0679098 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -83,8 +83,9 @@ public class ChimeraCommandsTest
     featuresMap.put("chain", featureValues);
     ChimeraCommands.addAtomSpecRange(featureValues, "X", 0, 8, 20, "A");
   
-    List<String> commands = ChimeraCommands
-            .buildSetAttributeCommands(featuresMap, false);
+    ChimeraCommands commandGenerator = new ChimeraCommands();
+    List<String> commands = commandGenerator
+            .buildSetAttributeCommands(featuresMap);
     assertEquals(1, commands.size());
 
     /*
@@ -97,8 +98,7 @@ public class ChimeraCommandsTest
     ChimeraCommands.addAtomSpecRange(featureValues, "X", 0, 3, 9, "A");
     // same feature value, contiguous range
     ChimeraCommands.addAtomSpecRange(featureValues, "X", 0, 21, 25, "A");
-    commands = ChimeraCommands.buildSetAttributeCommands(featuresMap,
-            false);
+    commands = commandGenerator.buildSetAttributeCommands(featuresMap);
     assertEquals(1, commands.size());
     assertEquals(commands.get(0), "setattr res jv_chain 'X' #0:3-25.A");
 
@@ -106,16 +106,14 @@ public class ChimeraCommandsTest
     ChimeraCommands.addAtomSpecRange(featureValues, "X", 0, 21, 25, "B");
     // same feature value and chain, different model
     ChimeraCommands.addAtomSpecRange(featureValues, "X", 1, 26, 30, "A");
-    commands = ChimeraCommands.buildSetAttributeCommands(featuresMap,
-            false);
+    commands = commandGenerator.buildSetAttributeCommands(featuresMap);
     assertEquals(1, commands.size());
     assertEquals(commands.get(0),
             "setattr res jv_chain 'X' #0:3-25.A,21-25.B|#1:26-30.A");
 
     // same feature, different value
     ChimeraCommands.addAtomSpecRange(featureValues, "Y", 0, 40, 50, "A");
-    commands = ChimeraCommands.buildSetAttributeCommands(featuresMap,
-            false);
+    commands = commandGenerator.buildSetAttributeCommands(featuresMap);
     assertEquals(2, commands.size());
     // commands are ordered by feature type but not by value
     // so use contains to test for the expected command:
@@ -132,8 +130,7 @@ public class ChimeraCommandsTest
             "A");
     // feature names are sanitised to change non-alphanumeric to underscore
     // feature values are sanitised to encode single quote characters
-    commands = ChimeraCommands.buildSetAttributeCommands(featuresMap,
-            false);
+    commands = commandGenerator.buildSetAttributeCommands(featuresMap);
     assertTrue(commands
             .contains(
                     "setattr res jv_side_chain_binding_ '<html>metal <a href=\"http:a.b.c/x\"> &#39;ion!' #0:7-15.A"));
@@ -160,7 +157,7 @@ public class ChimeraCommandsTest
   }
 
   @Test(groups = { "Functional" })
-  public void testGetColourBySequenceCommands_hiddenColumns()
+  public void testColourBySequence_hiddenColumns()
   {
     /*
      * load these sequences, coloured by Strand propensity,