Merge "Make TCs to assert on actual values and remove toString asserts"

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / ConvertorManagerTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java
index 7675e5445097814d63b3aa7a05a99ce6affe66ab..27dc780976ddf15510e01d72cbc4ea553a6c2cea 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorManagerTest.java
@@ -20,26 +20,22 @@ import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.opendaylight.openflowplugin.api.OFConstants;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Convertor;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.data.VersionConvertorData;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 /**
- * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager}
+ * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager}.
  */
 @RunWith(MockitoJUnitRunner.class)
 public class ConvertorManagerTest {
-    /**
-     * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager#registerConvertor(short, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.Convertor)}
-     * @throws Exception
-     */
     @Test
     public void testRegisterConvertor() throws Exception {
         final ConvertorManager convertorManager = new ConvertorManager(OFConstants.OFP_VERSION_1_3)
                 .registerConvertor(OFConstants.OFP_VERSION_1_3, new Convertor<Action, String, VersionConvertorData>() {
                     @Override
-                    public Collection<Class<? extends DataContainer>> getTypes() {
+                    public Collection<Class<?>> getTypes() {
                         return Collections.singleton(Action.class);
                     }
 
@@ -53,16 +49,12 @@ public class ConvertorManagerTest {
         assertTrue("Failed to find convertor for action", convertor.isPresent());
     }
 
-    /**
-     * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager#convert(org.opendaylight.yangtools.yang.binding.DataContainer, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData)}
-     * @throws Exception
-     */
     @Test
     public void testConvert() throws Exception {
         final ConvertorManager convertorManager = new ConvertorManager(OFConstants.OFP_VERSION_1_3)
                 .registerConvertor(OFConstants.OFP_VERSION_1_3, new Convertor<Action, String, VersionConvertorData>() {
                     @Override
-                    public Collection<Class<? extends DataContainer>> getTypes() {
+                    public Collection<Class<?>> getTypes() {
                         return Collections.singleton(Action.class);
                     }
 
@@ -82,15 +74,15 @@ public class ConvertorManagerTest {
     }
 
     /**
-     * Test for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager#convert(java.util.Collection, org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData)}
-     * @throws Exception
+     * Test for {@link ConvertorManager#convert(Collection, ConvertorData)}.
      */
     @Test
     public void testConvert1() throws Exception {
         final ConvertorManager convertorManager = new ConvertorManager(OFConstants.OFP_VERSION_1_3)
-                .registerConvertor(OFConstants.OFP_VERSION_1_3, new Convertor<List<Action>, String, VersionConvertorData>() {
+            .registerConvertor(OFConstants.OFP_VERSION_1_3,
+                new Convertor<List<Action>, String, VersionConvertorData>() {
                     @Override
-                    public Collection<Class<? extends DataContainer>> getTypes() {
+                    public Collection<Class<?>> getTypes() {
                         return Collections.singleton(Action.class);
                     }
 
@@ -108,4 +100,4 @@ public class ConvertorManagerTest {
         assertTrue("Failed to convert action to string", result.isPresent());
         assertEquals("Result and expected result do not match", result.get(), expectedResult);
     }
-}
\ No newline at end of file
+}