X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Futil%2FMapListTest.java;h=d4ed0ea4a7d78e5492e636fc5438f1899a2a16e1;hb=9472f2f66bbcbc7d875251804d4c926f63828a87;hp=c442b6f3fefac2a04830359b0912940a13e6d45b;hpb=1e8c7a9ab9f5da589d0aa2482fd2e3361c320d57;p=jalview.git diff --git a/test/jalview/util/MapListTest.java b/test/jalview/util/MapListTest.java index c442b6f..d4ed0ea 100644 --- a/test/jalview/util/MapListTest.java +++ b/test/jalview/util/MapListTest.java @@ -535,7 +535,7 @@ public class MapListTest MapList ml = new MapList(new int[] { 1, 5, 10, 15, 25, 20 }, new int[] { 51, 1 }, 1, 3); String s = ml.toString(); - assertEquals("[ [1, 5] [10, 15] [25, 20] ] To [ [51, 1] ]", + assertEquals("[ [1, 5] [10, 15] [25, 20] ] 1:3 to [ [51, 1] ]", s); } @@ -559,7 +559,7 @@ public class MapListTest String s = ml.toString(); assertEquals( - "[ [11, 15] [20, 25] [35, 30] [2, 4] [37, 40] ] To [ [72, 22] [12, 17] [78, 83] [88, 96] ]", + "[ [11, 15] [20, 25] [35, 30] [2, 4] [37, 40] ] 1:3 to [ [72, 22] [12, 17] [78, 83] [88, 96] ]", s); } @@ -572,7 +572,7 @@ public class MapListTest MapList ml2 = new MapList(new int[] { 15, 16 }, new int[] { 58, 53 }, 1, 3); ml.addMapList(ml2); - assertEquals("[ [11, 16] ] To [ [72, 53] ]", ml.toString()); + assertEquals("[ [11, 16] ] 1:3 to [ [72, 53] ]", ml.toString()); } @Test(groups = "Functional") @@ -655,14 +655,17 @@ public class MapListTest @Test(groups = { "Functional" }) public void testIsFromForwardStrand() { + // [3-9] declares forward strand MapList ml = new MapList(new int[] { 2, 2, 3, 9, 12, 11 }, new int[] { 20, 11 }, 1, 1); assertTrue(ml.isFromForwardStrand()); + // [11-5] declares reverse strand ([13-14] is ignored) ml = new MapList(new int[] { 2, 2, 11, 5, 13, 14 }, new int[] { 20, 11 }, 1, 1); assertFalse(ml.isFromForwardStrand()); + // all single position ranges - defaults to forward strand ml = new MapList(new int[] { 2, 2, 4, 4, 6, 6 }, new int[] { 3, 1 }, 1, 1); assertTrue(ml.isFromForwardStrand());