cs.removeElement(1);
List<Integer> sel = cs.getSelected();
assertEquals(2, sel.size());
- assertEquals(new Integer(2), sel.get(0));
- assertEquals(new Integer(5), sel.get(1));
+ assertEquals(Integer.valueOf(2), sel.get(0));
+ assertEquals(Integer.valueOf(5), sel.get(1));
// removing an element in the list removes it
cs.removeElement(2);
assertEquals(1, sel.size());
sel = cs.getSelected();
assertEquals(1, sel.size());
- assertEquals(new Integer(5), sel.get(0));
+ assertEquals(Integer.valueOf(5), sel.get(0));
}
/**
*/
@Test(
groups = "Functional",
- expectedExceptions = { ConcurrentModificationException.class })
+ expectedExceptions =
+ { ConcurrentModificationException.class })
public void testGetSelected_concurrentModification()
{
ColumnSelection cs = new ColumnSelection();
assertEquals("[3, 1]", cs2.getSelected().toString());
}
-
@Test(groups = { "Functional" })
public void testStretchGroup_expand()
{
Annotation ann4 = new Annotation("x", "desc", 'Y', 3f);
added = cs
.filterAnnotations(new Annotation[]
- { null, helix, sheet, turn, ann4 },
- filter);
+ { null, helix, sheet, turn, ann4 }, filter);
assertEquals(1, added);
assertTrue(cs.contains(1));
assertEquals(2, added);
assertTrue(cs.contains(1));
assertTrue(cs.contains(4));
+
+ /*
+ * select < 1f or Helix; one annotation matches both
+ * return value should only count it once
+ */
+ filter.setThresholdType(ThresholdType.BELOW_THRESHOLD);
+ filter.setThresholdValue(1f);
+ added = cs
+ .filterAnnotations(new Annotation[]
+ { null, helix, sheet, turn, ann4 }, filter);
+ assertEquals(1, added);
+ assertTrue(cs.contains(1));
}
}