Bug 1254 - increase unit test fix

- remove unwanted test dependency

Change-Id: I95b777cd90e83e4005794d3e7bd94f6069f3767b
Signed-off-by: Martin Bobak <mbobak@cisco.com>

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index cd9776e5669a99482911138646ba084d61ab1f16..598694b8cca70bb2bc4a4f24cdca0d12d854bfab 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -89,12 +89,6 @@
             <artifactId>openflowplugin-extension-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowjava-extension-nicira</artifactId>
-            <version>0.0.3-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>liblldp</artifactId>

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/NxmExtensionsConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/NxmExtensionsConvertorTest.java
index 5bbe109b58034fdfa92253580e0b2909b44d74a1..b2c64283c7f8d4e4d8bd470a77681c61ceeeb2d8 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/NxmExtensionsConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/NxmExtensionsConvertorTest.java
@@ -23,7 +23,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Nxm1
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpFlag;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntriesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.match.rev140421.NxmOfEthType;
 
 /**
  * Created by Martin Bobak mbobak@cisco.com on 9/17/14.
@@ -52,12 +51,12 @@ public class NxmExtensionsConvertorTest {
      * Trivial test method for {@link org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match.NxmExtensionsConvertor#toNxmIpv4Tunnel(Class, org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix)}  }
      */
     public void testToNxmIpv4Tunnel() {
-        MatchEntries matchEntries = NxmExtensionsConvertor.toNxmIpv4Tunnel(NxmOfEthType.class, IPV_4_PREFIX);
+        MatchEntries matchEntries = NxmExtensionsConvertor.toNxmIpv4Tunnel(MockMatchField.class, IPV_4_PREFIX);
         assertNotNull(matchEntries.getAugmentation(MaskMatchEntry.class));
         assertNotNull(matchEntries.getAugmentation(Ipv4AddressMatchEntry.class));
         assertTrue(matchEntries.isHasMask());
         assertEquals(Nxm1Class.class, matchEntries.getOxmClass());
-        assertEquals(NxmOfEthType.class, matchEntries.getOxmMatchField());
+        assertEquals(MockMatchField.class, matchEntries.getOxmMatchField());
     }
 
     @Test
@@ -82,4 +81,8 @@ public class NxmExtensionsConvertorTest {
         assertNotNull(matchEntryBuilder.getAugmentation(MaskMatchEntry.class));
     }
 
+
+    private class MockMatchField extends org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.MatchField {
+
+    }
 }