svn commit: r1832129 - /tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java

[markt]

Author: markt
Date: Wed May 23 20:57:55 2018
New Revision: 1832129

URL: http://svn.apache.org/viewvc?rev=1832129&view=rev
Log:
Additional test cases to get to 100% code coverage of the new utility class.

Modified:
    tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java

Modified: tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java?rev=1832129&r1=1832128&r2=1832129&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java (original)
+++ tomcat/trunk/test/org/apache/catalina/util/TestNetMask.java Wed May 23 
20:57:55 2018
@@ -62,6 +62,8 @@ public final class TestNetMask {
         result.add(new Object[] { "ae31::27:ef2:1/129", null, Boolean.FALSE, 
null });
 
         // IPv4
+        result.add(new Object[] { "1.2.3.4", "1.2.3.4", Boolean.TRUE, 
Boolean.TRUE });
+
         result.add(new Object[] { "1.2.3.4/32", "1.2.3.3", Boolean.TRUE, 
Boolean.FALSE });
         result.add(new Object[] { "1.2.3.4/32", "1.2.3.4", Boolean.TRUE, 
Boolean.TRUE });
         result.add(new Object[] { "1.2.3.4/32", "1.2.3.5", Boolean.TRUE, 
Boolean.FALSE });
@@ -77,6 +79,8 @@ public final class TestNetMask {
         result.add(new Object[] { "10.0.0.0/22", "10.0.4.0", Boolean.TRUE, 
Boolean.FALSE });
 
         // IPv6
+        result.add(new Object[] { "::5:1", "::5:1", Boolean.TRUE, Boolean.TRUE 
});
+
         result.add(new Object[] { "::5:1/128", "::4:ffff", Boolean.TRUE, 
Boolean.FALSE });
         result.add(new Object[] { "::5:1/128", "::5:1", Boolean.TRUE, 
Boolean.TRUE });
         result.add(new Object[] { "::5:1/128", "::5:2", Boolean.TRUE, 
Boolean.FALSE });
@@ -91,6 +95,9 @@ public final class TestNetMask {
         result.add(new Object[] { "a::5:1/42", 
"a:0:3f:ffff:ffff:ffff:ffff:ffff", Boolean.TRUE, Boolean.TRUE });
         result.add(new Object[] { "a::5:1/42", "a:0:40::", Boolean.TRUE, 
Boolean.FALSE });
 
+        // Mixed
+        result.add(new Object[] { "10.0.0.0/22", "::1", Boolean.TRUE, 
Boolean.FALSE });
+
         return result;
     }
 
@@ -124,5 +131,7 @@ public final class TestNetMask {
         }
 
         Assert.assertEquals(matches, 
Boolean.valueOf(netMask.matches(inetAddress)));
+
+        Assert.assertEquals(mask, netMask.toString());
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org