git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD
[jalview.git]
/
test
/
jalview
/
ext
/
jmol
/
JmolCommandsTest.java
diff --git
a/test/jalview/ext/jmol/JmolCommandsTest.java
b/test/jalview/ext/jmol/JmolCommandsTest.java
index
21f7e19
..
366d208
100644
(file)
--- 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 org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
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;
import jalview.structure.StructureMapping;
import jalview.structure.StructureSelectionManager;
+
public class JmolCommandsTest
{
private JmolCommands testee;
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();
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
*/
/*
* 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);
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);
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)
String chainACommand = commands[0];
// M colour is #82827d == (130, 130, 125) (see strand.html help page)