X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FMapListTest.java;h=86dcc39b267c2239216a2427ca5f0dd00fa06021;hb=10dd3a771da0085ead2318b7385211c7b675d7f4;hp=1acc9e1f30515a6f91a5e59dea335254cc3343c1;hpb=e03b4b6d85409cfe15ce0f2b3ba2d4d59a834c91;p=jalview.git

diff --git a/test/jalview/util/MapListTest.java b/test/jalview/util/MapListTest.java
index 1acc9e1..86dcc39 100644
--- a/test/jalview/util/MapListTest.java
+++ b/test/jalview/util/MapListTest.java
@@ -828,22 +828,31 @@ public class MapListTest
      */
     MapList ml1 = new MapList(new int[] { 3, 4, 8, 12 }, new int[] { 5, 8,
         11, 13 }, 1, 1);
+    assertEquals("{[3, 4], [8, 12]}", prettyPrint(ml1.getFromRanges()));
+    assertEquals("{[5, 8], [11, 13]}", prettyPrint(ml1.getToRanges()));
+
     MapList ml2 = new MapList(new int[] { 1, 50 }, new int[] { 40, 45, 70,
         75, 90, 127 }, 1, 1);
+    assertEquals("{[1, 50]}", prettyPrint(ml2.getFromRanges()));
+    assertEquals("{[40, 45], [70, 75], [90, 127]}",
+            prettyPrint(ml2.getToRanges()));
+
     MapList compound = ml1.traverse(ml2);
 
-    assertEquals(compound.getFromRatio(), 1);
-    assertEquals(compound.getToRatio(), 1);
+    assertEquals(1, compound.getFromRatio());
+    assertEquals(1, compound.getToRatio());
     List<int[]> fromRanges = compound.getFromRanges();
-    assertEquals(fromRanges.size(), 2);
+    assertEquals(2, fromRanges.size());
     assertArrayEquals(new int[] { 3, 4 }, fromRanges.get(0));
     assertArrayEquals(new int[] { 8, 12 }, fromRanges.get(1));
     List<int[]> toRanges = compound.getToRanges();
-    assertEquals(toRanges.size(), 2);
+    assertEquals(4, toRanges.size());
     // 5-8 maps to 44-45,70-71
     // 11-13 maps to 74-75,90
