X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolCommandsTest.java;h=366d2084cfea1f86277e0b2ad815836a61e6ef2b;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=21f7e19bf5715e8677a5280aec7a95cab2b5d6b6;hpb=61ff8fb4efa315c35149c9d11850d99e3d00c441;p=jalview.git diff --git a/test/jalview/ext/jmol/JmolCommandsTest.java b/test/jalview/ext/jmol/JmolCommandsTest.java index 21f7e19..366d208 100644 --- a/test/jalview/ext/jmol/JmolCommandsTest.java +++ b/test/jalview/ext/jmol/JmolCommandsTest.java @@ -31,7 +31,6 @@ import java.util.Map; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; - import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentI; import jalview.datamodel.ColumnSelection; @@ -45,6 +44,7 @@ import jalview.structure.StructureCommandI; import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; + public class JmolCommandsTest { private JmolCommands testee; @@ -77,7 +77,6 @@ public class JmolCommandsTest SequenceI[][] seqs = new SequenceI[][] { { seq1 }, { seq2 } }; String[] files = new String[] { "seq1.pdb", "seq2.pdb" }; StructureSelectionManager ssm = new StructureSelectionManager(); - /* * map residues 1-10 to residues 21-30 (atoms 105-150) in structures */ @@ -92,11 +91,11 @@ public class JmolCommandsTest StructureMapping sm2 = new StructureMapping(seq2, "seq2.pdb", "pdb2", "B", map, null); ssm.addStructureMapping(sm2); - String[] commands = testee.colourBySequence(ssm, files, seqs, sr, af.alignPanel); assertEquals(commands.length, 2); + assertEquals(commands[0].commands.length, 1); // from 2.12 merge from 2.11.2 String chainACommand = commands[0]; // M colour is #82827d == (130, 130, 125) (see strand.html help page)