Bug 2065 - Unset fields in MeterStatsResponseConvertor

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / translator / MultipartReplyTranslatorFifthTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java
index 2c51a19248fbb321fb4bb9a0c06c2b3412e9368b..d625aa38e1a902b54c5ce22159caa041c992d366 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/translator/MultipartReplyTranslatorFifthTest.java
@@ -13,16 +13,15 @@ import static org.mockito.Mockito.when;
 import java.math.BigInteger;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
-\r
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
 import org.mockito.Mock;\r
 import org.mockito.MockitoAnnotations;\r
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
+import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;\r
 import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;\r
-import org.opendaylight.openflowplugin.openflow.md.core.ConnectionConductor;\r
-import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContext;\r
+import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterConfigStatsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.MeterStatisticsUpdated;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats;\r
@@ -56,14 +55,17 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 \r
 /**\r
  * @author michal.polkorab\r
- *\r
  */\r
 public class MultipartReplyTranslatorFifthTest {\r
 \r
-    @Mock SwitchConnectionDistinguisher cookie;\r
-    @Mock SessionContext sc;\r
-    @Mock ConnectionConductor conductor;\r
-    @Mock GetFeaturesOutput features;\r
+    @Mock\r
+    SwitchConnectionDistinguisher cookie;\r
+    @Mock\r
+    SessionContext sc;\r
+    @Mock\r
+    ConnectionConductor conductor;\r
+    @Mock\r
+    GetFeaturesOutput features;\r
 \r
     MultipartReplyTranslator translator = new MultipartReplyTranslator();\r
 \r
@@ -98,7 +100,7 @@ public class MultipartReplyTranslatorFifthTest {
         caseBuilder.setMultipartReplyMeter(meterBuilder.build());\r
         mpBuilder.setMultipartReplyBody(caseBuilder.build());\r
         MultipartReplyMessage message = mpBuilder.build();\r
-        \r
+\r
         List<DataObject> list = translator.translate(cookie, sc, message);\r
 \r
         Assert.assertEquals("Wrong list size", 1, list.size());\r
@@ -156,7 +158,7 @@ public class MultipartReplyTranslatorFifthTest {
         caseBuilder.setMultipartReplyMeter(meterBuilder.build());\r
         mpBuilder.setMultipartReplyBody(caseBuilder.build());\r
         MultipartReplyMessage message = mpBuilder.build();\r
-        \r
+\r
         List<DataObject> list = translator.translate(cookie, sc, message);\r
 \r
         Assert.assertEquals("Wrong list size", 1, list.size());\r
@@ -166,7 +168,7 @@ public class MultipartReplyTranslatorFifthTest {
         Assert.assertEquals("Wrong transaction-id", 123, statUpdate.getTransactionId().getValue().intValue());\r
         Assert.assertEquals("Wrong group stats size", 2, statUpdate.getMeterStats().size());\r
         org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply\r
-        .MeterStats stat = statUpdate.getMeterStats().get(0);\r
+                .MeterStats stat = statUpdate.getMeterStats().get(0);\r
         Assert.assertEquals("Wrong meter-id", 15, stat.getMeterId().getValue().intValue());\r
         Assert.assertEquals("Wrong flow count", 16, stat.getFlowCount().getValue().intValue());\r
         Assert.assertEquals("Wrong packet in count", 17, stat.getPacketInCount().getValue().intValue());\r
@@ -215,7 +217,7 @@ public class MultipartReplyTranslatorFifthTest {
         caseBuilder.setMultipartReplyMeterConfig(meterBuilder.build());\r
         mpBuilder.setMultipartReplyBody(caseBuilder.build());\r
         MultipartReplyMessage message = mpBuilder.build();\r
-        \r
+\r
         List<DataObject> list = translator.translate(cookie, sc, message);\r
 \r
         Assert.assertEquals("Wrong list size", 1, list.size());\r
@@ -276,7 +278,7 @@ public class MultipartReplyTranslatorFifthTest {
         caseBuilder.setMultipartReplyMeterConfig(meterBuilder.build());\r
         mpBuilder.setMultipartReplyBody(caseBuilder.build());\r
         MultipartReplyMessage message = mpBuilder.build();\r
-        \r
+\r
         List<DataObject> list = translator.translate(cookie, sc, message);\r
 \r
         Assert.assertEquals("Wrong list size", 1, list.size());\r
@@ -286,11 +288,10 @@ public class MultipartReplyTranslatorFifthTest {
         Assert.assertEquals("Wrong transaction-id", 123, statUpdate.getTransactionId().getValue().intValue());\r
         Assert.assertEquals("Wrong meter config stats size", 2, statUpdate.getMeterConfigStats().size());\r
         MeterConfigStats stat = statUpdate.getMeterConfigStats().get(0);\r
-        // TODO: fix implementation - add flags creation\r
-//        Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterBurst());\r
-//        Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterPktps());\r
-//        Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterKbps());\r
-//        Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterStats());\r
+        Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterBurst());\r
+        Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterPktps());\r
+        Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterKbps());\r
+        Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterStats());\r
         Assert.assertEquals("Wrong meter-id", 20, stat.getMeterId().getValue().intValue());\r
         Assert.assertEquals("Wrong bands size", 2, stat.getMeterBandHeaders().getMeterBandHeader().size());\r
         MeterBandHeader header = stat.getMeterBandHeaders().getMeterBandHeader().get(0);\r
@@ -310,11 +311,10 @@ public class MultipartReplyTranslatorFifthTest {
         Assert.assertEquals("Wrong flag", true, header.getMeterBandTypes().getFlags().isOfpmbtDscpRemark());\r
         Assert.assertEquals("Wrong flag", false, header.getMeterBandTypes().getFlags().isOfpmbtExperimenter());\r
         stat = statUpdate.getMeterConfigStats().get(1);\r
-        // TODO: fix implementation - add flags creation\r
-//      Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterBurst());\r
-//      Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterPktps());\r
-//      Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterKbps());\r
-//      Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterStats());\r
+        Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterBurst());\r
+        Assert.assertEquals("Wrong flag", true, stat.getFlags().isMeterPktps());\r
+        Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterKbps());\r
+        Assert.assertEquals("Wrong flag", false, stat.getFlags().isMeterStats());\r
         Assert.assertEquals("Wrong meter-id", 26, stat.getMeterId().getValue().intValue());\r
         Assert.assertEquals("Wrong bands size", 0, stat.getMeterBandHeaders().getMeterBandHeader().size());\r
     }\r