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

diff --git a/test/jalview/datamodel/ColumnSelectionTest.java b/test/jalview/datamodel/ColumnSelectionTest.java
index c594dda..2dda4d3 100644
--- a/test/jalview/datamodel/ColumnSelectionTest.java
+++ b/test/jalview/datamodel/ColumnSelectionTest.java
@@ -713,5 +713,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));
   }
 }