Bump upstreams for 2022.09 Chlorine

[openflowplugin.git] / extension / openflowjava-extension-nicira / src / test / java / org / opendaylight / openflowjava / nx / codec / match / PktMarkCodecTest.java

diff --git a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java
index 3cd244ec0ba31e06c351330e5920747cb1405096..4e54518b49776e804e16b5972912067608906d4a 100644 (file)
--- a/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java
+++ b/extension/openflowjava-extension-nicira/src/test/java/org/opendaylight/openflowjava/nx/codec/match/PktMarkCodecTest.java
@@ -11,30 +11,24 @@ import static org.junit.Assert.assertEquals;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Nxm1Class;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmNxPktMark;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValue;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.aug.nx.match.PktMarkCaseValueBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.ofj.nxm.nx.match.pkt.mark.grouping.PktMarkValuesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValue;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.oxm.container.match.entry.value.PktMarkCaseValueBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class PktMarkCodecTest {
-
     private static final int VALUE_LENGTH = 4;
     private static final int NXM_FIELD_CODE = 33;
-    private PktMarkCodec pktMarkCodec;
-    private ByteBuf buffer;
-    private MatchEntry input;
 
-    @Before
-    public void setUp() {
-        pktMarkCodec = new PktMarkCodec();
-        buffer = ByteBufAllocator.DEFAULT.buffer();
-    }
+    private final ByteBuf buffer = ByteBufAllocator.DEFAULT.buffer();
+    private final PktMarkCodec pktMarkCodec = new PktMarkCodec();
+    private MatchEntry input;
 
     @Test
     public void serializeTest() {
@@ -56,9 +50,9 @@ public class PktMarkCodecTest {
 
         final PktMarkCaseValue result = (PktMarkCaseValue) input.getMatchEntryValue();
 
-        assertEquals(Nxm1Class.class, input.getOxmClass());
-        assertEquals(NxmNxPktMark.class, input.getOxmMatchField());
-        assertEquals(false, input.isHasMask());
+        assertEquals(Nxm1Class.VALUE, input.getOxmClass());
+        assertEquals(NxmNxPktMark.VALUE, input.getOxmMatchField());
+        assertEquals(false, input.getHasMask());
         assertEquals(2, result.getPktMarkValues().getPktMark().intValue());
     }
 
@@ -67,18 +61,18 @@ public class PktMarkCodecTest {
         final PktMarkCaseValueBuilder caseBuilder = new PktMarkCaseValueBuilder();
         final PktMarkValuesBuilder valuesBuilder = new PktMarkValuesBuilder();
 
-        matchEntryBuilder.setOxmClass(Nxm1Class.class);
-        matchEntryBuilder.setOxmMatchField(NxmNxPktMark.class);
+        matchEntryBuilder.setOxmClass(Nxm1Class.VALUE);
+        matchEntryBuilder.setOxmMatchField(NxmNxPktMark.VALUE);
         matchEntryBuilder.setHasMask(false);
 
-        valuesBuilder.setPktMark(1L);
+        valuesBuilder.setPktMark(Uint32.ONE);
 
         caseBuilder.setPktMarkValues(valuesBuilder.build());
         matchEntryBuilder.setMatchEntryValue(caseBuilder.build());
         return matchEntryBuilder.build();
     }
 
-    private static void createBuffer(ByteBuf message) {
+    private static void createBuffer(final ByteBuf message) {
         message.writeShort(OxmMatchConstants.NXM_1_CLASS);
 
         int fieldMask = NXM_FIELD_CODE << 1;