X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fserialization%2Ffactories%2FGetFeaturesInputMessageFactoryTest.java;h=1f4a400f1e5ea5c80bdb080d0d23f6351be85354;hb=07de1ed897da9d7dc70c6d550f38c59339ed751e;hp=7ebf90812d9e35e0326c56fdfab62889e8240531;hpb=608331f22077157e3d006e336313ed6323a91e56;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
index 7ebf9081..1f4a400f 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GetFeaturesInputMessageFactoryTest.java
@@ -1,54 +1,77 @@
-/* Copyright (C)2013 Pantheon Technologies, s.r.o. All rights reserved. */
-package org.opendaylight.openflowjava.protocol.impl.serialization.factories;
-
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.UnpooledByteBufAllocator;
-
-import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInputBuilder;
-
-/**
- * @author michal.polkorab
- *
- */
-public class GetFeaturesInputMessageFactoryTest {
-
-    private static final byte FEATURES_REQUEST_MESSAGE_CODE_TYPE = GetFeaturesInputMessageFactory.MESSAGE_TYPE;
-    
-    /**
-     * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
-     * @throws Exception 
-     */
-    @Test
-    public void testV13() throws Exception {
-        GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
-        BufferHelper.setupHeader(gfib, EncodeConstants.OF13_VERSION_ID);
-        GetFeaturesInput gfi = gfib.build();
-        
-        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        GetFeaturesInputMessageFactory gfimf = GetFeaturesInputMessageFactory.getInstance();
-        gfimf.messageToBuffer(EncodeConstants.OF13_VERSION_ID, out, gfi);
-        
-        BufferHelper.checkHeaderV13(out, FEATURES_REQUEST_MESSAGE_CODE_TYPE, 8);
-    }
-
-    /**
-     * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
-     * @throws Exception 
-     */
-    @Test
-    public void testV10() throws Exception {
-        GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
-        BufferHelper.setupHeader(gfib, EncodeConstants.OF10_VERSION_ID);
-        GetFeaturesInput gfi = gfib.build();
-        
-        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        GetFeaturesInputMessageFactory gfimf = GetFeaturesInputMessageFactory.getInstance();
-        gfimf.messageToBuffer(EncodeConstants.OF10_VERSION_ID, out, gfi);
-        
-        BufferHelper.checkHeaderV10(out, FEATURES_REQUEST_MESSAGE_CODE_TYPE, 8);
-    }
-}
+/*
+ * Copyright (c) 2013 Pantheon Technologies s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * 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.openflowjava.protocol.impl.serialization.factories;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.UnpooledByteBufAllocator;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
+import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
+import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;
+import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesInputBuilder;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class GetFeaturesInputMessageFactoryTest {
+
+    private static final byte FEATURES_REQUEST_MESSAGE_CODE_TYPE = 5;
+    private SerializerRegistry registry;
+    private OFSerializer<GetFeaturesInput> featuresFactory;
+
+    /**
+     * Initializes serializer registry and stores correct factory in field
+     */
+    @Before
+    public void startUp() {
+        registry = new SerializerRegistryImpl();
+        registry.init();
+        featuresFactory = registry.getSerializer(
+                new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, GetFeaturesInput.class));
+    }
+
+    /**
+     * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
+     * @throws Exception
+     */
+    @Test
+    public void testV13() throws Exception {
+        GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
+        BufferHelper.setupHeader(gfib, EncodeConstants.OF13_VERSION_ID);
+        GetFeaturesInput gfi = gfib.build();
+
+        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
+        featuresFactory.serialize(gfi, out);
+
+        BufferHelper.checkHeaderV13(out, FEATURES_REQUEST_MESSAGE_CODE_TYPE, 8);
+    }
+
+    /**
+     * Testing of {@link GetFeaturesInputMessageFactory} for correct translation from POJO
+     * @throws Exception
+     */
+    @Test
+    public void testV10() throws Exception {
+        GetFeaturesInputBuilder gfib = new GetFeaturesInputBuilder();
+        BufferHelper.setupHeader(gfib, EncodeConstants.OF10_VERSION_ID);
+        GetFeaturesInput gfi = gfib.build();
+
+        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
+        featuresFactory.serialize(gfi, out);
+
+        BufferHelper.checkHeaderV10(out, FEATURES_REQUEST_MESSAGE_CODE_TYPE, 8);
+    }
+}