Merge "Fix issues related to checkstyle enforcement"

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / util / TranslatorLibratyUtilTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/TranslatorLibratyUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/TranslatorLibratyUtilTest.java
index 2a4520782b400c231eb72330725cfccaf43d1f0c..fe90faf3a1ff50eaed428c02f625563fd62b0bcf 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/TranslatorLibratyUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/TranslatorLibratyUtilTest.java
@@ -18,6 +18,8 @@ import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator;
 import org.opendaylight.openflowplugin.api.openflow.device.TranslatorLibrary;
 import org.opendaylight.openflowplugin.api.openflow.translator.TranslatorLibrarian;
 import org.opendaylight.openflowplugin.impl.translator.TranslatorKeyFactory;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PacketIn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.PortGrouping;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregateCase;
@@ -48,34 +50,35 @@ public class TranslatorLibratyUtilTest {
 
     @Test
     public void setBasicTranslatorLibraryTest() {
-        TranslatorLibraryUtil.setBasicTranslatorLibrary(translatorLibrarian);
+        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
+        TranslatorLibraryUtil.injectBasicTranslatorLibrary(translatorLibrarian, convertorManager);
         TranslatorLibrary translatorLibrary = translatorLibrarian.oook();
 
         TranslatorKeyFactory of13TranslatorKeyFactory = new TranslatorKeyFactory(OFP_VERSION_1_3);
-        TranslatorKeyFactory of10TranslatorKeyFactory = new TranslatorKeyFactory(OFP_VERSION_1_0);
 
         MessageTranslator<Object, Object> translator;
-        translator = translatorLibrary.lookupTranslator(of13TranslatorKeyFactory
-                .createTranslatorKey(PacketIn.class));
+        translator = translatorLibrary.lookupTranslator(of13TranslatorKeyFactory.createTranslatorKey(PacketIn.class));
         assertNotNull(translator);
 
-        translator = translatorLibrary.lookupTranslator(of13TranslatorKeyFactory.createTranslatorKey(PortGrouping
-                .class));
+        translator = translatorLibrary
+                .lookupTranslator(of13TranslatorKeyFactory.createTranslatorKey(PortGrouping.class));
         assertNotNull(translator);
 
-        translator = translatorLibrary.lookupTranslator(of13TranslatorKeyFactory.createTranslatorKey
-                (MultipartReplyAggregateCase
-                .class));
+        translator = translatorLibrary
+                .lookupTranslator(of13TranslatorKeyFactory.createTranslatorKey(MultipartReplyAggregateCase.class));
         assertNotNull(translator);
 
+        TranslatorKeyFactory of10TranslatorKeyFactory = new TranslatorKeyFactory(OFP_VERSION_1_0);
+
         translator = translatorLibrary.lookupTranslator(of10TranslatorKeyFactory.createTranslatorKey(PacketIn.class));
         assertNotNull(translator);
 
-        translator = translatorLibrary.lookupTranslator(of10TranslatorKeyFactory.createTranslatorKey(PortGrouping.class));
+        translator = translatorLibrary
+                .lookupTranslator(of10TranslatorKeyFactory.createTranslatorKey(PortGrouping.class));
         assertNotNull(translator);
 
-        translator = translatorLibrary.lookupTranslator(of10TranslatorKeyFactory.createTranslatorKey(MultipartReplyAggregateCase
-                .class));
+        translator = translatorLibrary
+                .lookupTranslator(of10TranslatorKeyFactory.createTranslatorKey(MultipartReplyAggregateCase.class));
         assertNotNull(translator);
     }