Author: markt Date: Wed May 23 20:46:01 2018 New Revision: 1832125 URL: http://svn.apache.org/viewvc?rev=1832125&view=rev Log: Few more test cases
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=1832125&r1=1832124&r2=1832125&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:46:01 2018 @@ -71,6 +71,26 @@ public final class TestNetMask { result.add(new Object[] { "1.2.3.4/31", "1.2.3.5", Boolean.TRUE, Boolean.TRUE }); result.add(new Object[] { "1.2.3.4/31", "1.2.3.6", Boolean.TRUE, Boolean.FALSE }); + result.add(new Object[] { "10.0.0.0/22", "9.255.255.255", Boolean.TRUE, Boolean.FALSE }); + result.add(new Object[] { "10.0.0.0/22", "10.0.0.0", Boolean.TRUE, Boolean.TRUE }); + result.add(new Object[] { "10.0.0.0/22", "10.0.3.255", Boolean.TRUE, Boolean.TRUE }); + result.add(new Object[] { "10.0.0.0/22", "10.0.4.0", Boolean.TRUE, Boolean.FALSE }); + + // IPv6 + 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 }); + + result.add(new Object[] { "::5:1/127", "::4:ffff", Boolean.TRUE, Boolean.FALSE }); + result.add(new Object[] { "::5:1/127", "::5:0", Boolean.TRUE, Boolean.TRUE }); + result.add(new Object[] { "::5:1/127", "::5:1", Boolean.TRUE, Boolean.TRUE }); + result.add(new Object[] { "::5:1/127", "::5:2", Boolean.TRUE, Boolean.FALSE }); + + result.add(new Object[] { "a::5:1/42", "9:ffff:ffff:ffff:ffff:ffff:ffff:ffff", Boolean.TRUE, Boolean.FALSE }); + result.add(new Object[] { "a::5:1/42", "a::0", Boolean.TRUE, Boolean.TRUE }); + 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 }); + return result; } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org