X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraCommandsTest.java;fp=test%2Fjalview%2Fext%2Frbvi%2Fchimera%2FChimeraCommandsTest.java;h=d71b5fd640673c4b9208ced07ec369d1e3475bd0;hb=9c98d4bd666346f6ad3892c5394b7da3be82d93e;hp=23e42ca8415111d50ab4ecba7259d0b14c55e6c2;hpb=c7b2143c9cf7c5e05ad63251f7d3910751b16d20;p=jalview.git diff --git a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java index 23e42ca..d71b5fd 100644 --- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java +++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java @@ -148,11 +148,9 @@ public class ChimeraCommandsTest assertEquals(testee.makeAttributeName(null), "jv_"); assertEquals(testee.makeAttributeName(""), "jv_"); assertEquals(testee.makeAttributeName("helix"), "jv_helix"); - assertEquals(testee.makeAttributeName( - "Hello World 24"), + assertEquals(testee.makeAttributeName("Hello World 24"), "jv_Hello_World_24"); - assertEquals(testee.makeAttributeName( - "!this is-a_very*{odd(name"), + assertEquals(testee.makeAttributeName("!this is-a_very*{odd(name"), "jv__this_is_a_very__odd_name"); // name ending in color gets underscore appended assertEquals(testee.makeAttributeName("helixColor"), "jv_helixColor_"); @@ -164,13 +162,17 @@ public class ChimeraCommandsTest AtomSpecModel model = new AtomSpecModel(); assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), ""); model.addRange("1", 2, 4, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1:2-4.A"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1:2-4.A"); model.addRange("1", 8, 8, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1:2-4.A,8.A"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1:2-4.A,8.A"); model.addRange("1", 5, 7, "B"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1:2-4.A,8.A,5-7.B"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1:2-4.A,8.A,5-7.B"); model.addRange("1", 3, 5, "A"); - assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#1:2-5.A,8.A,5-7.B"); + assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), + "#1:2-5.A,8.A,5-7.B"); model.addRange("0", 1, 4, "B"); assertEquals(testee.getAtomSpec(model, AtomSpecType.RESIDUE_ONLY), "#0:1-4.B|#1:2-5.A,8.A,5-7.B"); @@ -320,16 +322,15 @@ public class ChimeraCommandsTest { List cmds = testee.colourByCharge(); assertEquals(cmds.size(), 1); - assertEquals(cmds.get(0) - .getCommand(), + assertEquals(cmds.get(0).getCommand(), "color white;color red ::ASP,GLU;color blue ::LYS,ARG;color yellow ::CYS"); } @Test(groups = "Functional") public void testGetColourCommand() { - assertEquals(testee.colourResidues("something", Color.MAGENTA) - .getCommand(), + assertEquals( + testee.colourResidues("something", Color.MAGENTA).getCommand(), "color #ff00ff something"); } @@ -382,8 +383,10 @@ public class ChimeraCommandsTest { List cmds = testee.startNotifications("to here"); assertEquals(cmds.size(), 2); - assertEquals(cmds.get(0), new StructureCommand("listen start models url to here")); - assertEquals(cmds.get(1), new StructureCommand("listen start select prefix SelectionChanged url to here")); + assertEquals(cmds.get(0), + new StructureCommand("listen start models url to here")); + assertEquals(cmds.get(1), new StructureCommand( + "listen start select prefix SelectionChanged url to here")); } @Test(groups = "Functional") @@ -392,6 +395,7 @@ public class ChimeraCommandsTest List cmds = testee.stopNotifications(); assertEquals(cmds.size(), 2); assertEquals(cmds.get(0), new StructureCommand("listen stop models")); - assertEquals(cmds.get(1), new StructureCommand("listen stop selection")); + assertEquals(cmds.get(1), + new StructureCommand("listen stop selection")); } }