-    assertArrayEquals(new int[] { 44, 45, 70, 71 }, toRanges.get(0));
-    assertArrayEquals(new int[] { 74, 75, 90, 90 }, toRanges.get(1));
+    assertArrayEquals(new int[] { 44, 45 }, toRanges.get(0));
+    assertArrayEquals(new int[] { 70, 71 }, toRanges.get(1));
+    assertArrayEquals(new int[] { 74, 75 }, toRanges.get(2));
+    assertArrayEquals(new int[] { 90, 90 }, toRanges.get(3));
 
     /*
      * 1:1 over 1:1 backwards ('reverse strand')
@@ -853,14 +862,15 @@ public class MapListTest
             new int[] { 1000, 901, 600, 201 }, 1, 1);
     compound = ml1.traverse(ml2);
 
-    assertEquals(compound.getFromRatio(), 1);
-    assertEquals(compound.getToRatio(), 1);
+    assertEquals(1, compound.getFromRatio());
+    assertEquals(1, compound.getToRatio());
     fromRanges = compound.getFromRanges();
-    assertEquals(fromRanges.size(), 1);
+    assertEquals(1, fromRanges.size());
     assertArrayEquals(new int[] { 1, 50 }, fromRanges.get(0));
     toRanges = compound.getToRanges();
-    assertEquals(toRanges.size(), 1);
-    assertArrayEquals(new int[] { 931, 901, 600, 582 }, toRanges.get(0));
+    assertEquals(2, toRanges.size());
+    assertArrayEquals(new int[] { 931, 901 }, toRanges.get(0));
+    assertArrayEquals(new int[] { 600, 582 }, toRanges.get(1));
 
     /*
      * 1:1 plus 1:3 should result in 1:3
@@ -870,15 +880,16 @@ public class MapListTest
             1, 3);
     compound = ml1.traverse(ml2);
 
-    assertEquals(compound.getFromRatio(), 1);
-    assertEquals(compound.getToRatio(), 3);
+    assertEquals(1, compound.getFromRatio());
+    assertEquals(3, compound.getToRatio());
     fromRanges = compound.getFromRanges();
-    assertEquals(fromRanges.size(), 1);
+    assertEquals(1, fromRanges.size());
     assertArrayEquals(new int[] { 1, 30 }, fromRanges.get(0));
     // 11-40 maps to 31-50,91-160
     toRanges = compound.getToRanges();
-    assertEquals(toRanges.size(), 1);
-    assertArrayEquals(new int[] { 31, 50, 91, 160 }, toRanges.get(0));
+    assertEquals(2, toRanges.size());
+    assertArrayEquals(new int[] { 31, 50 }, toRanges.get(0));
+    assertArrayEquals(new int[] { 91, 160 }, toRanges.get(1));
 
     /*
      * 3:1 plus 1:1 should result in 3:1
@@ -888,15 +899,16 @@ public class MapListTest
             1, 1);
     compound = ml1.traverse(ml2);
 
-    assertEquals(compound.getFromRatio(), 3);
-    assertEquals(compound.getToRatio(), 1);
+    assertEquals(3, compound.getFromRatio());
+    assertEquals(1, compound.getToRatio());
     fromRanges = compound.getFromRanges();
-    assertEquals(fromRanges.size(), 1);
+    assertEquals(1, fromRanges.size());
     assertArrayEquals(new int[] { 1, 30 }, fromRanges.get(0));
     // 11-20 maps to 11-15, 91-95
     toRanges = compound.getToRanges();
-    assertEquals(toRanges.size(), 1);
-    assertArrayEquals(new int[] { 11, 15, 91, 95 }, toRanges.get(0));
+    assertEquals(2, toRanges.size());
+    assertArrayEquals(new int[] { 11, 15 }, toRanges.get(0));
+    assertArrayEquals(new int[] { 91, 95 }, toRanges.get(1));
 
     /*
      * 1:3 plus 3:1 should result in 1:1
@@ -906,15 +918,16 @@ public class MapListTest
             3, 1);
     compound = ml1.traverse(ml2);
 
-    assertEquals(compound.getFromRatio(), 1);
-    assertEquals(compound.getToRatio(), 1);
+    assertEquals(1, compound.getFromRatio());
+    assertEquals(1, compound.getToRatio());
     fromRanges = compound.getFromRanges();
-    assertEquals(fromRanges.size(), 1);
+    assertEquals(1, fromRanges.size());
     assertArrayEquals(new int[] { 21, 40 }, fromRanges.get(0));
     // 13-72 maps 3:1 to 55-70, 121-124
     toRanges = compound.getToRanges();
-    assertEquals(toRanges.size(), 1);
-    assertArrayEquals(new int[] { 55, 70, 121, 124 }, toRanges.get(0));
+    assertEquals(2, toRanges.size());
+    assertArrayEquals(new int[] { 55, 70 }, toRanges.get(0));
+    assertArrayEquals(new int[] { 121, 124 }, toRanges.get(1));
 
     /*
      * 3:1 plus 1:3 should result in 1:1
@@ -924,15 +937,16 @@ public class MapListTest
             1, 3);
     compound = ml1.traverse(ml2);
 
-    assertEquals(compound.getFromRatio(), 1);
-    assertEquals(compound.getToRatio(), 1);
+    assertEquals(1, compound.getFromRatio());
+    assertEquals(1, compound.getToRatio());
     fromRanges = compound.getFromRanges();
-    assertEquals(fromRanges.size(), 1);
+    assertEquals(1, fromRanges.size());
     assertArrayEquals(new int[] { 31, 90 }, fromRanges.get(0));
     // 13-32 maps to 47-50,71-126
     toRanges = compound.getToRanges();
-    assertEquals(toRanges.size(), 1);
-    assertArrayEquals(new int[] { 47, 50, 71, 126 }, toRanges.get(0));
+    assertEquals(2, toRanges.size());
+    assertArrayEquals(new int[] { 47, 50 }, toRanges.get(0));
+    assertArrayEquals(new int[] { 71, 126 }, toRanges.get(1));
 
     /*
      * method returns null if not all regions are mapped through