X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraXCommandsTest.java;fp=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraXCommandsTest.java;h=03bfbcd19c783cccecaa31de874d956188c54feb;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=143a5d8bf5d48f9413269f3eec42917275a0d54f;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/test/jalview/ext/rbvi/chimera/ChimeraXCommandsTest.java b/test/jalview/ext/rbvi/chimera/ChimeraXCommandsTest.java index 143a5d8..03bfbcd 100644 --- a/test/jalview/ext/rbvi/chimera/ChimeraXCommandsTest.java +++ b/test/jalview/ext/rbvi/chimera/ChimeraXCommandsTest.java @@ -188,7 +188,7 @@ public class ChimeraXCommandsTest toAlign.addRange("2", 20, 21, "B"); toAlign.addRange("2", 22, 22, "C"); List command = testee.superposeStructures(ref, - toAlign,AtomSpecType.ALPHA); + toAlign, AtomSpecType.ALPHA); assertEquals(command.size(), 1); String cmd = command.get(0).getCommand(); String refSpec = "#1/A:12-14/B:18,22-23"; @@ -208,16 +208,19 @@ public class ChimeraXCommandsTest public void testGetAtomSpec() { AtomSpecModel model = new AtomSpecModel(); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY - ), ""); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), ""); model.addRange("1", 2, 4, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1/A:2-4"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1/A:2-4"); model.addRange("1", 8, 8, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1/A:2-4,8"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1/A:2-4,8"); model.addRange("1", 5, 7, "B"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1/A:2-4,8/B:5-7"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1/A:2-4,8/B:5-7"); model.addRange("1", 3, 5, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1/A:2-5,8/B:5-7"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1/A:2-5,8/B:5-7"); model.addRange("0", 1, 4, "B"); assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#0/B:1-4|#1/A:2-5,8/B:5-7"); @@ -244,13 +247,17 @@ public class ChimeraXCommandsTest AtomSpecModel model = new AtomSpecModel(); assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), ""); model.addRange("1", 2, 4, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), "#1/A:2-4@CA"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), + "#1/A:2-4@CA"); model.addRange("1", 8, 8, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), "#1/A:2-4,8@CA"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), + "#1/A:2-4,8@CA"); model.addRange("1", 5, 7, "B"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), "#1/A:2-4,8/B:5-7@CA"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), + "#1/A:2-4,8/B:5-7@CA"); model.addRange("1", 3, 5, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), "#1/A:2-5,8/B:5-7@CA"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), + "#1/A:2-5,8/B:5-7@CA"); model.addRange("0", 1, 4, "B"); assertEquals(testee.getAtomSpec(model, AtomSpecType.ALPHA), "#0/B:1-4@CA|#1/A:2-5,8/B:5-7@CA"); @@ -309,8 +316,8 @@ public class ChimeraXCommandsTest @Test(groups = "Functional") public void testGetColourCommand() { - assertEquals(testee.colourResidues("something", Color.MAGENTA) - .getCommand(), + assertEquals( + testee.colourResidues("something", Color.MAGENTA).getCommand(), "color something #ff00ff"); } @@ -321,8 +328,7 @@ public class ChimeraXCommandsTest model.addRange("1", 89, 92, "A"); model.addRange("2", 12, 20, "B"); model.addRange("2", 8, 9, "B"); - assertEquals(testee.setAttribute("jv_kd", "27.3", model) - .getCommand(), + assertEquals(testee.setAttribute("jv_kd", "27.3", model).getCommand(), "setattr #1/A:89-92|#2/B:8-9,12-20 res jv_kd '27.3' create true"); } @@ -344,8 +350,10 @@ public class ChimeraXCommandsTest { List cmds = testee.startNotifications("to here"); assertEquals(cmds.size(), 2); - assertEquals(cmds.get(0), new StructureCommand("info notify start models jalview prefix ModelChanged url to here")); - assertEquals(cmds.get(1), new StructureCommand("info notify start selection jalview prefix SelectionChanged url to here")); + assertEquals(cmds.get(0), new StructureCommand( + "info notify start models jalview prefix ModelChanged url to here")); + assertEquals(cmds.get(1), new StructureCommand( + "info notify start selection jalview prefix SelectionChanged url to here")); } @Test(groups = "Functional") @@ -353,8 +361,10 @@ public class ChimeraXCommandsTest { List cmds = testee.stopNotifications(); assertEquals(cmds.size(), 2); - assertEquals(cmds.get(0), new StructureCommand("info notify stop models jalview")); - assertEquals(cmds.get(1), new StructureCommand("info notify stop selection jalview")); + assertEquals(cmds.get(0), + new StructureCommand("info notify stop models jalview")); + assertEquals(cmds.get(1), + new StructureCommand("info notify stop selection jalview")); } @Test(groups = "Functional")