X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FMapListTest.java;h=1acc9e1f30515a6f91a5e59dea335254cc3343c1;hb=9f1f7839cfd50555efd3af1ff4102348f950c563;hp=54e8311741ba8dc9dda27b3a227015e74e4fd539;hpb=da768251d307c7ce11283d72e0e522b2c5fac526;p=jalview.git diff --git a/test/jalview/util/MapListTest.java b/test/jalview/util/MapListTest.java index 54e8311..1acc9e1 100644 --- a/test/jalview/util/MapListTest.java +++ b/test/jalview/util/MapListTest.java @@ -25,16 +25,27 @@ import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertSame; import static org.testng.AssertJUnit.assertTrue; +import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals; + +import jalview.gui.JvOptionPane; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; public class MapListTest { + @BeforeClass(alwaysRun = true) + public void setUpJvOptionPane() + { + JvOptionPane.setInteractiveMode(false); + JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); + } + @Test(groups = { "Functional" }) public void testSomething() { @@ -380,7 +391,9 @@ public class MapListTest MapList ml7 = new MapList(codons, protein, 3, 1); // toShifts differ assertTrue(ml.equals(ml)); + assertEquals(ml.hashCode(), ml.hashCode()); assertTrue(ml.equals(ml1)); + assertEquals(ml.hashCode(), ml1.hashCode()); assertTrue(ml1.equals(ml)); assertFalse(ml.equals(null)); @@ -415,7 +428,7 @@ public class MapListTest @Test(groups = { "Functional" }) public void testGetRanges() { - List ranges = new ArrayList(); + List ranges = new ArrayList<>(); ranges.add(new int[] { 2, 3 }); ranges.add(new int[] { 5, 6 }); assertEquals("[2, 3, 5, 6]", Arrays.toString(MapList.getRanges(ranges))); @@ -534,8 +547,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("From (1:3) [ [1, 5] [10, 15] [25, 20] ] To [ [51, 1] ]", - s); + assertEquals("[ [1, 5] [10, 15] [25, 20] ] 1:3 to [ [51, 1] ]", s); } @Test(groups = { "Functional" }) @@ -558,10 +570,25 @@ public class MapListTest String s = ml.toString(); assertEquals( - "From (1:3) [ [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); } + /** + * Test that confirms adding a map twice does nothing + */ + @Test(groups = { "Functional" }) + public void testAddMapList_sameMap() + { + MapList ml = new MapList(new int[] { 11, 15, 20, 25, 35, 30 }, + new int[] { 72, 22 }, 1, 3); + String before = ml.toString(); + ml.addMapList(ml); + assertEquals(before, ml.toString()); + ml.addMapList(new MapList(ml)); + assertEquals(before, ml.toString()); + } + @Test(groups = { "Functional" }) public void testAddMapList_contiguous() { @@ -571,14 +598,14 @@ public class MapListTest MapList ml2 = new MapList(new int[] { 15, 16 }, new int[] { 58, 53 }, 1, 3); ml.addMapList(ml2); - assertEquals("From (1:3) [ [11, 16] ] To [ [72, 53] ]", ml.toString()); + assertEquals("[ [11, 16] ] 1:3 to [ [72, 53] ]", ml.toString()); } @Test(groups = "Functional") public void testAddRange() { int[] range = { 1, 5 }; - List ranges = new ArrayList(); + List ranges = new ArrayList<>(); // add to empty list: MapList.addRange(range, ranges); @@ -646,4 +673,298 @@ public class MapListTest assertEquals(79, ml.getToLowest()); assertEquals(100, ml.getToHighest()); } + + /** + * Test that method that inspects for the (first) forward or reverse from + * range. Single position ranges are ignored. + */ + @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()); + } + + /** + * Test the method that merges a list of ranges where possible + */ + @Test(groups = { "Functional" }) + public void testCoalesceRanges() + { + assertNull(MapList.coalesceRanges(null)); + List ranges = new ArrayList<>(); + assertSame(ranges, MapList.coalesceRanges(ranges)); + ranges.add(new int[] { 1, 3 }); + assertSame(ranges, MapList.coalesceRanges(ranges)); + + // add non-contiguous range: + ranges.add(new int[] { 5, 6 }); + assertSame(ranges, MapList.coalesceRanges(ranges)); + + // 'contiguous' range in opposite direction is not merged: + ranges.add(new int[] { 7, 6 }); + assertSame(ranges, MapList.coalesceRanges(ranges)); + + // merging in forward direction: + ranges.clear(); + ranges.add(new int[] { 1, 3 }); + ranges.add(new int[] { 4, 5 }); + ranges.add(new int[] { 5, 5 }); + ranges.add(new int[] { 5, 7 }); + List merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 1, 7 }, merged.get(0)); + // verify input list is unchanged + assertEquals(4, ranges.size()); + assertArrayEquals(new int[] { 1, 3 }, ranges.get(0)); + assertArrayEquals(new int[] { 4, 5 }, ranges.get(1)); + assertArrayEquals(new int[] { 5, 5 }, ranges.get(2)); + assertArrayEquals(new int[] { 5, 7 }, ranges.get(3)); + + // merging in reverse direction: + ranges.clear(); + ranges.add(new int[] { 7, 5 }); + ranges.add(new int[] { 5, 4 }); + ranges.add(new int[] { 4, 4 }); + ranges.add(new int[] { 3, 1 }); + merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 7, 1 }, merged.get(0)); + + // merging with switches of direction: + ranges.clear(); + ranges.add(new int[] { 1, 3 }); + ranges.add(new int[] { 4, 5 }); + ranges.add(new int[] { 5, 5 }); + ranges.add(new int[] { 6, 6 }); + ranges.add(new int[] { 12, 10 }); + ranges.add(new int[] { 9, 8 }); + ranges.add(new int[] { 8, 8 }); + ranges.add(new int[] { 7, 7 }); + merged = MapList.coalesceRanges(ranges); + assertEquals(2, merged.size()); + assertArrayEquals(new int[] { 1, 6 }, merged.get(0)); + assertArrayEquals(new int[] { 12, 7 }, merged.get(1)); + } + + /** + * Test the method that merges a list of ranges where possible + */ + @Test(groups = { "Functional" }) + public void testCoalesceRanges_withOverlap() + { + List ranges = new ArrayList<>(); + ranges.add(new int[] { 1, 3 }); + ranges.add(new int[] { 2, 5 }); + + /* + * [2, 5] should extend [1, 3] + */ + List merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 1, 5 }, merged.get(0)); + + /* + * a subsumed interval should be dropped + */ + ranges.clear(); + ranges.add(new int[] { 1, 6 }); + ranges.add(new int[] { 2, 4 }); + merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 1, 6 }, merged.get(0)); + + ranges.clear(); + ranges.add(new int[] { 1, 5 }); + ranges.add(new int[] { 1, 6 }); + merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 1, 6 }, merged.get(0)); + + /* + * merge duplicate ranges + */ + ranges.clear(); + ranges.add(new int[] { 1, 3 }); + ranges.add(new int[] { 1, 3 }); + merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 1, 3 }, merged.get(0)); + + /* + * reverse direction + */ + ranges.clear(); + ranges.add(new int[] { 9, 5 }); + ranges.add(new int[] { 9, 4 }); + ranges.add(new int[] { 8, 3 }); + ranges.add(new int[] { 3, 2 }); + ranges.add(new int[] { 1, 0 }); + merged = MapList.coalesceRanges(ranges); + assertEquals(1, merged.size()); + assertArrayEquals(new int[] { 9, 0 }, merged.get(0)); + } + + /** + * Test the method that compounds ('traverses') two mappings + */ + @Test(groups = "Functional") + public void testTraverse() + { + /* + * simple 1:1 plus 1:1 forwards + */ + MapList ml1 = new MapList(new int[] { 3, 4, 8, 12 }, new int[] { 5, 8, + 11, 13 }, 1, 1); + MapList ml2 = new MapList(new int[] { 1, 50 }, new int[] { 40, 45, 70, + 75, 90, 127 }, 1, 1); + MapList compound = ml1.traverse(ml2); + + assertEquals(compound.getFromRatio(), 1); + assertEquals(compound.getToRatio(), 1); + List fromRanges = compound.getFromRanges(); + assertEquals(fromRanges.size(), 2); + assertArrayEquals(new int[] { 3, 4 }, fromRanges.get(0)); + assertArrayEquals(new int[] { 8, 12 }, fromRanges.get(1)); + List toRanges = compound.getToRanges(); + assertEquals(toRanges.size(), 2); + // 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)); + + /* + * 1:1 over 1:1 backwards ('reverse strand') + */ + ml1 = new MapList(new int[] { 1, 50 }, new int[] { 70, 119 }, 1, 1); + ml2 = new MapList(new int[] { 1, 500 }, + new int[] { 1000, 901, 600, 201 }, 1, 1); + compound = ml1.traverse(ml2); + + assertEquals(compound.getFromRatio(), 1); + assertEquals(compound.getToRatio(), 1); + fromRanges = compound.getFromRanges(); + assertEquals(fromRanges.size(), 1); + 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)); + + /* + * 1:1 plus 1:3 should result in 1:3 + */ + ml1 = new MapList(new int[] { 1, 30 }, new int[] { 11, 40 }, 1, 1); + ml2 = new MapList(new int[] { 1, 100 }, new int[] { 1, 50, 91, 340 }, + 1, 3); + compound = ml1.traverse(ml2); + + assertEquals(compound.getFromRatio(), 1); + assertEquals(compound.getToRatio(), 3); + fromRanges = compound.getFromRanges(); + assertEquals(fromRanges.size(), 1); + 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)); + + /* + * 3:1 plus 1:1 should result in 3:1 + */ + ml1 = new MapList(new int[] { 1, 30 }, new int[] { 11, 20 }, 3, 1); + ml2 = new MapList(new int[] { 1, 100 }, new int[] { 1, 15, 91, 175 }, + 1, 1); + compound = ml1.traverse(ml2); + + assertEquals(compound.getFromRatio(), 3); + assertEquals(compound.getToRatio(), 1); + fromRanges = compound.getFromRanges(); + assertEquals(fromRanges.size(), 1); + 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)); + + /* + * 1:3 plus 3:1 should result in 1:1 + */ + ml1 = new MapList(new int[] { 21, 40 }, new int[] { 13, 72 }, 1, 3); + ml2 = new MapList(new int[] { 1, 300 }, new int[] { 51, 70, 121, 200 }, + 3, 1); + compound = ml1.traverse(ml2); + + assertEquals(compound.getFromRatio(), 1); + assertEquals(compound.getToRatio(), 1); + fromRanges = compound.getFromRanges(); + assertEquals(fromRanges.size(), 1); + 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)); + + /* + * 3:1 plus 1:3 should result in 1:1 + */ + ml1 = new MapList(new int[] { 31, 90 }, new int[] { 13, 32 }, 3, 1); + ml2 = new MapList(new int[] { 11, 40 }, new int[] { 41, 50, 71, 150 }, + 1, 3); + compound = ml1.traverse(ml2); + + assertEquals(compound.getFromRatio(), 1); + assertEquals(compound.getToRatio(), 1); + fromRanges = compound.getFromRanges(); + assertEquals(fromRanges.size(), 1); + 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)); + + /* + * method returns null if not all regions are mapped through + */ + ml1 = new MapList(new int[] { 1, 50 }, new int[] { 101, 150 }, 1, 1); + ml2 = new MapList(new int[] { 131, 180 }, new int[] { 201, 250 }, 1, 3); + compound = ml1.traverse(ml2); + assertNull(compound); + } + + /** + * Test that method that inspects for the (first) forward or reverse 'to' range. + * Single position ranges are ignored. + */ + @Test(groups = { "Functional" }) + public void testIsToForwardsStrand() + { + // [3-9] declares forward strand + MapList ml = new MapList(new int[] { 20, 11 }, + new int[] + { 2, 2, 3, 9, 12, 11 }, 1, 1); + assertTrue(ml.isToForwardStrand()); + + // [11-5] declares reverse strand ([13-14] is ignored) + ml = new MapList(new int[] { 20, 11 }, + new int[] + { 2, 2, 11, 5, 13, 14 }, 1, 1); + assertFalse(ml.isToForwardStrand()); + + // all single position ranges - defaults to forward strand + ml = new MapList(new int[] { 3, 1 }, new int[] { 2, 2, 4, 4, 6, 6 }, 1, + 1); + assertTrue(ml.isToForwardStrand()); + } }