Merge "Rework bit-copying functions and re-enable tests"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / action / PopMplsActionDeserializerTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java
index b25ed21f47ad1e4a24e755d3b8408b0ed0b6cf4b..bfa103a553bb7384b523b6c9a1711a204461b064 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/action/PopMplsActionDeserializerTest.java
@@ -30,9 +30,9 @@ public class PopMplsActionDeserializerTest extends AbstractActionDeserializerTes
         in.writeZero(ActionConstants.ETHERTYPE_ACTION_PADDING);
 
         final Action action = deserializeAction(in);
-        assertTrue(PopMplsActionCase.class.isInstance(action));
+        assertTrue(action instanceof PopMplsActionCase);
 
-        final PopMplsAction popAction = PopMplsActionCase.class.cast(action).getPopMplsAction();
+        final PopMplsAction popAction = ((PopMplsActionCase) action).getPopMplsAction();
         assertEquals(ethType, popAction.getEthernetType().shortValue());
         assertEquals(0, in.readableBytes());
     }