From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 13 Apr 2020 15:42:42 +0000 (+0100)
Subject: JAL-3574 test coverage corners
X-Git-Tag: Release_2_11_1_0~2^2~1^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d7f669694da3aefe896e649e2ba52f68ae5b790b;p=jalview.git

JAL-3574 test coverage corners
---

diff --git a/test/jalview/util/matcher/MatcherTest.java b/test/jalview/util/matcher/MatcherTest.java
index d29f000..c964195 100644
--- a/test/jalview/util/matcher/MatcherTest.java
+++ b/test/jalview/util/matcher/MatcherTest.java
@@ -239,12 +239,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 +331,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,6 +362,7 @@ 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"));