Fix checkstyle violations in openflow-protocol-impl - part 10 91/67391/2
authorTom Pantelis <tompantelis@gmail.com>
Sun, 21 Jan 2018 01:39:35 +0000 (20:39 -0500)
committerTom Pantelis <tompantelis@gmail.com>
Sat, 27 Jan 2018 02:30:26 +0000 (21:30 -0500)
Many violations - more to follow

Change-Id: I3b7ab07f56a13982f88df17805c3d82bbf14a062
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
27 files changed:
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyExperimenterTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyFlowTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyGroupFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyMeterFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyPortDescTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/MultipartReplyTableFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/multipart/OF10StatsReplyExperimenterTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/instruction/AbstractInstructionDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6ExtHdrDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmIpv6FlabelDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMetadataDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmMplsBosDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmPbbIsidDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmVlanVidDeserializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializationFactoryTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/SerializerRegistryImplTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestExperimenterTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupDescTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestGroupFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestMeterFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestPortDescTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableFeaturesTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/MultipartRequestTableTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestAggregateTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/multipart/OF10StatsRequestExperimenterTest.java
openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/statistics/StatisticsCountersTest.java

index 5acb3f326d7b2916c949de1f12bc28eee8570cfa..181b9afb5889933ca9fbfaab25490a51367e443c 100644 (file)
@@ -25,20 +25,21 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartReplyExperimenter.
  *
+ * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MultipartReplyExperimenterTest {
 
     @Mock DeserializerRegistry registry;
 
-    private MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
+    private final MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
     @Mock
     private OFDeserializer<ExperimenterDataOfChoice> vendorDeserializer;
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testMultipartReplyExperimenter() {
@@ -54,4 +55,4 @@ public class MultipartReplyExperimenterTest {
 
         Mockito.verify(vendorDeserializer).deserialize(bb);
     }
-}
\ No newline at end of file
+}
index 4183a352d28c8f98081e5488e9e78398b327d99a..317f8e9221c44b28414fc8705c7da9a89a4b7aa4 100644 (file)
@@ -9,9 +9,7 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
-
 import java.math.BigInteger;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,15 +28,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow._case.multipart.reply.flow.FlowStats;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartReplyFlow.
  *
+ * @author michal.polkorab
  */
 public class MultipartReplyFlowTest {
 
     private OFDeserializer<MultipartReplyMessage> factory;
 
     /**
-     * Initializes deserializer registry and lookups correct deserializer
+     * Initializes deserializer registry and lookups correct deserializer.
      */
     @Before
     public void startUp() {
@@ -49,10 +48,10 @@ public class MultipartReplyFlowTest {
     }
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
-    public void testEmptyMultipartReplyFlowBody(){
+    public void testEmptyMultipartReplyFlowBody() {
         ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00");
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 
@@ -65,34 +64,34 @@ public class MultipartReplyFlowTest {
     }
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
-    public void testMultipartReplyFlowBody(){
-        ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00 "+
+    public void testMultipartReplyFlowBody() {
+        ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00 " + //
                                               // first flow stat
-                                              "00 48 08 00 "+ // length, tableId, padding
-                                              "00 00 00 09 "+//durationSec
-                                              "00 00 00 07 "+//durationNsec
-                                              "00 0C 00 0E 00 0F 00 1F "+//priority, idleTimeout, hardTimeout, flags
-                                              "00 00 00 00 "+//pad_02
-                                              "FF 01 01 01 01 01 01 01 "+//cookie
-                                              "EF 01 01 01 01 01 01 01 "+//packetCount
-                                              "7F 01 01 01 01 01 01 01 "+//byteCount
-                                              "00 01 00 04 00 00 00 00 "+//empty match
-                                              "00 01 00 08 06 00 00 00 "+
-                                              "00 01 00 08 06 00 00 00 "+
+                                              "00 48 08 00 " + // length, tableId, padding
+                                              "00 00 00 09 " + //durationSec
+                                              "00 00 00 07 " + //durationNsec
+                                              "00 0C 00 0E 00 0F 00 1F " + //priority, idleTimeout, hardTimeout, flags
+                                              "00 00 00 00 " + //pad_02
+                                              "FF 01 01 01 01 01 01 01 " + //cookie
+                                              "EF 01 01 01 01 01 01 01 " + //packetCount
+                                              "7F 01 01 01 01 01 01 01 " + //byteCount
+                                              "00 01 00 04 00 00 00 00 " + //empty match
+                                              "00 01 00 08 06 00 00 00 " + //
+                                              "00 01 00 08 06 00 00 00 " + //
                                               // second flow stat
-                                              "00 48 08 00 "+ // length, tableId, padding
-                                              "00 00 00 09 "+//durationSec
-                                              "00 00 00 07 "+//durationNsec
-                                              "00 0C 00 0E 00 0F 00 00 "+//priority, idleTimeout, hardTimeout, flags
-                                              "00 00 00 00 "+//pad_02
-                                              "FF 01 01 01 01 01 01 01 "+//cookie
-                                              "EF 01 01 01 01 01 01 01 "+//packetCount
-                                              "7F 01 01 01 01 01 01 01 "+//byteCount
-                                              "00 01 00 04 00 00 00 00 "+//empty match
-                                              "00 01 00 08 06 00 00 00 "+
+                                              "00 48 08 00 " + // length, tableId, padding
+                                              "00 00 00 09 " + //durationSec
+                                              "00 00 00 07 " + //durationNsec
+                                              "00 0C 00 0E 00 0F 00 00 " + // priority, idleTimeout, hardTimeout, flags
+                                              "00 00 00 00 " + //pad_02
+                                              "FF 01 01 01 01 01 01 01 " + //cookie
+                                              "EF 01 01 01 01 01 01 01 " + //packetCount
+                                              "7F 01 01 01 01 01 01 01 " + //byteCount
+                                              "00 01 00 04 00 00 00 00 " + //empty match
+                                              "00 01 00 08 06 00 00 00 " + //
                                               "00 01 00 08 06 00 00 00");
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
 
@@ -111,11 +110,11 @@ public class MultipartReplyFlowTest {
         Assert.assertEquals("Wrong hardTimeOut", 15, flowStats1.getHardTimeout().intValue());
         Assert.assertEquals("Wrong flags", new FlowModFlags(true, true, true, true, true), flowStats1.getFlags());
         Assert.assertEquals("Wrong cookie", new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01}), flowStats1.getCookie());
+            0x01, 0x01, 0x01}), flowStats1.getCookie());
         Assert.assertEquals("Wrong packetCount", new BigInteger(1, new byte[]{(byte) 0xEF, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01, 0x01}), flowStats1.getPacketCount());
+            0x01, 0x01, 0x01, 0x01}), flowStats1.getPacketCount());
         Assert.assertEquals("Wrong byteCount", new BigInteger(1, new byte[]{(byte) 0x7F, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01, 0x01}), flowStats1.getByteCount());
+            0x01, 0x01, 0x01, 0x01}), flowStats1.getByteCount());
         Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType());
         flowStats1 = message.getFlowStats().get(1);
         Assert.assertEquals("Wrong tableId", 8, flowStats1.getTableId().intValue());
@@ -126,11 +125,11 @@ public class MultipartReplyFlowTest {
         Assert.assertEquals("Wrong hardTimeOut", 15, flowStats1.getHardTimeout().intValue());
         Assert.assertEquals("Wrong flags", new FlowModFlags(false, false, false, false, false), flowStats1.getFlags());
         Assert.assertEquals("Wrong cookie", new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01}), flowStats1.getCookie());
+            0x01, 0x01, 0x01}), flowStats1.getCookie());
         Assert.assertEquals("Wrong packetCount", new BigInteger(1, new byte[]{(byte) 0xEF, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01, 0x01}), flowStats1.getPacketCount());
+            0x01, 0x01, 0x01, 0x01}), flowStats1.getPacketCount());
         Assert.assertEquals("Wrong byteCount", new BigInteger(1, new byte[]{(byte) 0x7F, 0x01, 0x01, 0x01,
-                0x01, 0x01, 0x01, 0x01}), flowStats1.getByteCount());
+            0x01, 0x01, 0x01, 0x01}), flowStats1.getByteCount());
         Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType());
     }
-}
\ No newline at end of file
+}
index 5ac385c750f2fc9f459b12331b6bd0cc3b51e0d6..39cd8b39a09dff0026a653c44ca3d8c179210383 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartReplyMessageFactory;
@@ -22,28 +21,29 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.features._case.MultipartReplyGroupFeatures;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartReplyGroupFeatures.
  *
