X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fstructures%2Fmodels%2FAAStructureBindingModelTest.java;h=5187167937a719b6a6a5fa9cb4386797d4f81e81;hb=f9062df1303c1ff071075256cf4b7ad7c9db9658;hp=c1ad03a65f2dc5c1241106c94af44555d1468997;hpb=7af7ccb2d58a22ffabe1f3129d9f33348efb2534;p=jalview.git diff --git a/test/jalview/structures/models/AAStructureBindingModelTest.java b/test/jalview/structures/models/AAStructureBindingModelTest.java index c1ad03a..5187167 100644 --- a/test/jalview/structures/models/AAStructureBindingModelTest.java +++ b/test/jalview/structures/models/AAStructureBindingModelTest.java @@ -57,6 +57,7 @@ import jalview.schemes.JalviewColourScheme; import jalview.structure.AtomSpec; import jalview.structure.AtomSpecModel; import jalview.structure.StructureCommandI; +import jalview.structure.StructureCommandsI.AtomSpecType; import jalview.structure.StructureMapping; import jalview.structure.StructureSelectionManager; import junit.extensions.PA; @@ -470,7 +471,7 @@ public class AAStructureBindingModelTest Color mColor = new Color(0x82827d); AtomSpecModel atomSpec = colours.get(mColor); assertNotNull(atomSpec); - assertEquals(helper.getAtomSpec(atomSpec, false), "#0:21.A|#1:21.B"); + assertEquals(helper.getAtomSpec(atomSpec, AtomSpecType.RESIDUE_ONLY), "#0:21.A|#1:21.B"); /* * H colour is #60609f, seq1.2 mapped to structure 0 residue 22 @@ -478,7 +479,7 @@ public class AAStructureBindingModelTest Color hColor = new Color(0x60609f); atomSpec = colours.get(hColor); assertNotNull(atomSpec); - assertEquals(helper.getAtomSpec(atomSpec, false), "#0:22.A"); + assertEquals(helper.getAtomSpec(atomSpec, AtomSpecType.RESIDUE_ONLY), "#0:22.A"); /* * V colour is #ffff00, seq2.2 mapped to structure 1 residue 22 @@ -486,7 +487,7 @@ public class AAStructureBindingModelTest Color vColor = new Color(0xffff00); atomSpec = colours.get(vColor); assertNotNull(atomSpec); - assertEquals(helper.getAtomSpec(atomSpec, false), "#1:22.B"); + assertEquals(helper.getAtomSpec(atomSpec, AtomSpecType.RESIDUE_ONLY), "#1:22.B"); /* * hidden columns are Gray (128, 128, 128) @@ -495,7 +496,7 @@ public class AAStructureBindingModelTest Color gray = new Color(128, 128, 128); atomSpec = colours.get(gray); assertNotNull(atomSpec); - assertEquals(helper.getAtomSpec(atomSpec, false), "#0:23-25.A|#1:23-25.B"); + assertEquals(helper.getAtomSpec(atomSpec, AtomSpecType.RESIDUE_ONLY), "#0:23-25.A|#1:23-25.B"); /* * S and G are both coloured #4949b6, structure residues 26-30 @@ -503,7 +504,7 @@ public class AAStructureBindingModelTest Color sgColour = new Color(0x4949b6); atomSpec = colours.get(sgColour); assertNotNull(atomSpec); - assertEquals(helper.getAtomSpec(atomSpec, false), + assertEquals(helper.getAtomSpec(atomSpec, AtomSpecType.RESIDUE_ONLY), "#0:26-30.A|#1:26-30.B"); } } \ No newline at end of file