You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/12/06 16:36:17 UTC
svn commit: r1548565 -
/commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
Author: ggregory
Date: Fri Dec 6 15:36:17 2013
New Revision: 1548565
URL: http://svn.apache.org/r1548565
Log:
Formatting.
Modified:
commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
Modified: commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java?rev=1548565&r1=1548564&r2=1548565&view=diff
==============================================================================
--- commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java (original)
+++ commons/proper/net/trunk/src/test/java/org/apache/commons/net/SubnetUtilsTest.java Fri Dec 6 15:36:17 2013
@@ -38,164 +38,163 @@ public class SubnetUtilsTest extends Tes
}
/**
- * Test using the inclusiveHostCount flag, which includes
- * the network and broadcast addresses in host counts
+ * Test using the inclusiveHostCount flag, which includes the network and broadcast addresses in host counts
*/
public void testCidrAddresses() {
SubnetUtils utils = new SubnetUtils("192.168.0.1/8");
utils.setInclusiveHostCount(true);
SubnetInfo info = utils.getInfo();
- assertEquals("255.0.0.0",info.getNetmask());
+ assertEquals("255.0.0.0", info.getNetmask());
assertEquals(16777216, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/9");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.128.0.0",info.getNetmask());
+ assertEquals("255.128.0.0", info.getNetmask());
assertEquals(8388608, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/10");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.192.0.0",info.getNetmask());
+ assertEquals("255.192.0.0", info.getNetmask());
assertEquals(4194304, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/11");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.224.0.0",info.getNetmask());
+ assertEquals("255.224.0.0", info.getNetmask());
assertEquals(2097152, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/12");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.240.0.0",info.getNetmask());
+ assertEquals("255.240.0.0", info.getNetmask());
assertEquals(1048576, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/13");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.248.0.0",info.getNetmask());
+ assertEquals("255.248.0.0", info.getNetmask());
assertEquals(524288, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/14");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.252.0.0",info.getNetmask());
+ assertEquals("255.252.0.0", info.getNetmask());
assertEquals(262144, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/15");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.254.0.0",info.getNetmask());
+ assertEquals("255.254.0.0", info.getNetmask());
assertEquals(131072, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/16");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.0.0",info.getNetmask());
+ assertEquals("255.255.0.0", info.getNetmask());
assertEquals(65536, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/17");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.128.0",info.getNetmask());
+ assertEquals("255.255.128.0", info.getNetmask());
assertEquals(32768, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/18");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.192.0",info.getNetmask());
+ assertEquals("255.255.192.0", info.getNetmask());
assertEquals(16384, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/19");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.224.0",info.getNetmask());
+ assertEquals("255.255.224.0", info.getNetmask());
assertEquals(8192, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/20");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.240.0",info.getNetmask());
+ assertEquals("255.255.240.0", info.getNetmask());
assertEquals(4096, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/21");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.248.0",info.getNetmask());
+ assertEquals("255.255.248.0", info.getNetmask());
assertEquals(2048, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/22");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.252.0",info.getNetmask());
+ assertEquals("255.255.252.0", info.getNetmask());
assertEquals(1024, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/23");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.254.0",info.getNetmask());
+ assertEquals("255.255.254.0", info.getNetmask());
assertEquals(512, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/24");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.0",info.getNetmask());
+ assertEquals("255.255.255.0", info.getNetmask());
assertEquals(256, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/25");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.128",info.getNetmask());
+ assertEquals("255.255.255.128", info.getNetmask());
assertEquals(128, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/26");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.192",info.getNetmask());
+ assertEquals("255.255.255.192", info.getNetmask());
assertEquals(64, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/27");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.224",info.getNetmask());
+ assertEquals("255.255.255.224", info.getNetmask());
assertEquals(32, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/28");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.240",info.getNetmask());
+ assertEquals("255.255.255.240", info.getNetmask());
assertEquals(16, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/29");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.248",info.getNetmask());
+ assertEquals("255.255.255.248", info.getNetmask());
assertEquals(8, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/30");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.252",info.getNetmask());
+ assertEquals("255.255.255.252", info.getNetmask());
assertEquals(4, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/31");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.254",info.getNetmask());
+ assertEquals("255.255.255.254", info.getNetmask());
assertEquals(2, info.getAddressCount());
utils = new SubnetUtils("192.168.0.1/32");
utils.setInclusiveHostCount(true);
info = utils.getInfo();
- assertEquals("255.255.255.255",info.getNetmask());
+ assertEquals("255.255.255.255", info.getNetmask());
assertEquals(1, info.getAddressCount());
new SubnetUtils("192.168.0.1/1");
}
- public void testInvalidMasks(){
+ public void testInvalidMasks() {
try {
new SubnetUtils("192.168.0.1/33");
fail("Should have thrown IllegalArgumentException");
@@ -207,7 +206,7 @@ public class SubnetUtilsTest extends Tes
} catch (IllegalArgumentException expected) {
}
try {
- new SubnetUtils("192.168.0.1","0.0.0.0");
+ new SubnetUtils("192.168.0.1", "0.0.0.0");
fail("Should have thrown IllegalArgumentException");
} catch (IllegalArgumentException expected) {
}
@@ -215,28 +214,31 @@ public class SubnetUtilsTest extends Tes
public void testNET428_31() throws Exception {
final SubnetUtils subnetUtils = new SubnetUtils("1.2.3.4/31");
- assertEquals(0,subnetUtils.getInfo().getAddressCount());
+ assertEquals(0, subnetUtils.getInfo().getAddressCount());
String[] address = subnetUtils.getInfo().getAllAddresses();
assertNotNull(address);
- assertEquals(0,address.length);
+ assertEquals(0, address.length);
}
public void testNET428_32() throws Exception {
final SubnetUtils subnetUtils = new SubnetUtils("1.2.3.4/32");
- assertEquals(0,subnetUtils.getInfo().getAddressCount());
+ assertEquals(0, subnetUtils.getInfo().getAddressCount());
String[] address = subnetUtils.getInfo().getAllAddresses();
assertNotNull(address);
- assertEquals(0,address.length);
+ assertEquals(0, address.length);
}
public void testParseSimpleNetmask() {
final String address = "192.168.0.1";
- final String masks[] = new String[] { "255.0.0.0", "255.255.0.0", "255.255.255.0", "255.255.255.248"};
- final String bcastAddresses[] = new String[] { "192.255.255.255", "192.168.255.255", "192.168.0.255", "192.168.0.7"};
+ final String masks[] = new String[] { "255.0.0.0", "255.255.0.0", "255.255.255.0", "255.255.255.248" };
+ final String bcastAddresses[] = new String[] { "192.255.255.255", "192.168.255.255", "192.168.0.255",
+ "192.168.0.7" };
final String lowAddresses[] = new String[] { "192.0.0.1", "192.168.0.1", "192.168.0.1", "192.168.0.1" };
- final String highAddresses[] = new String[] { "192.255.255.254", "192.168.255.254", "192.168.0.254", "192.168.0.6" };
+ final String highAddresses[] = new String[] { "192.255.255.254", "192.168.255.254", "192.168.0.254",
+ "192.168.0.6" };
final String networkAddresses[] = new String[] { "192.0.0.0", "192.168.0.0", "192.168.0.0", "192.168.0.0" };
- final String cidrSignatures[] = new String[] { "192.168.0.1/8", "192.168.0.1/16", "192.168.0.1/24", "192.168.0.1/29" };
+ final String cidrSignatures[] = new String[] { "192.168.0.1/8", "192.168.0.1/16", "192.168.0.1/24",
+ "192.168.0.1/29" };
final int usableAddresses[] = new int[] { 16777214, 65534, 254, 6 };
for (int i = 0; i < masks.length; ++i) {
@@ -253,50 +255,50 @@ public class SubnetUtilsTest extends Tes
public void testParseSimpleNetmaskExclusive() {
String address = "192.168.15.7";
- String masks[]=new String[]{ "255.255.255.252", "255.255.255.254", "255.255.255.255"};
- String bcast[]=new String[]{ "192.168.15.7", "192.168.15.7", "192.168.15.7"};
- String netwk[]=new String[]{ "192.168.15.4", "192.168.15.6", "192.168.15.7" };
- String lowAd[]=new String[]{ "192.168.15.5", "0.0.0.0", "0.0.0.0" };
- String highA[]=new String[]{ "192.168.15.6", "0.0.0.0", "0.0.0.0" };
- String cidrS[]=new String[]{ "192.168.15.7/30", "192.168.15.7/31", "192.168.15.7/32"};
- int usableAd[]=new int[] { 2 , 0, 0};
- // low and high addresses don't exist
+ String masks[] = new String[] { "255.255.255.252", "255.255.255.254", "255.255.255.255" };
+ String bcast[] = new String[] { "192.168.15.7", "192.168.15.7", "192.168.15.7" };
+ String netwk[] = new String[] { "192.168.15.4", "192.168.15.6", "192.168.15.7" };
+ String lowAd[] = new String[] { "192.168.15.5", "0.0.0.0", "0.0.0.0" };
+ String highA[] = new String[] { "192.168.15.6", "0.0.0.0", "0.0.0.0" };
+ String cidrS[] = new String[] { "192.168.15.7/30", "192.168.15.7/31", "192.168.15.7/32" };
+ int usableAd[] = new int[] { 2, 0, 0 };
+ // low and high addresses don't exist
for (int i = 0; i < masks.length; ++i) {
SubnetUtils utils = new SubnetUtils(address, masks[i]);
utils.setInclusiveHostCount(false);
SubnetInfo info = utils.getInfo();
- assertEquals("ci "+masks[i], cidrS[i], info.getCidrSignature());
- assertEquals("bc "+masks[i], bcast[i], info.getBroadcastAddress());
- assertEquals("nw "+masks[i], netwk[i], info.getNetworkAddress());
- assertEquals("ac "+masks[i], usableAd[i], info.getAddressCount());
- assertEquals("lo "+masks[i], lowAd[i], info.getLowAddress());
- assertEquals("hi "+masks[i], highA[i], info.getHighAddress());
+ assertEquals("ci " + masks[i], cidrS[i], info.getCidrSignature());
+ assertEquals("bc " + masks[i], bcast[i], info.getBroadcastAddress());
+ assertEquals("nw " + masks[i], netwk[i], info.getNetworkAddress());
+ assertEquals("ac " + masks[i], usableAd[i], info.getAddressCount());
+ assertEquals("lo " + masks[i], lowAd[i], info.getLowAddress());
+ assertEquals("hi " + masks[i], highA[i], info.getHighAddress());
}
}
public void testParseSimpleNetmaskInclusive() {
- String address = "192.168.15.7";
- String masks[]=new String[]{ "255.255.255.252", "255.255.255.254", "255.255.255.255"};
- String bcast[]=new String[]{ "192.168.15.7", "192.168.15.7", "192.168.15.7"};
- String netwk[]=new String[]{ "192.168.15.4", "192.168.15.6", "192.168.15.7" };
- String lowAd[]=new String[]{ "192.168.15.4", "192.168.15.6", "192.168.15.7" };
- String highA[]=new String[]{ "192.168.15.7", "192.168.15.7", "192.168.15.7" };
- String cidrS[]=new String[]{ "192.168.15.7/30", "192.168.15.7/31", "192.168.15.7/32"};
- int usableAd[]=new int[] { 4 , 2, 1};
-
- for (int i = 0; i < masks.length; ++i) {
- SubnetUtils utils = new SubnetUtils(address, masks[i]);
- utils.setInclusiveHostCount(true);
- SubnetInfo info = utils.getInfo();
- assertEquals("ci "+masks[i], cidrS[i], info.getCidrSignature());
- assertEquals("bc "+masks[i], bcast[i], info.getBroadcastAddress());
- assertEquals("ac "+masks[i], usableAd[i], info.getAddressCount());
- assertEquals("nw "+masks[i], netwk[i], info.getNetworkAddress());
- assertEquals("lo "+masks[i], lowAd[i], info.getLowAddress());
- assertEquals("hi "+masks[i], highA[i], info.getHighAddress());
- }
- }
+ String address = "192.168.15.7";
+ String masks[] = new String[] { "255.255.255.252", "255.255.255.254", "255.255.255.255" };
+ String bcast[] = new String[] { "192.168.15.7", "192.168.15.7", "192.168.15.7" };
+ String netwk[] = new String[] { "192.168.15.4", "192.168.15.6", "192.168.15.7" };
+ String lowAd[] = new String[] { "192.168.15.4", "192.168.15.6", "192.168.15.7" };
+ String highA[] = new String[] { "192.168.15.7", "192.168.15.7", "192.168.15.7" };
+ String cidrS[] = new String[] { "192.168.15.7/30", "192.168.15.7/31", "192.168.15.7/32" };
+ int usableAd[] = new int[] { 4, 2, 1 };
+
+ for (int i = 0; i < masks.length; ++i) {
+ SubnetUtils utils = new SubnetUtils(address, masks[i]);
+ utils.setInclusiveHostCount(true);
+ SubnetInfo info = utils.getInfo();
+ assertEquals("ci " + masks[i], cidrS[i], info.getCidrSignature());
+ assertEquals("bc " + masks[i], bcast[i], info.getBroadcastAddress());
+ assertEquals("ac " + masks[i], usableAd[i], info.getAddressCount());
+ assertEquals("nw " + masks[i], netwk[i], info.getNetworkAddress());
+ assertEquals("lo " + masks[i], lowAd[i], info.getLowAddress());
+ assertEquals("hi " + masks[i], highA[i], info.getHighAddress());
+ }
+ }
public void testZeroAddressAndCidr() {
new SubnetUtils("0.0.0.0/0");
@@ -306,8 +308,7 @@ public class SubnetUtilsTest extends Tes
try {
new SubnetUtils("192.168.0.1/0");
fail("Mask /0 should have generated an IllegalArgumentException");
- }
- catch (IllegalArgumentException expected) {
+ } catch (IllegalArgumentException expected) {
}
}
}