+ * @author michal.polkorab
  */
 public class MultipartReplyGroupFeaturesTest {
 
-    private MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
+    private final MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testMultipartReplyGroupFeatures() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 "+
-                                              "00 00 00 0F "+// types
-                                              "00 00 00 0F "+// capabilities
-                                              "00 00 00 01 "+// max groups
-                                              "00 00 00 02 "+// max groups
-                                              "00 00 00 03 "+// max groups
-                                              "00 00 00 04 "+// max groups
-                                              "0F FF 98 01 "+// actions bitmap (all actions included)
-                                              "00 00 00 00 "+// actions bitmap (no actions included)
-                                              "00 00 00 00 "+// actions bitmap (no actions included)
+        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 " + //
+                                              "00 00 00 0F " + // types
+                                              "00 00 00 0F " + // capabilities
+                                              "00 00 00 01 " + // max groups
+                                              "00 00 00 02 " + // max groups
+                                              "00 00 00 03 " + // max groups
+                                              "00 00 00 04 " + // max groups
+                                              "0F FF 98 01 " + // actions bitmap (all actions included)
+                                              "00 00 00 00 " + // actions bitmap (no actions included)
+                                              "00 00 00 00 " + // actions bitmap (no actions included)
                                               "00 00 00 00"// actions bitmap (no actions included)
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
@@ -61,32 +61,35 @@ public class MultipartReplyGroupFeaturesTest {
         Assert.assertEquals("Wrong max groups", 2, message.getMaxGroups().get(1).intValue());
         Assert.assertEquals("Wrong max groups", 3, message.getMaxGroups().get(2).intValue());
         Assert.assertEquals("Wrong max groups", 4, message.getMaxGroups().get(3).intValue());
-        Assert.assertEquals("Wrong actions bitmap", new ActionType(true, true, true, true, false, true, true, true, true,
-                true, true, true, true, true, true, true, true), message.getActionsBitmap().get(0));
-        Assert.assertEquals("Wrong actions bitmap", new ActionType(false, false, false, false, false, false, false, false,
-                false, false, false, false, false, false, false, false, false), message.getActionsBitmap().get(1));
-        Assert.assertEquals("Wrong actions bitmap", new ActionType(false, false, false, false, false, false, false, false,
-                false, false, false, false, false, false, false, false, false), message.getActionsBitmap().get(2));
-        Assert.assertEquals("Wrong actions bitmap", new ActionType(false, false, false, false, false, false, false, false,
-                false, false, false, false, false, false, false, false, false), message.getActionsBitmap().get(3));
+        Assert.assertEquals("Wrong actions bitmap", new ActionType(true, true, true, true, false, true, true, true,
+                true, true, true, true, true, true, true, true, true), message.getActionsBitmap().get(0));
+        Assert.assertEquals("Wrong actions bitmap", new ActionType(false, false, false, false, false, false, false,
+                false, false, false, false, false, false, false, false, false, false),
+                message.getActionsBitmap().get(1));
+        Assert.assertEquals("Wrong actions bitmap", new ActionType(false, false, false, false, false, false, false,
+                false, false, false, false, false, false, false, false, false, false),
+                message.getActionsBitmap().get(2));
+        Assert.assertEquals("Wrong actions bitmap", new ActionType(false, false, false, false, false, false, false,
+                false, false, false, false, false, false, false, false, false, false),
+                message.getActionsBitmap().get(3));
     }
 
     /**
      * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
-     * (with different group types and capabilities)
+     * (with different group types and capabilities).
      */
     @Test
     public void testMultipartReplyGroupFeatures2() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 "+
-                                              "00 00 00 00 "+// types
-                                              "00 00 00 00 "+// capabilities
-                                              "00 00 00 01 "+// max groups
-                                              "00 00 00 02 "+// max groups
-                                              "00 00 00 03 "+// max groups
-                                              "00 00 00 04 "+// max groups
-                                              "00 00 00 00 "+// actions bitmap (all actions included)
-                                              "00 00 00 00 "+// actions bitmap (no actions included)
-                                              "00 00 00 00 "+// actions bitmap (no actions included)
+        ByteBuf bb = BufferHelper.buildBuffer("00 08 00 01 00 00 00 00 " + //
+                                              "00 00 00 00 " + // types
+                                              "00 00 00 00 " + // capabilities
+                                              "00 00 00 01 " + // max groups
+                                              "00 00 00 02 " + // max groups
+                                              "00 00 00 03 " + // max groups
+                                              "00 00 00 04 " + // max groups
+                                              "00 00 00 00 " + // actions bitmap (all actions included)
+                                              "00 00 00 00 " + // actions bitmap (no actions included)
+                                              "00 00 00 00 " + // actions bitmap (no actions included)
                                               "00 00 00 00"// actions bitmap (no actions included)
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
@@ -101,4 +104,4 @@ public class MultipartReplyGroupFeaturesTest {
         Assert.assertEquals("Wrong capabilities", new GroupCapabilities(false, false, false, false),
                 message.getCapabilities());
     }
-}
\ No newline at end of file
+}
index 453c755dc5ec62137236224566ef58617287f184..6d04a76ea67b9298b24b559218d2b59e43be1c72 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartReplyMessageFactory;
@@ -21,19 +20,20 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.features._case.MultipartReplyMeterFeatures;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartReplyMeterFeatures.
  *
