X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fext%2Fjmol%2FJmolCommandsTest.java;h=8752f937aa5b0ebc8f3b570af931bc88c4c45a9d;hb=e7e676ca075c5b2832be98b4544364e5d6adc4c1;hp=3309adf73e6aee1483834ce0bed2499d507dc1d3;hpb=136c0793b90b72b928c4d77dc109dd5c644e00d3;p=jalview.git diff --git a/test/jalview/ext/jmol/JmolCommandsTest.java b/test/jalview/ext/jmol/JmolCommandsTest.java index 3309adf..8752f93 100644 --- a/test/jalview/ext/jmol/JmolCommandsTest.java +++ b/test/jalview/ext/jmol/JmolCommandsTest.java @@ -61,7 +61,7 @@ public class JmolCommandsTest SequenceRenderer sr = new SequenceRenderer(af.getViewport()); SequenceI[][] seqs = new SequenceI[][] { { seq1 }, { seq2 } }; String[] files = new String[] { "seq1.pdb", "seq2.pdb" }; - StructureSelectionManager ssm = new StructureSelectionManager(); + StructureSelectionManager ssm = StructureSelectionManager.getStructureSelectionManager(null); // need some mappings! @@ -90,7 +90,7 @@ public class JmolCommandsTest SequenceRenderer sr = new SequenceRenderer(af.getViewport()); SequenceI[][] seqs = new SequenceI[][] { { seq1 }, { seq2 } }; String[] files = new String[] { "seq1.pdb", "seq2.pdb" }; - StructureSelectionManager ssm = new StructureSelectionManager(); + StructureSelectionManager ssm = StructureSelectionManager.getStructureSelectionManager(null); /* * map residues 1-10 to residues 21-30 (atoms 105-150) in structures @@ -115,7 +115,7 @@ public class JmolCommandsTest String chainACommand = commands[0].commands[0]; // M colour is #82827d == (130, 130, 125) (see strand.html help page) assertTrue(chainACommand - .contains(";select 21:A/1.1;color[130,130,125]")); + .contains("select 21:A/1.1;color[130,130,125]")); // first one // H colour is #60609f == (96, 96, 159) assertTrue(chainACommand.contains(";select 22:A/1.1;color[96,96,159]")); // hidden columns are Gray (128, 128, 128) @@ -128,7 +128,7 @@ public class JmolCommandsTest String chainBCommand = commands[1].commands[0]; // M colour is #82827d == (130, 130, 125) assertTrue(chainBCommand - .contains(";select 21:B/2.1;color[130,130,125]")); + .contains("select 21:B/2.1;color[130,130,125]")); // V colour is #ffff00 == (255, 255, 0) assertTrue(chainBCommand .contains(";select 22:B/2.1;color[255,255,0]"));