Remove trailing whitespace

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / OF13MatchSerializerTest.java

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
index f9a0224ffa8a302d19182b1b9ab8d93596017a2a..6b82e9e6734d89e5eba184ad82274a7f59467da6 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
@@ -94,10 +94,10 @@ public class OF13MatchSerializerTest {
         entries.add(entriesBuilder.build());
         builder.setMatchEntries(entries);
         Match match = builder.build();
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
-        
+
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
@@ -108,11 +108,11 @@ public class OF13MatchSerializerTest {
         Assert.assertEquals("Wrong ip address (third number)", 3, out.readUnsignedByte());
         Assert.assertEquals("Wrong ip address (fourth number)", 4, out.readUnsignedByte());
     }
-    
+
     /**
      * Test for correct serialization of Ipv6Address match entry
      */
-    @Test(expected=IllegalStateException.class)
+    @Test
     public void testIpv6Various() {
         MatchBuilder builder = new MatchBuilder();
         builder.setType(OxmMatchType.class);
@@ -162,29 +162,11 @@ public class OF13MatchSerializerTest {
         addressBuilder.setIpv6Address(new Ipv6Address("::"));
         entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());
         entries.add(entriesBuilder.build());
-        // ipv6 match entry with incorrect Ipv6 address (longer)
-        entriesBuilder = new MatchEntriesBuilder();
-        entriesBuilder.setOxmClass(OpenflowBasicClass.class);
-        entriesBuilder.setOxmMatchField(Ipv6Dst.class);
-        entriesBuilder.setHasMask(false);
-        addressBuilder = new Ipv6AddressMatchEntryBuilder();
-        addressBuilder.setIpv6Address(new Ipv6Address("1:2:3:4:5:6:7:8:9"));
-        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());
-        entries.add(entriesBuilder.build());
-        // ipv6 match entry with too abbreviated Ipv6 address
-        entriesBuilder = new MatchEntriesBuilder();
-        entriesBuilder.setOxmClass(OpenflowBasicClass.class);
-        entriesBuilder.setOxmMatchField(Ipv6NdTarget.class);
-        entriesBuilder.setHasMask(false);
-        addressBuilder = new Ipv6AddressMatchEntryBuilder();
-        addressBuilder.setIpv6Address(new Ipv6Address("1:2::::8"));
-        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());
-        entries.add(entriesBuilder.build());
         builder.setMatchEntries(entries);
         Match match = builder.build();
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
-        
+
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
@@ -242,29 +224,41 @@ public class OF13MatchSerializerTest {
         Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());
         Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());
-        Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
-        Assert.assertEquals("Wrong field and mask", 54, out.readUnsignedByte());
-        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());
-        Assert.assertEquals("Wrong ipv6 address", 1, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 2, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 3, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 4, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 5, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 6, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 7, out.readUnsignedShort());
-        Assert.assertEquals("Wrong ipv6 address", 8, out.readUnsignedShort());
     }
-    
+
+    /**
+     * Test for correct serialization of incorrect Ipv6Address match entry
+     */
+    @Test(expected=IllegalStateException.class)
+    public void testIpv6Incorrect() {
+        MatchBuilder builder = new MatchBuilder();
+        builder.setType(OxmMatchType.class);
+        List<MatchEntries> entries = new ArrayList<>();
+        // ipv6 match entry with incorrect Ipv6 address
+        MatchEntriesBuilder entriesBuilder = new MatchEntriesBuilder();
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);
+        entriesBuilder.setOxmMatchField(Ipv6Src.class);
+        entriesBuilder.setHasMask(false);
+        Ipv6AddressMatchEntryBuilder addressBuilder = new Ipv6AddressMatchEntryBuilder();
+        addressBuilder.setIpv6Address(new Ipv6Address("1:2::::8"));
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());
+        entries.add(entriesBuilder.build());
+        builder.setMatchEntries(entries);
+        Match match = builder.build();
+        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
+        matchSerializer.serialize(match, out);
+    }
+
     /**
      * Test for correct serialization of Ipv4Address match entry
      */
     @Test
     public void testIpv6Flabel() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, false, null);
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
-        
+
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
@@ -272,21 +266,21 @@ public class OF13MatchSerializerTest {
         out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         byte[] label = new byte[4];
         out.readBytes(label);
-        
+
         LOG.debug("label: "+ ByteBufUtils.bytesToHexString(label));
         Assert.assertArrayEquals("Wrong ipv6FLabel", new byte[]{0, 0x0f, (byte) 0x9e, (byte) 0x8d}, label);
     }
-    
+
     /**
      * Test for correct serialization of Ipv4Address match entry with mask
      */
     @Test
     public void testIpv6FlabelWithMask() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, true, new byte[]{0, 0x0c, 0x7b, 0x6a});
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
-        
+
         Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());
         out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);
         Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());
@@ -294,20 +288,20 @@ public class OF13MatchSerializerTest {
         out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);
         byte[] labelAndMask = new byte[8];
         out.readBytes(labelAndMask);
-        
+
         LOG.debug("label: "+ByteBufUtils.bytesToHexString(labelAndMask));
         Assert.assertArrayEquals("Wrong ipv6FLabel", new byte[]{0, 0x0f, (byte) 0x9e, (byte) 0x8d, 0, 0x0c, 0x7b, 0x6a}, labelAndMask);
     }
-    
+
     /**
      * Test for correct serialization of Ipv4Address match entry with wrong mask
      */
     @Test
     public void testIpv6FlabelWithMaskBad() {
         Match match = buildIpv6FLabelMatch(0x0f9e8dL, true, new byte[]{0x0c, 0x7b, 0x6a});
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        
+
         try {
             matchSerializer.serialize(match, out);
             Assert.fail("incorrect length of mask ignored");