Remove EncodeConstants.SIZE_OF_{BYTE,SHORT,INT,LONG}_IN_BYTES

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / match / MetadataEntryDeserializerTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MetadataEntryDeserializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MetadataEntryDeserializerTest.java
index bc45a9104490a16042dd0b7cfbd33dc7c4a4d132..b2b9c33fa219ff84521df8f706502c1b27b09044 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MetadataEntryDeserializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/match/MetadataEntryDeserializerTest.java
@@ -5,37 +5,34 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.protocol.deserialization.match;
 
 import static org.junit.Assert.assertEquals;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-import java.math.BigInteger;
 import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.openflowplugin.openflow.md.util.ByteUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Metadata;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
 public class MetadataEntryDeserializerTest extends AbstractMatchEntryDeserializerTest {
-
     @Test
     public void deserializeEntry() {
         final ByteBuf in = UnpooledByteBufAllocator.DEFAULT.buffer();
-        final BigInteger metadata = BigInteger.valueOf(20);
-        final BigInteger metadataMask = BigInteger.valueOf(30);
+        final Uint64 metadata = Uint64.valueOf(20);
+        final Uint64 metadataMask = Uint64.valueOf(30);
 
         writeHeader(in, false);
-        in.writeBytes(ByteUtil.convertBigIntegerToNBytes(metadata, getValueLength()));
+        in.writeBytes(ByteUtil.uint64toBytes(metadata));
 
         assertEquals(metadata, deserialize(in).getMetadata().getMetadata());
         assertEquals(0, in.readableBytes());
 
         writeHeader(in, true);
-        in.writeBytes(ByteUtil.convertBigIntegerToNBytes(metadata, getValueLength()));
-        in.writeBytes(ByteUtil.convertBigIntegerToNBytes(metadataMask, getValueLength()));
+        in.writeBytes(ByteUtil.uint64toBytes(metadata));
+        in.writeBytes(ByteUtil.uint64toBytes(metadataMask));
 
         final Metadata desMetadata = deserialize(in).getMetadata();
         assertEquals(metadata, desMetadata.getMetadata());
@@ -55,7 +52,6 @@ public class MetadataEntryDeserializerTest extends AbstractMatchEntryDeserialize
 
     @Override
     protected int getValueLength() {
-        return EncodeConstants.SIZE_OF_LONG_IN_BYTES;
+        return Long.BYTES;
     }
-
 }