+ * @author michal.polkorab
  */
 public class MultipartReplyMeterFeaturesTest {
 
-    private MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
+    private final MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
-    public void testMultipartReplyMeterFeatures(){
-        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 "+
+    public void testMultipartReplyMeterFeatures() {
+        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 " + //
                                               "00 00 00 0A " + // maxMeter
                                               "00 00 00 06 " + // bandTypes
                                               "00 00 00 0F " + // capabilities
@@ -44,7 +44,8 @@ public class MultipartReplyMeterFeaturesTest {
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 11, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
-        MultipartReplyMeterFeaturesCase messageCase = (MultipartReplyMeterFeaturesCase) builtByFactory.getMultipartReplyBody();
+        MultipartReplyMeterFeaturesCase messageCase =
+                (MultipartReplyMeterFeaturesCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyMeterFeatures message = messageCase.getMultipartReplyMeterFeatures();
         Assert.assertEquals("Wrong maxMeter", 10, message.getMaxMeter().intValue());
         Assert.assertEquals("Wrong bandTypes", new MeterBandTypeBitmap(true, true), message.getBandTypes());
@@ -54,11 +55,11 @@ public class MultipartReplyMeterFeaturesTest {
     }
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
-    public void testMultipartReplyMeterFeatures2(){
-        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 "+
+    public void testMultipartReplyMeterFeatures2() {
+        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 " + //
                                               "00 00 00 09 " + // maxMeter
                                               "00 00 00 00 " + // bandTypes
                                               "00 00 00 00 " + // capabilities
@@ -69,12 +70,14 @@ public class MultipartReplyMeterFeaturesTest {
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 11, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());
-        MultipartReplyMeterFeaturesCase messageCase = (MultipartReplyMeterFeaturesCase) builtByFactory.getMultipartReplyBody();
+        MultipartReplyMeterFeaturesCase messageCase =
+                (MultipartReplyMeterFeaturesCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyMeterFeatures message = messageCase.getMultipartReplyMeterFeatures();
         Assert.assertEquals("Wrong maxMeter", 9, message.getMaxMeter().intValue());
         Assert.assertEquals("Wrong bandTypes", new MeterBandTypeBitmap(false, false), message.getBandTypes());
-        Assert.assertEquals("Wrong capabilities", new MeterFlags(false, false, false, false), message.getCapabilities());
+        Assert.assertEquals("Wrong capabilities",
+                new MeterFlags(false, false, false, false), message.getCapabilities());
         Assert.assertEquals("Wrong maxBands", 3, message.getMaxBands().intValue());
         Assert.assertEquals("Wrong maxColor", 4, message.getMaxColor().intValue());
     }
-}
\ No newline at end of file
+}
index d601cfa56ae7b4d89d16ee5b932df0d36ffa6297..b5fb6b37f41015eb2e1170b36c3bb00356179ccb 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartReplyMessageFactory;
@@ -24,15 +23,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc._case.multipart.reply.port.desc.Ports;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartReplyPortDesc.
  *
+ * @author michal.polkorab
  */
 public class MultipartReplyPortDescTest {
 
-    private MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
+    private final MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testEmptyMultipartReplyPortDesc() {
@@ -48,11 +48,11 @@ public class MultipartReplyPortDescTest {
     }
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testMultipartReplyPortDesc() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0D 00 00 00 00 00 00 " +
+        ByteBuf bb = BufferHelper.buildBuffer("00 0D 00 00 00 00 00 00 " + //
                                               // first port desc
                                               "00 01 02 03 00 00 00 00 " + // portNo, padding
                                               "08 00 27 00 B0 EB 00 00 " + // mac address, padding
@@ -110,7 +110,8 @@ public class MultipartReplyPortDescTest {
         Assert.assertEquals("Wrong portState", new PortState(false, false, false), port.getState());
         Assert.assertEquals("Wrong currentFeatures", new PortFeatures(false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false), port.getCurrentFeatures());
-        Assert.assertEquals("Wrong advertisedFeatures",  new PortFeatures(false, false, false, false, false, false, false,
+        Assert.assertEquals("Wrong advertisedFeatures",
+                new PortFeatures(false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false), port.getAdvertisedFeatures());
         Assert.assertEquals("Wrong supportedFeatures", new PortFeatures(false, false, false, false, false, false, false,
                 false, false, false, false, false, false, false, false, false), port.getSupportedFeatures());
index 96a7c1c0aae780ba0f8371e9a6c5a920e732e68a..ace1243325713a7b8092db6e4e7ebd6a6ff5e6a1 100644 (file)
@@ -9,9 +9,7 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories.multipart;
 
 import io.netty.buffer.ByteBuf;
-
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.MultipartReplyMessageFactory;
@@ -26,15 +24,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeatureProperties;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartReplyTableFeatures.
  *
+ * @author michal.polkorab
  */
 public class MultipartReplyTableFeaturesTest {
 
-    private MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
+    private final MultipartReplyMessageFactory factory = new MultipartReplyMessageFactory();
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testEmptyMultipartReplyTableFeatures() {
@@ -44,32 +43,33 @@ public class MultipartReplyTableFeaturesTest {
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 12, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", false, builtByFactory.getFlags().isOFPMPFREQMORE());
-        MultipartReplyTableFeaturesCase messageCase = (MultipartReplyTableFeaturesCase) builtByFactory.getMultipartReplyBody();
+        MultipartReplyTableFeaturesCase messageCase =
+                (MultipartReplyTableFeaturesCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyTableFeatures message = messageCase.getMultipartReplyTableFeatures();
         Assert.assertEquals("Wrong table features size", 0, message.getTableFeatures().size());
     }
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testMultipartReplyTableFeatures() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 "+
+        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 " + //
                                               // first table feature
-                                              "00 40 01 00 00 00 00 00 "+// length, tableId, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 "+
-                                              "00 00 00 00 00 00 00 00 00 00 00 00 00 "+// name
-                                              "00 00 00 00 00 00 00 01 "+// metadata match
-                                              "00 00 00 00 00 00 00 02 "+// metadata write
-                                              "00 00 00 00 "+// config
-                                              "00 00 00 2A "+// max entries
+                                              "00 40 01 00 00 00 00 00 " + // length, tableId, padding
+                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 " + //
+                                              "00 00 00 00 00 00 00 00 00 00 00 00 00 " + // name
+                                              "00 00 00 00 00 00 00 01 " + // metadata match
+                                              "00 00 00 00 00 00 00 02 " + // metadata write
+                                              "00 00 00 00 " + // config
+                                              "00 00 00 2A " + // max entries
                                               // second table feature
-                                              "00 40 02 00 00 00 00 00 "+// length, tableId, padding
+                                              "00 40 02 00 00 00 00 00 " + // length, tableId, padding
                                               "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00"
-                                              + " 00 00 00 00 00 00 00 00 00 00 00 00 00 "+// name
-                                              "00 00 00 00 00 00 00 03 "+// metadata match
-                                              "00 00 00 00 00 00 00 04 "+// metadata write
-                                              "00 00 00 03 "+// config
+                                              + " 00 00 00 00 00 00 00 00 00 00 00 00 00 " + // name
+                                              "00 00 00 00 00 00 00 03 " + // metadata match
+                                              "00 00 00 00 00 00 00 04 " + // metadata write
+                                              "00 00 00 03 " + // config
                                               "00 00 00 2B"  // max entries
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
@@ -77,51 +77,56 @@ public class MultipartReplyTableFeaturesTest {
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 12, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", false, builtByFactory.getFlags().isOFPMPFREQMORE());
-        MultipartReplyTableFeaturesCase messageCase = (MultipartReplyTableFeaturesCase) builtByFactory.getMultipartReplyBody();
+        MultipartReplyTableFeaturesCase messageCase =
+                (MultipartReplyTableFeaturesCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyTableFeatures message = messageCase.getMultipartReplyTableFeatures();
         Assert.assertEquals("Wrong table features size", 2, message.getTableFeatures().size());
         TableFeatures feature = message.getTableFeatures().get(0);
         Assert.assertEquals("Wrong table id", 1, feature.getTableId().intValue());
         Assert.assertEquals("Wrong name", "Opendaylight", feature.getName());
-        Assert.assertArrayEquals("Wrong metadata match", new byte[]{0, 0, 0, 0, 0, 0, 0, 1}, feature.getMetadataMatch());
-        Assert.assertArrayEquals("Wrong metadata write", new byte[]{0, 0, 0, 0, 0, 0, 0, 2}, feature.getMetadataWrite());
+        Assert.assertArrayEquals("Wrong metadata match",
+                new byte[]{0, 0, 0, 0, 0, 0, 0, 1}, feature.getMetadataMatch());
+        Assert.assertArrayEquals("Wrong metadata write",
+                new byte[]{0, 0, 0, 0, 0, 0, 0, 2}, feature.getMetadataWrite());
         Assert.assertEquals("Wrong config", false, feature.getConfig().isOFPTCDEPRECATEDMASK());
         Assert.assertEquals("Wrong max entries", 42, feature.getMaxEntries().intValue());
         feature = message.getTableFeatures().get(1);
         Assert.assertEquals("Wrong table id", 2, feature.getTableId().intValue());
         Assert.assertEquals("Wrong name", "Opendaylight", feature.getName());
-        Assert.assertArrayEquals("Wrong metadata match", new byte[]{0, 0, 0, 0, 0, 0, 0, 3}, feature.getMetadataMatch());
-        Assert.assertArrayEquals("Wrong metadata write", new byte[]{0, 0, 0, 0, 0, 0, 0, 4}, feature.getMetadataWrite());
+        Assert.assertArrayEquals("Wrong metadata match",
+                new byte[]{0, 0, 0, 0, 0, 0, 0, 3}, feature.getMetadataMatch());
+        Assert.assertArrayEquals("Wrong metadata write",
+                new byte[]{0, 0, 0, 0, 0, 0, 0, 4}, feature.getMetadataWrite());
         Assert.assertEquals("Wrong config", true, feature.getConfig().isOFPTCDEPRECATEDMASK());
         Assert.assertEquals("Wrong max entries", 43, feature.getMaxEntries().intValue());
     }
 
     /**
-     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO.
      */
     @Test
     public void testMultipartReplyTableFeatures2() {
-        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 "+
-                                              "00 B0 01 00 00 00 00 00 "+// length, tableId, padding
-                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 "+
-                                              "00 00 00 00 00 00 00 00 00 00 00 00 00 "+// name
-                                              "00 00 00 00 00 00 00 01 "+// metadata match
-                                              "00 00 00 00 00 00 00 02 "+// metadata write
-                                              "00 00 00 00 "+// config
-                                              "00 00 00 2A "+// max entries
-                                              "00 00 00 04 00 00 00 00 "+
-                                              "00 01 00 04 00 00 00 00 "+
-                                              "00 02 00 08 01 02 03 04 "+
-                                              "00 03 00 07 05 06 07 00 "+
-                                              "00 04 00 04 00 00 00 00 "+
-                                              "00 05 00 04 00 00 00 00 "+
-                                              "00 06 00 04 00 00 00 00 "+
-                                              "00 07 00 04 00 00 00 00 "+
-                                              "00 08 00 04 00 00 00 00 "+
-                                              "00 0A 00 04 00 00 00 00 "+
-                                              "00 0C 00 04 00 00 00 00 "+
-                                              "00 0D 00 04 00 00 00 00 "+
-                                              "00 0E 00 04 00 00 00 00 "+
+        ByteBuf bb = BufferHelper.buildBuffer("00 0C 00 00 00 00 00 00 " + //
+                                              "00 B0 01 00 00 00 00 00 " + // length, tableId, padding
+                                              "4F 70 65 6E 64 61 79 6C 69 67 68 74 00 00 00 00 00 00 00 " + //
+                                              "00 00 00 00 00 00 00 00 00 00 00 00 00 " + // name
+                                              "00 00 00 00 00 00 00 01 " + // metadata match
+                                              "00 00 00 00 00 00 00 02 " + // metadata write
+                                              "00 00 00 00 " + // config
+                                              "00 00 00 2A " + // max entries
+                                              "00 00 00 04 00 00 00 00 " + //
+                                              "00 01 00 04 00 00 00 00 " + //
+                                              "00 02 00 08 01 02 03 04 " + //
+                                              "00 03 00 07 05 06 07 00 " + //
+                                              "00 04 00 04 00 00 00 00 " + //
+                                              "00 05 00 04 00 00 00 00 " + //
+                                              "00 06 00 04 00 00 00 00 " + //
+                                              "00 07 00 04 00 00 00 00 " + //
+                                              "00 08 00 04 00 00 00 00 " + //
+                                              "00 0A 00 04 00 00 00 00 " + //
+                                              "00 0C 00 04 00 00 00 00 " + //
+                                              "00 0D 00 04 00 00 00 00 " + //
+                                              "00 0E 00 04 00 00 00 00 " + //
                                               "00 0F 00 04 00 00 00 00"
                                               );
         MultipartReplyMessage builtByFactory = BufferHelper.deserialize(factory, bb);
@@ -129,14 +134,17 @@ public class MultipartReplyTableFeaturesTest {
         BufferHelper.checkHeaderV13(builtByFactory);
         Assert.assertEquals("Wrong type", 12, builtByFactory.getType().getIntValue());
         Assert.assertEquals("Wrong flag", false, builtByFactory.getFlags().isOFPMPFREQMORE());
-        MultipartReplyTableFeaturesCase messageCase = (MultipartReplyTableFeaturesCase) builtByFactory.getMultipartReplyBody();
+        MultipartReplyTableFeaturesCase messageCase =
+                (MultipartReplyTableFeaturesCase) builtByFactory.getMultipartReplyBody();
         MultipartReplyTableFeatures message = messageCase.getMultipartReplyTableFeatures();
         Assert.assertEquals("Wrong table features size", 1, message.getTableFeatures().size());
         TableFeatures feature = message.getTableFeatures().get(0);
         Assert.assertEquals("Wrong table id", 1, feature.getTableId().intValue());
         Assert.assertEquals("Wrong name", "Opendaylight", feature.getName());
-        Assert.assertArrayEquals("Wrong metadata match", new byte[]{0, 0, 0, 0, 0, 0, 0, 1}, feature.getMetadataMatch());
-        Assert.assertArrayEquals("Wrong metadata write", new byte[]{0, 0, 0, 0, 0, 0, 0, 2}, feature.getMetadataWrite());
+        Assert.assertArrayEquals("Wrong metadata match",
+                new byte[]{0, 0, 0, 0, 0, 0, 0, 1}, feature.getMetadataMatch());
+        Assert.assertArrayEquals("Wrong metadata write",
+                new byte[]{0, 0, 0, 0, 0, 0, 0, 2}, feature.getMetadataWrite());
         Assert.assertEquals("Wrong config", false, feature.getConfig().isOFPTCDEPRECATEDMASK());
         Assert.assertEquals("Wrong max entries", 42, feature.getMaxEntries().intValue());
         Assert.assertEquals("Wrong properties size", 14, feature.getTableFeatureProperties().size());
@@ -184,4 +192,4 @@ public class MultipartReplyTableFeaturesTest {
         Assert.assertEquals("Wrong property type", TableFeaturesPropType.OFPTFPTAPPLYSETFIELDMISS,
                 feature.getTableFeatureProperties().get(13).getType());
     }
-}
\ No newline at end of file
+}
index 69d420feb0bdfce3df08a17f7129a7a7a26e3305..8acaab7135344534027c8dd8f883a936975eed39 100644 (file)
@@ -25,8 +25,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.experimenter.core.ExperimenterDataOfChoice;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OF10StatsReplyExperimenter.
  *
+ * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
 public class OF10StatsReplyExperimenterTest {
@@ -35,7 +36,7 @@ public class OF10StatsReplyExperimenterTest {
     @Mock private OFDeserializer<ExperimenterDataOfChoice> vendorDeserializer;
 
     /**
-     * Tests {@link OF10StatsReplyMessageFactory} for experimenter body translation
+     * Tests {@link OF10StatsReplyMessageFactory} for experimenter body translation.
      */
     @Test
     public void test() {
@@ -53,4 +54,4 @@ public class OF10StatsReplyExperimenterTest {
 
         Mockito.verify(vendorDeserializer).deserialize(bb);
     }
-}
\ No newline at end of file
+}
index 1d8c8431846022986a3374fcbe6d83f770332e20..02e77878ac95560e11b37e343493586d50d46ef3 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.instruction;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.util.ByteBufUtils;
@@ -22,14 +21,15 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.grouping.Instruction;
 
 /**
- * @author michal.polkorab
+ * Unit tests for AbstractInstructionDeserializer.
  *
+ * @author michal.polkorab
  */
 public class AbstractInstructionDeserializerTest {
 
     /**
      * Tests {@link AbstractInstructionDeserializer#deserializeHeader(ByteBuf)} with different
-     * instruction types
+     * instruction types.
      */
     @Test
     public void test() {
@@ -57,4 +57,4 @@ public class AbstractInstructionDeserializerTest {
         instruction = new MeterInstructionDeserializer().deserializeHeader(buffer);
         Assert.assertTrue("Wrong type", instruction.getInstructionChoice() instanceof MeterCase);
     }
-}
\ No newline at end of file
+}
index 6fbdbaa4709885bc55cd8f4914634a9db8438e28..51d12f15782214331d2b28ed1c5b85f28a969765 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
@@ -20,13 +19,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6ExthdrCase;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OxmIpv6ExtHdrDeserializer.
  *
+ * @author michal.polkorab
  */
 public class OxmIpv6ExtHdrDeserializerTest {
 
     /**
-     * Tests {@link OxmIpv6ExtHdrDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmIpv6ExtHdrDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void test() {
@@ -46,4 +46,4 @@ public class OxmIpv6ExtHdrDeserializerTest {
                 .getIpv6Exthdr().getMask());
         Assert.assertTrue("Unread data", buffer.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
index 2a08e85ed1445f829f8e0717b8b2a44522ae31ae..6562df83aa6636fd8a49c664d7a9f2155f1fe06b 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
@@ -19,13 +18,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6FlabelCase;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OxmIpv6FlabelDeserializer.
  *
+ * @author michal.polkorab
  */
 public class OxmIpv6FlabelDeserializerTest {
 
     /**
-     * Tests {@link OxmIpv6FlabelDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmIpv6FlabelDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void test() {
@@ -44,7 +44,7 @@ public class OxmIpv6FlabelDeserializerTest {
     }
 
     /**
-     * Tests {@link OxmIpv6FlabelDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmIpv6FlabelDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void testWithMask() {
@@ -63,4 +63,4 @@ public class OxmIpv6FlabelDeserializerTest {
         Assert.assertArrayEquals("Wrong entry mask", new byte[]{0, 0, 0, 5},
                 ((Ipv6FlabelCase) entry.getMatchEntryValue()).getIpv6Flabel().getMask());
     }
-}
\ No newline at end of file
+}
index d8c60a655b9092cafdf10f327e5b8ab9db684d2d..412c7e677295bc7270e8094802836a46bba846ab 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
@@ -20,13 +19,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.MetadataCase;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OxmMetadataDeserializer.
  *
+ * @author michal.polkorab
  */
 public class OxmMetadataDeserializerTest {
 
     /**
-     * Tests {@link OxmMetadataDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmMetadataDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void test() {
@@ -42,4 +42,4 @@ public class OxmMetadataDeserializerTest {
         Assert.assertArrayEquals("Wrong entry value", ByteBufUtils.hexStringToBytes("00 00 00 00 00 00 00 03"),
                 ((MetadataCase) entry.getMatchEntryValue()).getMetadata().getMetadata());
     }
-}
\ No newline at end of file
+}
index 2756f063ed4123ddaff0f17285ef77a1914b885e..bcaf75cb1ccb77ded22b3586caced7e59b6ecc95 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
@@ -19,13 +18,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.MplsBosCase;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OxmMplsBosDeserializer.
  *
+ * @author michal.polkorab
  */
 public class OxmMplsBosDeserializerTest {
 
     /**
-     * Tests {@link OxmMplsBosDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmMplsBosDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void test() {
@@ -41,4 +41,4 @@ public class OxmMplsBosDeserializerTest {
         Assert.assertEquals("Wrong entry value", false,
                 ((MplsBosCase) entry.getMatchEntryValue()).getMplsBos().isBos());
     }
-}
\ No newline at end of file
+}
index 45e4a4fd469d6f0c5e795d65503170ba3f46edbf..ebb84fbaabff578e4a5ffaa73fcb7cf8277319af 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
@@ -19,13 +18,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.PbbIsidCase;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OxmPbbIsidDeserializer.
  *
+ * @author michal.polkorab
  */
 public class OxmPbbIsidDeserializerTest {
 
     /**
-     * Tests {@link OxmPbbIsidDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmPbbIsidDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void test() {
@@ -41,4 +41,4 @@ public class OxmPbbIsidDeserializerTest {
         Assert.assertEquals("Wrong entry value", 2, ((PbbIsidCase) entry.getMatchEntryValue())
                 .getPbbIsid().getIsid().intValue());
     }
-}
\ No newline at end of file
+}
index 8d2d1828227ac2edbbaafc12c872884623f09a70..e200761eef1355124ecd9fd956ca61e9e250e4cf 100644 (file)
@@ -9,7 +9,6 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
 import io.netty.buffer.ByteBuf;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
@@ -19,13 +18,14 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.VlanVidCase;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OxmVlanVidDeserializer.
  *
+ * @author michal.polkorab
  */
 public class OxmVlanVidDeserializerTest {
 
     /**
-     * Tests {@link OxmVlanVidDeserializer#deserialize(ByteBuf)}
+     * Tests {@link OxmVlanVidDeserializer#deserialize(ByteBuf)}.
      */
     @Test
     public void test() {
@@ -43,4 +43,4 @@ public class OxmVlanVidDeserializerTest {
         Assert.assertEquals("Wrong entry value", false,
                 ((VlanVidCase) entry.getMatchEntryValue()).getVlanVid().isCfiBit());
     }
-}
\ No newline at end of file
+}
index 3ffbca70489bc1616c95ffd60a48a7e2270aaf7f..490f5adee78b70ee03bd9faeb0d6735a458b4b15 100644 (file)
@@ -9,22 +9,23 @@
 package org.opendaylight.openflowjava.protocol.impl.serialization;
 
 import static org.junit.Assert.assertEquals;
+
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;
-
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.HelloInputBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for SerializationFactory.
  *
+ * @author michal.polkorab
  */
 public class SerializationFactoryTest {
 
     /**
-     * Test serializer lookup & serialization
+     * Test serializer lookup & serialization.
      */
     @Test
     public void test() {
@@ -32,7 +33,7 @@ public class SerializationFactoryTest {
         registry.init();
         SerializationFactory factory = new SerializationFactory();
         factory.setSerializerTable(registry);
-        ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
+        final ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         HelloInputBuilder helloBuilder = new HelloInputBuilder();
         helloBuilder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
         helloBuilder.setXid(123456L);
@@ -42,19 +43,19 @@ public class SerializationFactoryTest {
     }
 
     /**
-     * Test serializer not found scenario
+     * Test serializer not found scenario.
      */
-    @Test(expected=IllegalStateException.class)
+    @Test(expected = IllegalStateException.class)
     public void testNotExistingSerializer() {
         SerializerRegistry registry = new SerializerRegistryImpl();
         registry.init();
         SerializationFactory factory = new SerializationFactory();
         factory.setSerializerTable(registry);
-        ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
+        final ByteBuf buffer = PooledByteBufAllocator.DEFAULT.buffer();
         HelloInputBuilder helloBuilder = new HelloInputBuilder();
         helloBuilder.setVersion((short) EncodeConstants.OF10_VERSION_ID);
         helloBuilder.setXid(123456L);
         helloBuilder.setElements(null);
         factory.messageToBuffer((short) 0, buffer, helloBuilder.build());
     }
-}
\ No newline at end of file
+}
index abed50d9e93dec66454bf1e85dc12d4d0a4376ad..77f3173846ac5d4fc9d0165f9a3701529bb54ac0 100644 (file)
@@ -15,9 +15,9 @@ import org.opendaylight.openflowjava.protocol.impl.util.OF13MatchSerializer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match;
 
 /**
+ * Unit tests for SerializerRegistryImpl.
  *
  * @author madamjak
- *
  */
 public class SerializerRegistryImplTest {
 
@@ -25,20 +25,20 @@ public class SerializerRegistryImplTest {
     private static final short OF10 = EncodeConstants.OF10_VERSION_ID;
 
     /**
-     * Test - register serializer without arguments
+     * Test - register serializer without arguments.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testRegisterSerializerNoArgs(){
+    public void testRegisterSerializerNoArgs() {
 
         SerializerRegistryImpl serReg = new SerializerRegistryImpl();
         serReg.registerSerializer(null, null);
     }
 
     /**
-     * Test - unregister serializer without MessageTypeKye
+     * Test - unregister serializer without MessageTypeKey.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testUnRegisterSerializerNoMessageTypeKey(){
+    public void testUnRegisterSerializerNoMessageTypeKey() {
         SerializerRegistryImpl serReg = new SerializerRegistryImpl();
         serReg.init();
         serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
@@ -46,16 +46,18 @@ public class SerializerRegistryImplTest {
     }
 
     /**
-     * Test - unregister serializer
+     * Test - unregister serializer.
      */
     @Test
-    public void testUnRegisterSerializer(){
+    public void testUnRegisterSerializer() {
         SerializerRegistryImpl serReg = new SerializerRegistryImpl();
         serReg.init();
         serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
-        Assert.assertTrue("Wrong - unregister serializer",serReg.unregisterSerializer(new MessageTypeKey<>(OF13, Match.class)));
+        Assert.assertTrue("Wrong - unregister serializer",
+                serReg.unregisterSerializer(new MessageTypeKey<>(OF13, Match.class)));
 
         serReg.registerSerializer(new MessageTypeKey<>(OF13, Match.class), new OF13MatchSerializer());
-        Assert.assertFalse("Wrong - unregister serializer",serReg.unregisterSerializer(new MessageTypeKey<>(OF10, Match.class)));
+        Assert.assertFalse("Wrong - unregister serializer",
+                serReg.unregisterSerializer(new MessageTypeKey<>(OF10, Match.class)));
     }
 }
index 45a4fc94cc4a907a1691c9bf288e33853fd32e07..d9a18c31a3624926efc859c1baf154081ce6af34 100644 (file)
@@ -8,10 +8,8 @@
 package org.opendaylight.openflowjava.protocol.impl.serialization.action;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,8 +34,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
 
 /**
- * @author madamjak
+ * Unit tests for OF13SetFieldActionSerializer.
  *
+ * @author madamjak
  */
 public class OF13SetFieldActionSerializerTest {
 
@@ -45,7 +44,7 @@ public class OF13SetFieldActionSerializerTest {
     @Mock OFSerializer<MatchEntry> serializerMock;
 
     /**
-     * Initialize registry and mock
+     * Initialize registry and mock.
      */
     @Before
     public void startUp() {
@@ -55,13 +54,14 @@ public class OF13SetFieldActionSerializerTest {
     }
 
     /**
-     * Test identify ExperimenterClass serializer
+     * Test identify ExperimenterClass serializer.
      */
     @Test
-    public void test(){
+    public void test() {
         OF13SetFieldActionSerializer ser = new OF13SetFieldActionSerializer();
         ser.injectSerializerRegistry(registry);
-        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping.ActionBuilder actionBuilder = new ActionBuilder();
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping
+            .ActionBuilder actionBuilder = new ActionBuilder();
         long experimenterId = 12L;
         ExperimenterIdCaseBuilder expCaseBuilder = new ExperimenterIdCaseBuilder();
         ExperimenterBuilder expBuilder = new ExperimenterBuilder();
@@ -85,7 +85,8 @@ public class OF13SetFieldActionSerializerTest {
         registry.registerSerializer(key, serializerMock);
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         ser.serialize(actionBuilder.build(), out);
-        Mockito.verify(serializerMock, Mockito.times(1)).serialize((MatchEntry)Mockito.anyObject(), (ByteBuf)Mockito.anyObject());
+        Mockito.verify(serializerMock, Mockito.times(1)).serialize((MatchEntry)Mockito.anyObject(),
+                (ByteBuf)Mockito.anyObject());
         int lenght = out.readableBytes();
         Assert.assertEquals("Wrong - bad field code", ActionConstants.SET_FIELD_CODE, out.readUnsignedShort());
         Assert.assertEquals("Wrong - bad lenght", lenght, out.readUnsignedShort());
index ce94f426a606be54d566844e1c58afbc56caae6f..ea90453aa5da90f3eebbe1bcd254c72e482daa28 100644 (file)
@@ -33,8 +33,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.experimenter._case.MultipartRequestExperimenterBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestExperimenter.
  *
+ * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MultipartRequestExperimenterTest {
@@ -45,20 +46,19 @@ public class MultipartRequestExperimenterTest {
     @Mock ExperimenterDataOfChoice vendorData;
 
     /**
-     * Testing OF10StatsRequestInputFactory (Experimenter) for correct serialization
-     * @throws Exception
+     * Testing OF10StatsRequestInputFactory (Experimenter) for correct serialization.
      */
     @Test
     public void testExperimenter() throws Exception {
-        Mockito.when(mockRegistry.getSerializer(Matchers.<ExperimenterIdTypeSerializerKey<ExperimenterDataOfChoice>>any()))
-            .thenReturn(serializer);
+        Mockito.when(mockRegistry.getSerializer(
+                Matchers.<ExperimenterIdTypeSerializerKey<ExperimenterDataOfChoice>>any())).thenReturn(serializer);
         MultipartRequestInputFactory multipartFactory = new MultipartRequestInputFactory();
         multipartFactory.injectSerializerRegistry(mockRegistry);
         MultipartRequestInputBuilder builder = new MultipartRequestInputBuilder();
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setType(MultipartType.OFPMPEXPERIMENTER);
         builder.setFlags(new MultipartRequestFlags(false));
-        MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder();
+        final MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder();
         MultipartRequestExperimenterBuilder expBuilder = new MultipartRequestExperimenterBuilder();
         expBuilder.setExperimenter(new ExperimenterId(42L));
         expBuilder.setExpType(21L);
@@ -75,4 +75,4 @@ public class MultipartRequestExperimenterTest {
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         Mockito.verify(serializer, Mockito.times(1)).serialize(vendorData, out);
     }
-}
\ No newline at end of file
+}
index 08b46cd10bb29aabc7dbb5983bd7cb141b6bec93..4fd18fe5778a542312b444ab0b430e2430641759 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +28,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group.desc._case.MultipartRequestGroupDescBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestGroupDesc.
  *
+ * @author michal.polkorab
  */
 public class MultipartRequestGroupDescTest {
 
@@ -38,7 +38,7 @@ public class MultipartRequestGroupDescTest {
     private OFSerializer<MultipartRequestInput> multipartFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -49,8 +49,7 @@ public class MultipartRequestGroupDescTest {
     }
 
     /**
-     * Tests {@link MultipartRequestInputFactory} - GroupDesc case
-     * @throws Exception
+     * Tests {@link MultipartRequestInputFactory} - GroupDesc case.
      */
     @Test
     public void test() throws Exception {
@@ -74,4 +73,4 @@ public class MultipartRequestGroupDescTest {
         out.skipBytes(4); // skip padding
         Assert.assertTrue("Unexpected data", out.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
index d619b0f3e2d6aed7c60c77acf8e2b7d61dac889b..2cd9b7bbf1659d3fda610633d4b9dd8d727ca284 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +28,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.group.features._case.MultipartRequestGroupFeaturesBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestGroupFeatures.
  *
+ * @author michal.polkorab
  */
 public class MultipartRequestGroupFeaturesTest {
 
@@ -38,7 +38,7 @@ public class MultipartRequestGroupFeaturesTest {
     private OFSerializer<MultipartRequestInput> multipartFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -49,8 +49,7 @@ public class MultipartRequestGroupFeaturesTest {
     }
 
     /**
-     * Tests {@link MultipartRequestInputFactory} - GroupFeatures case
-     * @throws Exception
+     * Tests {@link MultipartRequestInputFactory} - GroupFeatures case.
      */
     @Test
     public void test() throws Exception {
@@ -74,4 +73,4 @@ public class MultipartRequestGroupFeaturesTest {
         out.skipBytes(4); // skip padding
         Assert.assertTrue("Unexpected data", out.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
index 6c7030e4dcc569779bbcac33c36bf299b6d433a3..84143f1dffa41960e38bacfed81e8ed17e95a197 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +28,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.meter.features._case.MultipartRequestMeterFeaturesBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestMeterFeatures.
  *
+ * @author michal.polkorab
  */
 public class MultipartRequestMeterFeaturesTest {
 
@@ -38,7 +38,7 @@ public class MultipartRequestMeterFeaturesTest {
     private OFSerializer<MultipartRequestInput> multipartFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -49,8 +49,7 @@ public class MultipartRequestMeterFeaturesTest {
     }
 
     /**
-     * Tests {@link MultipartRequestInputFactory} - MeterFeatures case
-     * @throws Exception
+     * Tests {@link MultipartRequestInputFactory} - MeterFeatures case.
      */
     @Test
     public void test() throws Exception {
@@ -74,4 +73,4 @@ public class MultipartRequestMeterFeaturesTest {
         out.skipBytes(4); // skip padding
         Assert.assertTrue("Unexpected data", out.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
index 5adda0a86c1edd7a18bd69f3848fcb4036fc41e8..516202122154675616dd1a53a2d49d40e79c162f 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +28,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.port.desc._case.MultipartRequestPortDescBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestPortDesc.
  *
+ * @author michal.polkorab
  */
 public class MultipartRequestPortDescTest {
 
@@ -38,7 +38,7 @@ public class MultipartRequestPortDescTest {
     private OFSerializer<MultipartRequestInput> multipartFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -49,8 +49,7 @@ public class MultipartRequestPortDescTest {
     }
 
     /**
-     * Tests {@link MultipartRequestInputFactory} - PortDesc case
-     * @throws Exception
+     * Tests {@link MultipartRequestInputFactory} - PortDesc case.
      */
     @Test
     public void test() throws Exception {
@@ -74,4 +73,4 @@ public class MultipartRequestPortDescTest {
         out.skipBytes(4); // skip padding
         Assert.assertTrue("Unexpected data", out.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
index 48695a8cb37c7df15dad69ada27a754a9d9e5c92..c7fa7e02004b130dcc422181377b588b9dfdbfee 100644 (file)
@@ -9,11 +9,9 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -76,8 +74,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.table.features.properties.grouping.TableFeaturePropertiesBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestTableFeatures.
  *
+ * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
 public class MultipartRequestTableFeaturesTest {
@@ -91,12 +90,11 @@ public class MultipartRequestTableFeaturesTest {
     @Mock OFSerializer<TableFeatureProperties> serializer;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
-        Mockito.when(mockRegistry.getSerializer((MessageTypeKey<?>)Matchers.any()))
-        .thenReturn(serializer);
+        Mockito.when(mockRegistry.getSerializer((MessageTypeKey<?>)Matchers.any())).thenReturn(serializer);
         registry = new SerializerRegistryImpl();
         registry.init();
         multipartFactory = registry.getSerializer(
@@ -104,8 +102,7 @@ public class MultipartRequestTableFeaturesTest {
     }
 
     /**
-     * @throws Exception
-     * Testing of {@link MultipartRequestInputFactory} for correct translation from POJO
+     * Testing of {@link MultipartRequestInputFactory} for correct translation from POJO.
      */
     @Test
     public void testMultipartRequestTableFeaturesMessageFactory() throws Exception {
@@ -113,17 +110,17 @@ public class MultipartRequestTableFeaturesTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setType(MultipartType.forValue(12));
         builder.setFlags(new MultipartRequestFlags(true));
-        MultipartRequestTableFeaturesCaseBuilder caseBuilder = new MultipartRequestTableFeaturesCaseBuilder();
-        MultipartRequestTableFeaturesBuilder featuresBuilder = new MultipartRequestTableFeaturesBuilder();
-        List<TableFeatures> tableFeaturesList = new ArrayList<>();
+        final MultipartRequestTableFeaturesCaseBuilder caseBuilder = new MultipartRequestTableFeaturesCaseBuilder();
+        final MultipartRequestTableFeaturesBuilder featuresBuilder = new MultipartRequestTableFeaturesBuilder();
         TableFeaturesBuilder tableFeaturesBuilder = new TableFeaturesBuilder();
         tableFeaturesBuilder.setTableId((short) 8);
         tableFeaturesBuilder.setName("AAAABBBBCCCCDDDDEEEEFFFFGGGG");
-        tableFeaturesBuilder.setMetadataMatch(new BigInteger(new byte[] {0x00, 0x01, 0x02, 0x03, 0x01, 0x04, 0x08, 0x01}));
-        tableFeaturesBuilder.setMetadataWrite(new BigInteger(new byte[] {0x00, 0x07, 0x01, 0x05, 0x01, 0x00, 0x03, 0x01}));
+        tableFeaturesBuilder.setMetadataMatch(new BigInteger(
+                new byte[] {0x00, 0x01, 0x02, 0x03, 0x01, 0x04, 0x08, 0x01}));
+        tableFeaturesBuilder.setMetadataWrite(new BigInteger(
+                new byte[] {0x00, 0x07, 0x01, 0x05, 0x01, 0x00, 0x03, 0x01}));
         tableFeaturesBuilder.setConfig(new TableConfig(true));
         tableFeaturesBuilder.setMaxEntries(65L);
-        List<TableFeatureProperties> properties = new ArrayList<>();
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLES);
         NextTableRelatedTableFeaturePropertyBuilder nextPropBuilder =
@@ -133,6 +130,7 @@ public class MultipartRequestTableFeaturesTest {
         nextIds.add(new NextTableIdsBuilder().setTableId((short) 2).build());
         nextPropBuilder.setNextTableIds(nextIds);
         propBuilder.addAugmentation(NextTableRelatedTableFeatureProperty.class, nextPropBuilder.build());
+        List<TableFeatureProperties> properties = new ArrayList<>();
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTNEXTTABLESMISS);
@@ -143,8 +141,6 @@ public class MultipartRequestTableFeaturesTest {
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTINSTRUCTIONS);
-        InstructionRelatedTableFeaturePropertyBuilder insPropBuilder =
-                new InstructionRelatedTableFeaturePropertyBuilder();
         List<Instruction> insIds = new ArrayList<>();
         InstructionBuilder insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new WriteActionsCaseBuilder().build());
@@ -152,6 +148,8 @@ public class MultipartRequestTableFeaturesTest {
         insBuilder = new InstructionBuilder();
         insBuilder.setInstructionChoice(new GotoTableCaseBuilder().build());
         insIds.add(insBuilder.build());
+        InstructionRelatedTableFeaturePropertyBuilder insPropBuilder =
+                new InstructionRelatedTableFeaturePropertyBuilder();
         insPropBuilder.setInstruction(insIds);
         propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
         properties.add(propBuilder.build());
@@ -178,12 +176,15 @@ public class MultipartRequestTableFeaturesTest {
         propBuilder.addAugmentation(InstructionRelatedTableFeatureProperty.class, insPropBuilder.build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
+        List<TableFeatures> tableFeaturesList = new ArrayList<>();
         tableFeaturesList.add(tableFeaturesBuilder.build());
         tableFeaturesBuilder = new TableFeaturesBuilder();
         tableFeaturesBuilder.setTableId((short) 8);
         tableFeaturesBuilder.setName("AAAABBBBCCCCDDDDEEEEFFFFGGGG");
-        tableFeaturesBuilder.setMetadataMatch(new BigInteger(new byte[] {0x00, 0x01, 0x02, 0x03, 0x01, 0x04, 0x08, 0x01}));
-        tableFeaturesBuilder.setMetadataWrite(new BigInteger(new byte[] {0x00, 0x07, 0x01, 0x05, 0x01, 0x00, 0x03, 0x01}));
+        tableFeaturesBuilder.setMetadataMatch(new BigInteger(
+                new byte[] {0x00, 0x01, 0x02, 0x03, 0x01, 0x04, 0x08, 0x01}));
+        tableFeaturesBuilder.setMetadataWrite(new BigInteger(
+                new byte[] {0x00, 0x07, 0x01, 0x05, 0x01, 0x00, 0x03, 0x01}));
         tableFeaturesBuilder.setConfig(new TableConfig(true));
         tableFeaturesBuilder.setMaxEntries(67L);
         properties = new ArrayList<>();
@@ -220,18 +221,18 @@ public class MultipartRequestTableFeaturesTest {
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTMATCH);
-        OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
-        List<MatchEntry> entries = new ArrayList<>();
         MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
         entriesBuilder.setOxmMatchField(InPhyPort.class);
         entriesBuilder.setHasMask(false);
+        List<MatchEntry> entries = new ArrayList<>();
         entries.add(entriesBuilder.build());
         entriesBuilder = new MatchEntryBuilder();
         entriesBuilder.setOxmClass(OpenflowBasicClass.class);
         entriesBuilder.setOxmMatchField(InPort.class);
         entriesBuilder.setHasMask(false);
         entries.add(entriesBuilder.build());
+        OxmRelatedTableFeaturePropertyBuilder oxmBuilder = new OxmRelatedTableFeaturePropertyBuilder();
         oxmBuilder.setMatchEntry(entries);
         propBuilder.addAugmentation(OxmRelatedTableFeatureProperty.class, oxmBuilder.build());
         properties.add(propBuilder.build());
@@ -398,8 +399,7 @@ public class MultipartRequestTableFeaturesTest {
     }
 
     /**
-     * @throws Exception
-     * Testing of {@link MultipartRequestInputFactory} for correct translation from POJO
+     * Testing of {@link MultipartRequestInputFactory} for correct translation from POJO.
      */
     @Test
     public void testMultipartRequestTableFeaturesExperimenter() throws Exception {
@@ -409,22 +409,21 @@ public class MultipartRequestTableFeaturesTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setType(MultipartType.forValue(12));
         builder.setFlags(new MultipartRequestFlags(true));
-        MultipartRequestTableFeaturesCaseBuilder caseBuilder = new MultipartRequestTableFeaturesCaseBuilder();
-        MultipartRequestTableFeaturesBuilder featuresBuilder = new MultipartRequestTableFeaturesBuilder();
-        List<TableFeatures> tableFeaturesList = new ArrayList<>();
         TableFeaturesBuilder tableFeaturesBuilder = new TableFeaturesBuilder();
         tableFeaturesBuilder.setTableId((short) 8);
         tableFeaturesBuilder.setName("AAAABBBBCCCCDDDDEEEEFFFFGGGG");
-        tableFeaturesBuilder.setMetadataMatch(new BigInteger(new byte[] {0x00, 0x01, 0x02, 0x03, 0x01, 0x04, 0x08, 0x01}));
-        tableFeaturesBuilder.setMetadataWrite(new BigInteger(new byte[] {0x00, 0x07, 0x01, 0x05, 0x01, 0x00, 0x03, 0x01}));
+        tableFeaturesBuilder.setMetadataMatch(new BigInteger(
+                new byte[] {0x00, 0x01, 0x02, 0x03, 0x01, 0x04, 0x08, 0x01}));
+        tableFeaturesBuilder.setMetadataWrite(new BigInteger(
+                new byte[] {0x00, 0x07, 0x01, 0x05, 0x01, 0x00, 0x03, 0x01}));
         tableFeaturesBuilder.setConfig(new TableConfig(true));
         tableFeaturesBuilder.setMaxEntries(65L);
-        List<TableFeatureProperties> properties = new ArrayList<>();
         TableFeaturePropertiesBuilder propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTEXPERIMENTER);
         ExperimenterIdTableFeaturePropertyBuilder expBuilder = new ExperimenterIdTableFeaturePropertyBuilder();
         expBuilder.setExperimenter(new ExperimenterId(42L));
         propBuilder.addAugmentation(ExperimenterIdTableFeatureProperty.class, expBuilder.build());
+        List<TableFeatureProperties> properties = new ArrayList<>();
         properties.add(propBuilder.build());
         propBuilder = new TableFeaturePropertiesBuilder();
         propBuilder.setType(TableFeaturesPropType.OFPTFPTEXPERIMENTERMISS);
@@ -433,8 +432,11 @@ public class MultipartRequestTableFeaturesTest {
         propBuilder.addAugmentation(ExperimenterIdTableFeatureProperty.class, expBuilder.build());
         properties.add(propBuilder.build());
         tableFeaturesBuilder.setTableFeatureProperties(properties);
+        List<TableFeatures> tableFeaturesList = new ArrayList<>();
         tableFeaturesList.add(tableFeaturesBuilder.build());
+        MultipartRequestTableFeaturesBuilder featuresBuilder = new MultipartRequestTableFeaturesBuilder();
         featuresBuilder.setTableFeatures(tableFeaturesList);
+        MultipartRequestTableFeaturesCaseBuilder caseBuilder = new MultipartRequestTableFeaturesCaseBuilder();
         caseBuilder.setMultipartRequestTableFeatures(featuresBuilder.build());
         builder.setMultipartRequestBody(caseBuilder.build());
         MultipartRequestInput message = builder.build();
@@ -464,4 +466,4 @@ public class MultipartRequestTableFeaturesTest {
         Mockito.verify(serializer, Mockito.times(2)).serialize(Matchers.any(TableFeatureProperties.class),
                 Matchers.any(ByteBuf.class));
     }
-}
\ No newline at end of file
+}
index 8fe0896762fd9d71b342945a2fba9248073ef7c3..ce0c81a8606102404ed7f519dae253cd945a3f0e 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -29,8 +28,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table._case.MultipartRequestTableBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for MultipartRequestTable.
  *
+ * @author michal.polkorab
  */
 public class MultipartRequestTableTest {
 
@@ -38,7 +38,7 @@ public class MultipartRequestTableTest {
     private OFSerializer<MultipartRequestInput> multipartFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -49,8 +49,7 @@ public class MultipartRequestTableTest {
     }
 
     /**
-     * Tests {@link MultipartRequestInputFactory} - Table case
-     * @throws Exception
+     * Tests {@link MultipartRequestInputFactory} - Table case.
      */
     @Test
     public void test() throws Exception {
@@ -74,4 +73,4 @@ public class MultipartRequestTableTest {
         out.skipBytes(4); // skip padding
         Assert.assertTrue("Unexpected data", out.readableBytes() == 0);
     }
-}
\ No newline at end of file
+}
index 4810663478c5a03e204459fd0373d7dcb0394d2a..cdebccecb933fcff695e91c81a52242b0b78244c 100644 (file)
@@ -10,7 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.factories.mult
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -33,8 +32,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.aggregate._case.MultipartRequestAggregateBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OF10StatsRequestAggregate.
  *
+ * @author michal.polkorab
  */
 public class OF10StatsRequestAggregateTest {
 
@@ -42,7 +42,7 @@ public class OF10StatsRequestAggregateTest {
     private OFSerializer<MultipartRequestInput> statsFactory;
 
     /**
-     * Initializes serializer registry and stores correct factory in field
+     * Initializes serializer registry and stores correct factory in field.
      */
     @Before
     public void startUp() {
@@ -53,8 +53,7 @@ public class OF10StatsRequestAggregateTest {
     }
 
     /**
-     * Tests {@link OF10StatsRequestInputFactory} for correct serialization
-     * @throws Exception
+     * Tests {@link OF10StatsRequestInputFactory} for correct serialization.
      */
     @Test
     public void test() throws Exception {
@@ -62,8 +61,8 @@ public class OF10StatsRequestAggregateTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
         builder.setType(MultipartType.OFPMPAGGREGATE);
         builder.setFlags(new MultipartRequestFlags(false));
-        MultipartRequestAggregateCaseBuilder caseBuilder = new MultipartRequestAggregateCaseBuilder();
-        MultipartRequestAggregateBuilder aggBuilder = new MultipartRequestAggregateBuilder();
+        final MultipartRequestAggregateCaseBuilder caseBuilder = new MultipartRequestAggregateCaseBuilder();
+        final MultipartRequestAggregateBuilder aggBuilder = new MultipartRequestAggregateBuilder();
         MatchV10Builder matchBuilder = new MatchV10Builder();
         matchBuilder.setWildcards(new FlowWildcardsV10(true, true, true, true, true, true,
                 true, true, true, true));
index 15430aa6db14b5714d21c1b761a7b6e81d3a056e..c22ab9a066ed20334a957f99df5375890855ed73 100644 (file)
@@ -33,8 +33,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.experimenter._case.MultipartRequestExperimenterBuilder;
 
 /**
- * @author michal.polkorab
+ * Unit tests for OF10StatsRequestExperimenter.
  *
+ * @author michal.polkorab
  */
 @RunWith(MockitoJUnitRunner.class)
 public class OF10StatsRequestExperimenterTest {
@@ -45,20 +46,19 @@ public class OF10StatsRequestExperimenterTest {
     private ExperimenterDataOfChoice vendorData;
 
     /**
-     * Testing OF10StatsRequestInputFactory (Experimenter) for correct serialization
-     * @throws Exception
+     * Testing OF10StatsRequestInputFactory (Experimenter) for correct serialization.
      */
     @Test
     public void testExperimenter() throws Exception {
-        Mockito.when(mockRegistry.getSerializer(Matchers.<ExperimenterIdTypeSerializerKey<ExperimenterDataOfChoice>>any()))
-            .thenReturn(serializer);
+        Mockito.when(mockRegistry.getSerializer(
+                Matchers.<ExperimenterIdTypeSerializerKey<ExperimenterDataOfChoice>>any())).thenReturn(serializer);
         OF10StatsRequestInputFactory multipartFactory = new OF10StatsRequestInputFactory();
         multipartFactory.injectSerializerRegistry(mockRegistry);
         MultipartRequestInputBuilder builder = new MultipartRequestInputBuilder();
         BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);
         builder.setType(MultipartType.OFPMPEXPERIMENTER);
         builder.setFlags(new MultipartRequestFlags(false));
-        MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder();
+        final MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder();
         MultipartRequestExperimenterBuilder expBuilder = new MultipartRequestExperimenterBuilder();
         expBuilder.setExperimenter(new ExperimenterId(42L));
         expBuilder.setExpType(21L);
@@ -75,4 +75,4 @@ public class OF10StatsRequestExperimenterTest {
         Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());
         Mockito.verify(serializer, Mockito.times(1)).serialize(vendorData, out);
     }
-}
\ No newline at end of file
+}
index 6f2f772cbb62d170b38a42b4329ca9b52e2ddf7e..7521bc111b5555e525a90b7d1a94a3674993514b 100644 (file)
@@ -15,9 +15,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * General tests for StatisticsCounters class
- * @author madamjak
+ * General tests for StatisticsCounters class.
  *
+ * @author madamjak
  */
 public class StatisticsCountersTest {
 
@@ -25,78 +25,86 @@ public class StatisticsCountersTest {
     private StatisticsCounters statCounters;
 
     /**
-     * Initialize StatisticsCounters before each test, reset counters
+     * Initialize StatisticsCounters before each test, reset counters.
      */
     @Before
-    public void initTest(){
+    public void initTest() {
         statCounters = StatisticsCounters.getInstance();
         statCounters.startCounting(false, 0);
     }
 
     /**
-     * Stop counting after each test
+     * Stop counting after each test.
      */
     @After
-    public void tierDown(){
+    public void tierDown() {
         statCounters.stopCounting();
     }
 
     /**
-     * Basic test of increment and reset counters
+     * Basic test of increment and reset counters.
      */
     @Test
     public void testCounterAll() {
         int testCount = 4;
-        for(CounterEventTypes cet : CounterEventTypes.values()){
-            if(statCounters.isCounterEnabled(cet)){
-                incrementCounter(cet,testCount);
-                Assert.assertEquals("Wrong - bad counter value " + cet, testCount, statCounters.getCounter(cet).getCounterValue());
+        for (CounterEventTypes cet : CounterEventTypes.values()) {
+            if (statCounters.isCounterEnabled(cet)) {
+                incrementCounter(cet, testCount);
+                Assert.assertEquals("Wrong - bad counter value " + cet, testCount,
+                        statCounters.getCounter(cet).getCounterValue());
             } else {
                 Assert.assertNull("Wrong - not enabled counter give not null value", statCounters.getCounter(cet));
             }
-
         }
         statCounters.resetCounters();
-        for(CounterEventTypes cet : CounterEventTypes.values()){
-            if(statCounters.isCounterEnabled(cet)){
-                Assert.assertEquals("Wrong - bad counter value after reset " + cet, 0, statCounters.getCounter(cet).getCounterValue());
+        for (CounterEventTypes cet : CounterEventTypes.values()) {
+            if (statCounters.isCounterEnabled(cet)) {
+                Assert.assertEquals("Wrong - bad counter value after reset " + cet, 0,
+                        statCounters.getCounter(cet).getCounterValue());
             }
         }
     }
 
     /**
-     * Test to store current and last read value of counter (at least one counter has to be enabled)
+     * Test to store current and last read value of counter (at least one counter has to be enabled).
      */
     @Test
     public void testCounterLastRead() {
         int testCount = 4;
         CounterEventTypes firstEnabledCET = null;
-        for(CounterEventTypes  cet : CounterEventTypes.values()){
-            if(statCounters.isCounterEnabled(cet)){
+        for (CounterEventTypes cet : CounterEventTypes.values()) {
+            if (statCounters.isCounterEnabled(cet)) {
                 firstEnabledCET = cet;
                 break;
             }
         }
-        if(firstEnabledCET == null){
+        if (firstEnabledCET == null) {
             Assert.fail("No counter is enabled");
         }
-        incrementCounter(firstEnabledCET,testCount);
+        incrementCounter(firstEnabledCET, testCount);
         LOG.debug("Waiting to process event queue");
-        Assert.assertEquals("Wrong - bad last read value.", 0,statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
-        Assert.assertEquals("Wrong - bad value", testCount,statCounters.getCounter(firstEnabledCET).getCounterValue(false));
-        Assert.assertEquals("Wrong - bad last read value.", 0,statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
-        Assert.assertEquals("Wrong - bad last read value.", testCount,statCounters.getCounter(firstEnabledCET).getCounterValue());
-        Assert.assertEquals("Wrong - bad last read value.", testCount,statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
-        incrementCounter(firstEnabledCET,testCount);
-        Assert.assertEquals("Wrong - bad last read value.", testCount,statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
-        Assert.assertEquals("Wrong - bad last read value.", 2*testCount,statCounters.getCounter(firstEnabledCET).getCounterValue());
+        Assert.assertEquals("Wrong - bad last read value.", 0,
+                statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
+        Assert.assertEquals("Wrong - bad value", testCount,
+                statCounters.getCounter(firstEnabledCET).getCounterValue(false));
+        Assert.assertEquals("Wrong - bad last read value.", 0,
+                statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
+        Assert.assertEquals("Wrong - bad last read value.", testCount,
+                statCounters.getCounter(firstEnabledCET).getCounterValue());
+        Assert.assertEquals("Wrong - bad last read value.", testCount,
+                statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
+        incrementCounter(firstEnabledCET, testCount);
+        Assert.assertEquals("Wrong - bad last read value.", testCount,
+                statCounters.getCounter(firstEnabledCET).getCounterLastReadValue());
+        Assert.assertEquals("Wrong - bad last read value.", 2 * testCount,
+                statCounters.getCounter(firstEnabledCET).getCounterValue());
     }
 
     /**
-     * Test start and stop log reporter
+     * Test start and stop log reporter.
      */
     @Test
-    public void testStartStopLogReporter(){
+    public void testStartStopLogReporter() {
         int testDelay = 10000;
         statCounters.startLogReport(testDelay);
         Assert.assertTrue("Wrong - logRepoter is not running", statCounters.isRunLogReport());
@@ -105,32 +113,33 @@ public class StatisticsCountersTest {
         Assert.assertFalse("Wrong - logRepoter is running", statCounters.isRunLogReport());
         statCounters.startLogReport(StatisticsCounters.MINIMAL_LOG_REPORT_PERIOD / 2);
         Assert.assertTrue("Wrong - logRepoter is not running", statCounters.isRunLogReport());
-        Assert.assertEquals("Wrong - bad logReportPeriod", StatisticsCounters.MINIMAL_LOG_REPORT_PERIOD, statCounters.getLogReportPeriod());
+        Assert.assertEquals("Wrong - bad logReportPeriod",
+                StatisticsCounters.MINIMAL_LOG_REPORT_PERIOD, statCounters.getLogReportPeriod());
         statCounters.stopCounting();
         Assert.assertFalse("Wrong - logRepoter is running", statCounters.isRunLogReport());
     }
 
     /**
-     * Test start log report with bad logReportDealy
+     * Test start log report with bad logReportDealy.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testLogReportBadPeriod(){
+    public void testLogReportBadPeriod() {
         statCounters.startLogReport(0);
     }
 
     /**
-     * Test to get counter with null key
+     * Test to get counter with null key.
      */
     @Test(expected = IllegalArgumentException.class)
-    public void testGetCounterbyNull(){
+    public void testGetCounterbyNull() {
         statCounters.getCounter(null);
     }
 
-    private void incrementCounter(CounterEventTypes cet, int count){
-        if(!statCounters.isCounterEnabled(cet)){
+    private void incrementCounter(CounterEventTypes cet, int count) {
+        if (!statCounters.isCounterEnabled(cet)) {
             return;
         }
-        for(int i = 0; i< count; i++){
+        for (int i = 0; i < count; i++) {
             statCounters.incrementCounter(cet);
         }
     }