Make TCs to assert on actual values and remove toString asserts

Make assert on getValue insteadOf on toString values.

toString() method implementation change might break the ofp
TCs, to avoid these errors assert on actual values

Change-Id: I687ab07badca72f2f0489660ea5a8e0ebcaded07
Signed-off-by: D Arunprakash <d.arunprakash@ericsson.com>

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java
index f958975a0023b289a1249b9e10fafbe2a04096a5..2a66f3a0c2ec97323d8aecf3451e572560b5cee0 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/common/MultipartRequestInputFactoryTest.java
@@ -13,6 +13,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.MultipartRequestBody;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestAggregateCase;
@@ -37,6 +38,7 @@ 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.stats._case.MultipartRequestPortStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.queue._case.MultipartRequestQueue;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.table.features._case.MultipartRequestTableFeatures;
+import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 /**
  * Test for {@link MultipartRequestInputFactory}.
@@ -58,7 +60,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestDescCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(), MultipartRequestDescCase.class);
     }
 
     @Test
@@ -79,10 +81,7 @@ public class MultipartRequestInputFactoryTest {
         Assert.assertNotNull(mpRq.getMatch());
         Assert.assertNull(mpRq.getMatchV10());
 
-        final String EMPTY_MATCH_DUMP =
-                "Match{_type=class org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType, "
-                        + "augmentation=[]}";
-        Assert.assertEquals(EMPTY_MATCH_DUMP, String.valueOf(mpRq.getMatch()));
+        Assert.assertEquals(OxmMatchType.class, mpRq.getMatch().getType());
     }
 
     @Test
@@ -111,7 +110,8 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestAggregateCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+                MultipartRequestAggregateCase.class);
     }
 
     @Test
@@ -120,7 +120,7 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestTableCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(), MultipartRequestTableCase.class);
     }
 
     @Test
@@ -169,7 +169,8 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestGroupDescCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+                MultipartRequestGroupDescCase.class);
     }
 
     @Test
@@ -178,7 +179,8 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestGroupFeaturesCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+                MultipartRequestGroupFeaturesCase.class);
     }
 
     @Test
@@ -214,7 +216,8 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestMeterFeaturesCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+                MultipartRequestMeterFeaturesCase.class);
     }
 
     @Test
@@ -237,7 +240,8 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestPortDescCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+                MultipartRequestPortDescCase.class);
     }
 
     @Test
@@ -246,7 +250,8 @@ public class MultipartRequestInputFactoryTest {
         final MultipartRequestInput mpRqInput =
             (MultipartRequestInput) MultipartRequestInputFactory.makeMultipartRequest(xid, ofVersion, mpType, false);
         checkHeader(mpRqInput, mpType);
-        checkEmptyBody(mpRqInput.getMultipartRequestBody(), MultipartRequestExperimenterCase.class);
+        checkEmptyBody(mpRqInput.getMultipartRequestBody().getImplementedInterface(),
+                MultipartRequestExperimenterCase.class);
     }
 
     private void checkHeader(MultipartRequestInput mpRqInput, MultipartType mpType) {
@@ -256,10 +261,9 @@ public class MultipartRequestInputFactoryTest {
         Assert.assertEquals(xid, mpRqInput.getXid().longValue());
     }
 
-    private void checkEmptyBody(MultipartRequestBody mpRqBody, Class<? extends
+    private void checkEmptyBody(Class<? extends DataContainer> mpRqBody, Class<? extends
             MultipartRequestBody> expectedMpRqBodyClass) throws Exception {
-        Assert.assertTrue(expectedMpRqBodyClass.isAssignableFrom(mpRqBody.getImplementedInterface()));
-        final String expectedDump = expectedMpRqBodyClass.getSimpleName() + "{augmentation=[]}";
-        Assert.assertEquals(expectedDump, String.valueOf(mpRqBody));
+        Assert.assertTrue(expectedMpRqBodyClass.isAssignableFrom(mpRqBody));
+        Assert.assertEquals(expectedMpRqBodyClass, mpRqBody);
     }
 }

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
index 6cc91b4f91626d7dcdf45d2ea1a9f58aac43e901..b3a7bf6ef2a51b88589a010bbd09cfaa40faeb3d 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/PacketOutConvertorTest.java
@@ -158,7 +158,7 @@ public class PacketOutConvertorTest {
 
         final TransmitPacketInput transmitPacketInput = transmitPacketInputBuilder.build();
 
-        short version = (short) 0x04;
+        Short version = (short) 0x04;
         byte[] datapathIdByte = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];
         for (int i = 0; i < datapathIdByte.length; i++) {
             datapathIdByte[i] = 1;
@@ -171,19 +171,15 @@ public class PacketOutConvertorTest {
         data.setDatapathId(datapathId);
         PacketOutInput message = convert(transmitPacketInput, data);
 
-        Assert.assertEquals(transmitPacketInput.getBufferId(),
-                message.getBufferId());
-        Assert.assertEquals("PortNumber{_value=" + inPort + "}", message
-                .getInPort().toString());
-        Assert.assertEquals((Object) version,
-                Short.valueOf(message.getVersion()));
+        Assert.assertEquals(transmitPacketInput.getBufferId(), message.getBufferId());
+        Assert.assertEquals(Long.valueOf(inPort), message.getInPort().getValue());
+        Assert.assertEquals(version, message.getVersion());
         Assert.assertEquals(xid, message.getXid());
 
         ActionConvertorData actionConvertorData = new ActionConvertorData(version);
         actionConvertorData.setDatapathId(datapathId);
 
-        Optional<List<Action>> actionsOptional = convertorManager.convert(
-                actionList, actionConvertorData);
+        Optional<List<Action>> actionsOptional = convertorManager.convert(actionList, actionConvertorData);
 
         List<Action> actions = actionsOptional.orElse(Collections.emptyList());
         Assert.assertEquals(actions, message.getAction());