Default experimenters moved to separate bundle + unit tests

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / OF10StatsRequestInputFactoryTest.java

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java
index 737aceccd7b0ef7e7774637745e50e6bde080bf3..5909067e512a02510d39501a88ed6b301e9d9926 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/OF10StatsRequestInputFactoryTest.java
@@ -29,13 +29,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.matc
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInput;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartRequestInputBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestDescCaseBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestExperimenterCaseBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestFlowCaseBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestPortStatsCaseBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestQueueCaseBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.MultipartRequestTableCaseBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.desc._case.MultipartRequestDescBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.experimenter._case.MultipartRequestExperimenterBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.flow._case.MultipartRequestFlowBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.port.stats._case.MultipartRequestPortStatsBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.request.multipart.request.body.multipart.request.queue._case.MultipartRequestQueueBuilder;\r
@@ -302,63 +300,4 @@ public class OF10StatsRequestInputFactoryTest {
         Assert.assertEquals("Wrong queue-id", 16, out.readUnsignedInt());\r
         Assert.assertTrue("Unread data", out.readableBytes() == 0);\r
     }\r
-    \r
-    /**\r
-     * Testing OF10StatsRequestInputFactory (Vendor) for correct serialization\r
-     * @throws Exception\r
-     */\r
-    @Test\r
-    public void testExperimenter() throws Exception {\r
-        MultipartRequestInputBuilder builder = new MultipartRequestInputBuilder();\r
-        BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);\r
-        builder.setType(MultipartType.OFPMPEXPERIMENTER);\r
-        builder.setFlags(new MultipartRequestFlags(false));\r
-        MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder();\r
-        MultipartRequestExperimenterBuilder expBuilder = new MultipartRequestExperimenterBuilder();\r
-        expBuilder.setExperimenter(56L);\r
-        byte[] expData = new byte[]{0, 1, 2, 3, 4, 5, 6, 7};\r
-        expBuilder.setData(expData);\r
-        caseBuilder.setMultipartRequestExperimenter(expBuilder.build());\r
-        builder.setMultipartRequestBody(caseBuilder.build());\r
-        MultipartRequestInput message = builder.build();\r
-        \r
-        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
-        multipartFactory.serialize(message, out);\r
-        \r
-        BufferHelper.checkHeaderV10(out, (byte) 16, 24);\r
-        Assert.assertEquals("Wrong type", 0xFFFF, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong experimenter", 56, out.readUnsignedInt());\r
-        byte[] temp = new byte[8];\r
-        out.readBytes(temp);\r
-        Assert.assertArrayEquals("Wrong data", expData, temp);\r
-        Assert.assertTrue("Unread data", out.readableBytes() == 0);\r
-    }\r
-\r
-    /**\r
-     * Testing OF10StatsRequestInputFactory (Vendor) for correct serialization\r
-     * @throws Exception\r
-     */\r
-    @Test\r
-    public void testExperimenterWithoutData() throws Exception {\r
-        MultipartRequestInputBuilder builder = new MultipartRequestInputBuilder();\r
-        BufferHelper.setupHeader(builder, EncodeConstants.OF10_VERSION_ID);\r
-        builder.setType(MultipartType.OFPMPEXPERIMENTER);\r
-        builder.setFlags(new MultipartRequestFlags(false));\r
-        MultipartRequestExperimenterCaseBuilder caseBuilder = new MultipartRequestExperimenterCaseBuilder();\r
-        MultipartRequestExperimenterBuilder expBuilder = new MultipartRequestExperimenterBuilder();\r
-        expBuilder.setExperimenter(56L);\r
-        caseBuilder.setMultipartRequestExperimenter(expBuilder.build());\r
-        builder.setMultipartRequestBody(caseBuilder.build());\r
-        MultipartRequestInput message = builder.build();\r
-        \r
-        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
-        multipartFactory.serialize(message, out);\r
-        \r
-        BufferHelper.checkHeaderV10(out, (byte) 16, 16);\r
-        Assert.assertEquals("Wrong type", 0xFFFF, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong flags", 0, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong experimenter", 56, out.readUnsignedInt());\r
-        Assert.assertTrue("Unread data", out.readableBytes() == 0);\r
-    }\r
 }\r