JAL-845 implement alignment of protein to match cDNA alignment

[jalview.git] / test / jalview / util / MapListTest.java

diff --git a/test/jalview/util/MapListTest.java b/test/jalview/util/MapListTest.java
index 1913a70..f69fe40 100644 (file)
--- a/test/jalview/util/MapListTest.java
+++ b/test/jalview/util/MapListTest.java
@@ -434,9 +434,9 @@ public class MapListTest
     assertEquals(18, ml.getFromHighest());
     assertEquals(1, ml.getToLowest());
     assertEquals(6, ml.getToHighest());
-    assertEquals("[2, 3, 5, 7, 9, 10, 12, 12, 14, 14, 16, 18]",
-            Arrays.toString(ml.getFromRanges()));
-    assertEquals("[1, 1, 3, 4, 6, 6]", Arrays.toString(ml.getToRanges()));
+    assertEquals("{[2, 3], [5, 7], [9, 10], [12, 12], [14, 14], [16, 18]}",
+            prettyPrint(ml.getFromRanges()));
+    assertEquals("{[1, 1], [3, 4], [6, 6]}", prettyPrint(ml.getToRanges()));
 
     /*
      * Also copy constructor
@@ -447,9 +447,33 @@ public class MapListTest
     assertEquals(18, ml2.getFromHighest());
     assertEquals(1, ml2.getToLowest());
     assertEquals(6, ml2.getToHighest());
-    assertEquals("[2, 3, 5, 7, 9, 10, 12, 12, 14, 14, 16, 18]",
-            Arrays.toString(ml2.getFromRanges()));
-    assertEquals("[1, 1, 3, 4, 6, 6]", Arrays.toString(ml2.getToRanges()));
+    assertEquals("{[2, 3], [5, 7], [9, 10], [12, 12], [14, 14], [16, 18]}",
+            prettyPrint(ml2.getFromRanges()));
+    assertEquals("{[1, 1], [3, 4], [6, 6]}", prettyPrint(ml2.getToRanges()));
+  }
+
+  /**
+   * Convert a List of {[i, j], [k, l], ...} to "[[i, j], [k, l], ...]"
+   * 
+   * @param ranges
+   * @return
+   */
+  private String prettyPrint(List<int[]> ranges)
+  {
+    StringBuilder sb = new StringBuilder(ranges.size() * 5);
+    boolean first = true;
+    sb.append("{");
+    for (int[] range : ranges)
+    {
+      if (!first)
+      {
+        sb.append(", ");
+      }
+      sb.append(Arrays.toString(range));
+      first = false;
+    }
+    sb.append("}");
+    return sb.toString();
   }
 
   /**
@@ -469,9 +493,9 @@ public class MapListTest
     assertEquals(ml.getFromRatio(), ml2.getToRatio());
     assertEquals(ml.getToHighest(), ml2.getFromHighest());
     assertEquals(ml.getFromHighest(), ml2.getToHighest());
-    assertEquals(Arrays.toString(ml.getFromRanges()),
-            Arrays.toString(ml2.getToRanges()));
-    assertEquals(Arrays.toString(ml.getToRanges()),
-            Arrays.toString(ml2.getFromRanges()));
+    assertEquals(prettyPrint(ml.getFromRanges()),
+            prettyPrint(ml2.getToRanges()));
+    assertEquals(prettyPrint(ml.getToRanges()),
+            prettyPrint(ml2.getFromRanges()));
   }
 }