From d8720fc191cba996c440171ef8e07462ef9f7035 Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 16 Aug 2018 10:00:07 +0100
Subject: [PATCH] JAL-3082 one more test condition

---
 test/jalview/datamodel/ColumnSelectionTest.java |   12 ++++++++++++
 1 file changed, 12 insertions(+)

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));
   }
 }
-- 
1.7.10.2