X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2Fmatcher%2FMatcherTest.java;h=82abc52b96be984f78666612fff8495e5b2ce848;hb=e9a1c2c372f4bbf6cf658de3dba73ef326b20c20;hp=d29f00010b1f1241c2098663d69571fbd8c3af8e;hpb=06ab16e2f61b0d30302e645be386ce02c26086b4;p=jalview.git

diff --git a/test/jalview/util/matcher/MatcherTest.java b/test/jalview/util/matcher/MatcherTest.java
index d29f000..82abc52 100644
--- a/test/jalview/util/matcher/MatcherTest.java
+++ b/test/jalview/util/matcher/MatcherTest.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.util.matcher;
 
 import static org.testng.Assert.assertEquals;
@@ -239,12 +259,17 @@ public class MatcherTest
 
     /*
      * a number with a string match condition will be treated as string
+     * (these cases shouldn't arise as the match() method is coded)
      */
     Matcher m1 = new Matcher(Condition.Contains, "32");
     assertFalse(m1.matchesFloat("-203f", 0f));
     assertTrue(m1.matchesFloat("-4321.0f", 0f));
     assertFalse(m1.matchesFloat("-203", 0f));
     assertTrue(m1.matchesFloat("-4321", 0f));
+    assertFalse(m1.matchesLong("-203"));
+    assertTrue(m1.matchesLong("-4321"));
+    assertFalse(m1.matchesLong("-203f"));
+    assertTrue(m1.matchesLong("-4321.0f"));
   }
 
   /**
@@ -326,6 +351,7 @@ public class MatcherTest
     assertFalse(m.equals("foo"));
     assertTrue(m.equals(m));
     assertTrue(m.equals(new Matcher(Condition.LT, -123456)));
+    assertFalse(m.equals(new Matcher(Condition.LT, +123456)));
     assertTrue(m.equals(new Matcher(Condition.LT, "-123456")));
     assertFalse(m.equals(new Matcher(Condition.LT, -123456f)));
     assertFalse(m.equals(new Matcher(Condition.LT, "-123456f")));
@@ -356,11 +382,12 @@ public class MatcherTest
     MatcherI m = new Matcher(Condition.EQ, 2);
     assertTrue(m.matches("2"));
     assertTrue(m.matches("+2"));
+    assertFalse(m.matches("3"));
     // a float value may be passed to an integer matcher
     assertTrue(m.matches("2.0"));
     assertTrue(m.matches("2.000000f"));
     assertFalse(m.matches("2.01"));
-  
+
     /*
      * NOT EQUALS test
      */
@@ -368,7 +395,7 @@ public class MatcherTest
     assertFalse(m.matches("123"));
     assertFalse(m.matches("123.0"));
     assertTrue(m.matches("-123"));
-  
+
     /*
      * >= test
      */
@@ -376,14 +403,14 @@ public class MatcherTest
     assertTrue(m.matches("113890813"));
     assertTrue(m.matches("113890814"));
     assertFalse(m.matches("-113890813"));
-  
+
     /*
      * > test
      */
     m = new Matcher(Condition.GT, 113890813);
     assertFalse(m.matches("113890813"));
     assertTrue(m.matches("113890814"));
-  
+
     /*
      * <= test
      */
@@ -391,7 +418,7 @@ public class MatcherTest
     assertTrue(m.matches("113890813"));
     assertFalse(m.matches("113890814"));
     assertTrue(m.matches("113890812"));
-  
+
     /*
      * < test
      */