Address reviewer's comments floodlight/loxigen#297
Reference:
https://github.com/floodlight/loxigen/pull/297
diff --git a/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv4AddressTest.java b/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv4AddressTest.java
index 2e6128e..0716b50 100644
--- a/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv4AddressTest.java
+++ b/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv4AddressTest.java
@@ -281,24 +281,20 @@
IPv4AddressWithMask v;
- v = original.withMask(expectedMask);
+ v = original.withMask(IPv4Address.of(new byte[] {-1, -1, -1, 0}));
assertEquals(v.getValue(), expectedValue);
assertEquals(v.getMask(), expectedMask);
- v = original.withMask(new byte[] {-1, -1, -1, 0});
+ v = original.withMask(IPv4Address.of(0xFFFF_FF00));
assertEquals(v.getValue(), expectedValue);
assertEquals(v.getMask(), expectedMask);
- v = original.withMask(0xFFFF_FF00);
- assertEquals(v.getValue(), expectedValue);
- assertEquals(v.getMask(), expectedMask);
-
- v = original.withMask("255.255.255.0");
+ v = original.withMask(IPv4Address.of("255.255.255.0"));
assertEquals(v.getValue(), expectedValue);
assertEquals(v.getMask(), expectedMask);
Inet4Address i4a = (Inet4Address) InetAddress.getByName("255.255.255.0");
- v = original.withMask(i4a);
+ v = original.withMask(IPv4Address.of(i4a));
assertEquals(v.getValue(), expectedValue);
assertEquals(v.getMask(), expectedMask);
diff --git a/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv6AddressTest.java b/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv6AddressTest.java
index 394a39b..a397c2a 100644
--- a/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv6AddressTest.java
+++ b/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/IPv6AddressTest.java
@@ -237,6 +237,41 @@
}
@Test
+ public void testWithMask() throws Exception {
+ // Sanity tests for the withMask*() syntactic sugars
+
+ IPv6Address original = IPv6Address.of("fd12:3456:ABCD:7890::1");
+ IPv6Address expectedValue = IPv6Address.of("fd12:3456:ABCD::");
+ IPv6Address expectedMask = IPv6Address.of("ffff:ffff:ffff::");
+
+ IPv6AddressWithMask v;
+
+ v = original.withMask(IPv6Address.of(new byte[] {
+ -1, -1, -1, -1, -1, -1, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0 }));
+ assertEquals(v.getValue(), expectedValue);
+ assertEquals(v.getMask(), expectedMask);
+
+ v = original.withMask(IPv6Address.of(
+ 0xFFFF_FFFF_FFFF_0000L, 0x0000_0000_0000_0000L));
+ assertEquals(v.getValue(), expectedValue);
+ assertEquals(v.getMask(), expectedMask);
+
+ v = original.withMask(IPv6Address.of("ffff:ffff:ffff::"));
+ assertEquals(v.getValue(), expectedValue);
+ assertEquals(v.getMask(), expectedMask);
+
+ Inet6Address i6a = (Inet6Address) InetAddress.getByName("ffff:ffff:ffff::");
+ v = original.withMask(IPv6Address.of(i6a));
+ assertEquals(v.getValue(), expectedValue);
+ assertEquals(v.getMask(), expectedMask);
+
+ v = original.withMaskOfLength(48);
+ assertEquals(v.getValue(), expectedValue);
+ assertEquals(v.getMask(), expectedMask);
+ }
+
+ @Test
public void testReadFrom() throws OFParseError, UnknownHostException {
for(int i=0; i < testStrings.length; i++ ) {
byte[] bytes = Inet6Address.getByName(testStrings[i]).getAddress();