X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FColumnSelectionTest.java;h=d581345e5a99303e481d14a45fe32539c7427396;hb=5c041c1e56a818e673f4a141520a4becf81ae801;hp=c594dda4779266794e4d70686f2180a82b256de9;hpb=6f04e0a80f3c3ba8087a1ad316debd395d0a4db0;p=jalview.git

diff --git a/test/jalview/datamodel/ColumnSelectionTest.java b/test/jalview/datamodel/ColumnSelectionTest.java
index c594dda..d581345 100644
--- a/test/jalview/datamodel/ColumnSelectionTest.java
+++ b/test/jalview/datamodel/ColumnSelectionTest.java
@@ -103,8 +103,8 @@ public class ColumnSelectionTest
     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);
@@ -112,7 +112,7 @@ public class ColumnSelectionTest
     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));
   }
 
   /**
@@ -411,7 +411,8 @@ public class ColumnSelectionTest
    */
   @Test(
     groups = "Functional",
-    expectedExceptions = { ConcurrentModificationException.class })
+    expectedExceptions =
+    { ConcurrentModificationException.class })
   public void testGetSelected_concurrentModification()
   {
     ColumnSelection cs = new ColumnSelection();
@@ -538,7 +539,6 @@ public class ColumnSelectionTest
     assertEquals("[3, 1]", cs2.getSelected().toString());
   }
 
-
   @Test(groups = { "Functional" })
   public void testStretchGroup_expand()
   {
@@ -652,8 +652,7 @@ public class ColumnSelectionTest
     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));
 
@@ -713,5 +712,17 @@ public class ColumnSelectionTest
     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));
   }
 }