X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FMapListTest.java;h=03b3c99d2c4c121c13ccf09c6daeb53ab91574b6;hb=58827f5ad6ff27d76c20c1aba96cd3b4a200a691;hp=538dab899eefd0d620954a8354457bcf6bd0d90b;hpb=0aa7f6fab658c9a203b410d4bead72217da5c9a0;p=jalview.git diff --git a/test/jalview/util/MapListTest.java b/test/jalview/util/MapListTest.java index 538dab8..03b3c99 100644 --- a/test/jalview/util/MapListTest.java +++ b/test/jalview/util/MapListTest.java @@ -36,7 +36,7 @@ import java.util.List; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -import jalview.bin.Cache; +import jalview.bin.Console; import jalview.gui.JvOptionPane; public class MapListTest @@ -44,9 +44,9 @@ public class MapListTest @BeforeClass(alwaysRun = true) public void setUp() { - Cache.initLogger(); + Console.initLogger(); } - + @BeforeClass(alwaysRun = true) public void setUpJvOptionPane() { @@ -907,11 +907,11 @@ public class MapListTest assertArrayEquals(new int[] { 5, 6 }, merged.get(1)); assertArrayEquals(new int[] { 12, 8 }, merged.get(2)); assertArrayEquals(new int[] { 8, 7 }, merged.get(3)); - + // 'subsumed' ranges are preserved ranges.clear(); ranges.add(new int[] { 10, 30 }); - ranges.add(new int[] { 15, 25 }); + ranges.add(new int[] { 15, 25 }); merged = MapList.coalesceRanges(ranges); assertEquals(2, merged.size());