Bug 5540 - ConvertorManager base

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

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl2Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl2Test.java
index f6e9ba27e59ab946bd8ed1bfb39172f0b5f89506..09da99443dbd04352634b1a7882fd0d4bc89b738 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl2Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl2Test.java
@@ -151,22 +151,22 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testEmptyAndNullInput() {\r
         MatchBuilder builder = new MatchBuilder();\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(null, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(null);\r
         Assert.assertEquals("Wrong entries size", 0, entries.size());\r
 \r
-        entries = convertor.convert(match, new BigInteger("42"));\r
+        entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 0, entries.size());\r
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testConversion() {\r
@@ -228,7 +228,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv4MatchBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 24, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, InPort.class, false);\r
@@ -338,7 +338,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testIpv4MatchArbitraryBitMaskwithNoMask(){\r
@@ -349,7 +349,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv4MatchArbitraryBitMaskBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 2, entries.size());\r
 \r
         MatchEntry entry = entries.get(0);\r
@@ -361,7 +361,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testIpv4MatchArbitraryBitMaskwithMask(){\r
@@ -374,7 +374,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv4MatchArbitraryBitMaskBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 2, entries.size());\r
 \r
         MatchEntry entry = entries.get(0);\r
@@ -386,7 +386,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testUdpMatchConversion() {\r
@@ -397,7 +397,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer4Match(udpMatchBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 2, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, UdpSrc.class, false);\r
@@ -410,7 +410,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testSctpMatchConversion() {\r
@@ -421,7 +421,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer4Match(sctpMatchBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 2, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, SctpSrc.class, false);\r
@@ -434,7 +434,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testArpMatchConversion() {\r
@@ -452,7 +452,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(arpBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 5, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, ArpOp.class, false);\r
@@ -477,7 +477,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testArpMatchConversionWithMasks() {\r
@@ -497,7 +497,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(arpBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 4, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         entry = entries.get(0);\r
@@ -527,7 +527,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testIpv6MatchConversion() {\r
@@ -547,7 +547,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv6Builder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 7, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         /* Due to conversion ambiguities, we always get "has mask" because \r
@@ -583,7 +583,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testIpv6MatchConversionWithMasks() {\r
@@ -594,7 +594,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv6Builder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 2, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, Ipv6Src.class, true);\r
@@ -612,7 +612,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testIpv6ExtHeaderConversion() {\r
@@ -625,7 +625,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv6Builder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 1, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, Ipv6Exthdr.class, true);\r
@@ -636,7 +636,7 @@ public class MatchConvertorImpl2Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match, java.math.BigInteger)}\r
+     * Test {@link MatchConvertorImpl#convert(org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match)}\r
      */\r
     @Test\r
     public void testConversionWithMasks() {\r
@@ -677,7 +677,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv4MatchBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 8, entries.size());\r
         MatchEntry entry = entries.get(0);\r
         checkEntryHeader(entry, Metadata.class, true);\r
@@ -745,7 +745,7 @@ public class MatchConvertorImpl2Test {
         builder.setLayer3Match(ipv6MatchArbitraryBitMaskBuilder.build());\r
         Match match = builder.build();\r
 \r
-        List<MatchEntry> entries = convertor.convert(match, new BigInteger("42"));\r
+        List<MatchEntry> entries = convertor.convert(match);\r
         Assert.assertEquals("Wrong entries size", 2, entries.size());\r
 \r
         MatchEntry entry = entries.get(0);\r