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%2FBarrierInputMessageFactoryTest.java;h=1e5f475ca35cd6195b60ed15d8cf4eb8fd8ee8da;hb=07de1ed897da9d7dc70c6d550f38c59339ed751e;hp=37b6d6761f90cd14aba443946310e4d433c5cbc7;hpb=f7b135c5a0fab2841b445a567b27271081722984;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java
index 37b6d676..1e5f475c 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/BarrierInputMessageFactoryTest.java
@@ -1,38 +1,62 @@
-/* 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.deserialization.factories.HelloMessageFactoryTest;
-import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder;
-
-/**
- * @author michal.polkorab
- *
- */
-public class BarrierInputMessageFactoryTest {
-
-    private static final byte BARRIER_REQUEST_MESSAGE_CODE_TYPE = 20;
-    
-    /**
-     * Testing of {@link BarrierInputMessageFactory} for correct translation from POJO
-     * @throws Exception 
-     */
-    @Test
-    public void test() throws Exception {
-        BarrierInputBuilder bib = new BarrierInputBuilder();
-        BufferHelper.setupHeader(bib);
-        BarrierInput bi = bib.build();
-        
-        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        BarrierInputMessageFactory bimf = BarrierInputMessageFactory.getInstance();
-        bimf.messageToBuffer(HelloMessageFactoryTest.VERSION_YET_SUPPORTED, out, bi);
-        
-        BufferHelper.checkHeaderV13(out, BARRIER_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.BarrierInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.BarrierInputBuilder;
+
+/**
+ * @author michal.polkorab
+ *
+ */
+public class BarrierInputMessageFactoryTest {
+
+    private static final byte BARRIER_REQUEST_MESSAGE_CODE_TYPE = 20;
+    private SerializerRegistry registry;
+    private OFSerializer<BarrierInput> barrierFactory;
+
+    /**
+     * Initializes serializer registry and stores correct factory in field
+     */
+    @Before
+    public void startUp() {
+        registry = new SerializerRegistryImpl();
+        registry.init();
+        barrierFactory = registry.getSerializer(
+                new MessageTypeKey<>(EncodeConstants.OF13_VERSION_ID, BarrierInput.class));
+    }
+
+    /**
+     * Testing of {@link BarrierInputMessageFactory} for correct translation from POJO
+     * @throws Exception
+     */
+    @Test
+    public void test() throws Exception {
+        BarrierInputBuilder bib = new BarrierInputBuilder();
+        BufferHelper.setupHeader(bib, EncodeConstants.OF13_VERSION_ID);
+        BarrierInput bi = bib.build();
+
+        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
+        barrierFactory.serialize(bi, out);
+
+        BufferHelper.checkHeaderV13(out, BARRIER_REQUEST_MESSAGE_CODE_TYPE, 8);
+    }
+
+}