Unit tests for Instruction and Ethernet codecs
Added tests for codecs for Ethernet and Instruction classes
Also fixed some bugs uncovered by the tests
Change-Id: I29f82d169e81b3fca417f88fab992148bf36dc71
diff --git a/web/api/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java b/web/api/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java
new file mode 100644
index 0000000..781f133
--- /dev/null
+++ b/web/api/src/test/java/org/onosproject/codec/impl/InstructionCodecTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.codec.impl;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+import org.onlab.packet.VlanId;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.flow.instructions.Instruction;
+import org.onosproject.net.flow.instructions.Instructions;
+import org.onosproject.net.flow.instructions.L0ModificationInstruction;
+import org.onosproject.net.flow.instructions.L2ModificationInstruction;
+import org.onosproject.net.flow.instructions.L3ModificationInstruction;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.onosproject.codec.impl.InstructionJsonMatcher.matchesInstruction;
+
+/**
+ * Unit tests for Instruction codec.
+ */
+public class InstructionCodecTest {
+ CodecContext context;
+ JsonCodec<Instruction> instructionCodec;
+
+ /**
+ * Sets up for each tests. Creates a context and fetches the instruction
+ * codec.
+ */
+ @Before
+ public void setUp() {
+ context = new MockCodecContext();
+ instructionCodec = context.codec(Instruction.class);
+ assertThat(instructionCodec, notNullValue());
+ }
+
+ /**
+ * Tests the encoding of push header instructions.
+ */
+ @Test
+ public void pushHeaderInstructionsTest() {
+ final L2ModificationInstruction.PushHeaderInstructions instruction =
+ (L2ModificationInstruction.PushHeaderInstructions) Instructions.pushMpls();
+ final ObjectNode instructionJson = instructionCodec.encode(instruction, context);
+
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of drop instructions.
+ */
+ @Test
+ public void dropInstructionTest() {
+ final Instructions.DropInstruction instruction =
+ new Instructions.DropInstruction();
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of output instructions.
+ */
+ @Test
+ public void outputInstructionTest() {
+ final Instructions.OutputInstruction instruction =
+ Instructions.createOutput(PortNumber.portNumber(22));
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of mod lambda instructions.
+ */
+ @Test
+ public void modLambdaInstructionTest() {
+ final L0ModificationInstruction.ModLambdaInstruction instruction =
+ (L0ModificationInstruction.ModLambdaInstruction)
+ Instructions.modL0Lambda((short) 55);
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of mod ether instructions.
+ */
+ @Test
+ public void modEtherInstructionTest() {
+ final L2ModificationInstruction.ModEtherInstruction instruction =
+ (L2ModificationInstruction.ModEtherInstruction)
+ Instructions.modL2Src(MacAddress.valueOf("11:22:33:44:55:66"));
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of mod vlan id instructions.
+ */
+ @Test
+ public void modVlanIdInstructionTest() {
+ final L2ModificationInstruction.ModVlanIdInstruction instruction =
+ (L2ModificationInstruction.ModVlanIdInstruction)
+ Instructions.modVlanId(VlanId.vlanId((short) 12));
+
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of mod vlan pcp instructions.
+ */
+ @Test
+ public void modVlanPcpInstructionTest() {
+ final L2ModificationInstruction.ModVlanPcpInstruction instruction =
+ (L2ModificationInstruction.ModVlanPcpInstruction)
+ Instructions.modVlanPcp((byte) 9);
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of mod ip instructions.
+ */
+ @Test
+ public void modIPInstructionTest() {
+ final IpAddress ip = IpPrefix.valueOf("1.2.3.4/24").address();
+ final L3ModificationInstruction.ModIPInstruction instruction =
+ (L3ModificationInstruction.ModIPInstruction)
+ Instructions.modL3Src(ip);
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+ /**
+ * Tests the encoding of mod MPLS label instructions.
+ */
+ @Test
+ public void modMplsLabelInstructionTest() {
+ final L2ModificationInstruction.ModMplsLabelInstruction instruction =
+ (L2ModificationInstruction.ModMplsLabelInstruction)
+ Instructions.modMplsLabel(99);
+ final ObjectNode instructionJson =
+ instructionCodec.encode(instruction, context);
+ assertThat(instructionJson, matchesInstruction(instruction));
+ }
+
+}