Fix test identities

Identities are mapped to interfaces, not abstract classes. Fix
manual test identities.

Change-Id: Ia4487633e00ce168f1750d36f07e5557bd41b1cb
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java
index 595fb6c481fce2d87539bc2d4e73589719078760..6c3a6819fa05a28a7088dbe0e43557adb6e5b7d8 100644 (file)
--- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java
+++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingLooseResolverTest.java
@@ -54,11 +54,11 @@ public class GroupingLooseResolverTest {
                 eqGroup.getExtension(match2).get().getExtensionList().get(0).getExtensionKey());
     }
 
-    private static class JoachimTheBig extends ExtensionKey {
+    private interface JoachimTheBig extends ExtensionKey {
         // nobody
     }
 
-    private static class JoachimTheTiny extends ExtensionKey {
+    private interface JoachimTheTiny extends ExtensionKey {
         // nobody
     }
 

diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
index 5bf034a7154f1fb2c790dc8d0fee1c307cb3d0b3..4ddc9157807baf2c31ff3267600eb41ef43afbae 100644 (file)
--- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
+++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
@@ -54,11 +54,11 @@ public class GroupingResolverTest {
                 eqGroup.getExtension(match2).get().getExtensionList().get(0).getExtensionKey());
     }
 
-    private static class JoachimTheBig extends ExtensionKey {
+    private interface JoachimTheBig extends ExtensionKey {
         // nobody
     }
 
-    private static class JoachimTheTiny extends ExtensionKey {
+    private interface JoachimTheTiny extends ExtensionKey {
         // nobody
     }
 }

diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java
index cc1cffef2b817bbb40237a391cfd22c3caa5dada..f47fd103e0363bddf1e5d36b17a484635fcad10b 100755 (executable)
--- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java
+++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/SetFieldExtensionTest.java
@@ -50,11 +50,11 @@ public class SetFieldExtensionTest {
                 eqGroup.getExtension(setField2).get().getExtensionList().get(0).getExtensionKey());
     }
 
-    private static class ZVendorExt1 extends ExtensionKey {
+    private interface ZVendorExt1 extends ExtensionKey {
         // nobody
     }
 
-    private static class ZVendorExt2 extends ExtensionKey {
+    private interface ZVendorExt2 extends ExtensionKey {
         // nobody
     }
 }

diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java
index 77905065f182605dc7c509b2ea4aedd16ea58ef1..0e393fbb0b22ec2e07e5d086e14af1827f7635ca 100644 (file)
--- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java
+++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/KeysTest.java
@@ -81,7 +81,7 @@ public class KeysTest {
         Assert.assertEquals(matchKey.hashCode(), matchKey2.hashCode());
     }
 
-    private static class ExpSubType extends ExperimenterActionSubType {
+    private interface ExpSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
 

diff --git a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
index 445da67a21303903388ab8856e92452baa03aca2..d1b2049d2e0dcfd4fdd49d44d913476406387bcf 100644 (file)
--- a/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
+++ b/openflowjava/openflow-protocol-api/src/test/java/org/opendaylight/openflowjava/protocol/api/keys/experimenter/ExperimenterActionSerializerKeyTest.java
@@ -65,11 +65,11 @@ public class ExperimenterActionSerializerKeyTest {
     }
 
 
-    private static class TestSubType extends ExperimenterActionSubType {
+    private interface TestSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
 
-    private static class TestSubType2 extends ExperimenterActionSubType {
+    private interface TestSubType2 extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
 

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
index b4258346e8675c40607dd2b06382de193d383149..ee39fd33ceffa08b9af7eec4ed8a49802a119902 100755 (executable)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/core/connection/SwitchConnectionProviderImpl02Test.java
@@ -269,7 +269,7 @@ public class SwitchConnectionProviderImpl02Test {
         provider.registerDeserializer(key18, deserializer);
     }
 
-    private static class TestSubType extends ExperimenterActionSubType {
+    private interface TestSubType extends ExperimenterActionSubType {
         // empty class - only used in test for comparation
     }
 }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
index d9a18c31a3624926efc859c1baf154081ce6af34..6944c962e8b17e1a4625e934783fd7aa63e81f41 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/action/OF13SetFieldActionSerializerTest.java
@@ -92,7 +92,7 @@ public class OF13SetFieldActionSerializerTest {
         Assert.assertEquals("Wrong - bad lenght", lenght, out.readUnsignedShort());
     }
 
-    private class OxmMatchFieldClass extends MatchField {
+    private interface OxmMatchFieldClass extends MatchField {
         // only for testing purposes
     }
 }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
index 994b79b3ebdd2788f313ee33379c43b72552f668..d3533f00416598702a5fc0999ab3ac4271ba2902 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13MatchSerializerTest.java
@@ -385,7 +385,7 @@ public class OF13MatchSerializerTest {
         ((OF13MatchSerializer) matchSerializer).serializeMatchEntries(entries, out);
     }
 
-    private class OxmMatchFieldClass extends MatchField {
+    private interface OxmMatchFieldClass extends MatchField {
         // only for testing purposes
     }
 }

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java
index 71a39319881ba956478d60dbb8122d7761bb0976..c5bf61593849dd637ffe9a949611e20891ab7893 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/TypeKeyMakerFactoryTest.java
@@ -171,7 +171,7 @@ public class TypeKeyMakerFactoryTest {
         Assert.assertEquals("Wrong key", comparationKey, key);
     }
 
-    private class OxmMatchFieldClass extends MatchField {
+    private interface OxmMatchFieldClass extends MatchField {
         // only for testing purposes
     }
 }

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java
index 01922e40c0ffadddecc81cdeb110daff1c3bb0a3..c810bb67431914d2697c5a70935a037367d6d647 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/ExtensionConverterManagerImplTest.java
@@ -99,7 +99,7 @@ public class ExtensionConverterManagerImplTest {
         Assert.assertEquals(extConvertorFromOFJava, manager.getActionConverter(keyFromOFJava));
     }
 
-    private static class ExpSubType extends ExperimenterActionSubType {
+    private interface ExpSubType extends ExperimenterActionSubType {
         // NOOP
     }
 

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java
index 961ea2a82e75dfc84ec42b06463a0095383efa0a..04d5c4132955ef3fe0666ea2a4e83f8cd12038fd 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelperTest.java
@@ -93,15 +93,15 @@ public class MatchExtensionHelperTest {
         return matchEntries;
     }
 
-    private static final class MockOxmClassBase extends OxmClassBase {
+    private interface MockOxmClassBase extends OxmClassBase {
 
     }
 
-    private static final class MockMatchField extends MatchField {
+    private interface MockMatchField extends MatchField {
 
     }
 
-    private final class MockExtensionKey extends ExtensionKey {
+    private interface MockExtensionKey extends ExtensionKey {
 
     }
 

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java
index a189afec0d002d6b77789f47b6088ea5bb7a318e..0790099b36e31cb5ef469183369913c1ae5ccd04 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowStatsResponseConvertorTest.java
@@ -164,7 +164,7 @@ public class FlowStatsResponseConvertorTest {
         return instructionsOptional.get();
     }
 
-    private static final class MockActionBase extends ActionBase {
+    private interface MockActionBase extends ActionBase {
         // for testing purposes
     }
 }