Removed tests based on changes in neutron

- commit [1] introduced UUID format check so we got errors in negative tests

[1] https://git.opendaylight.org/gerrit/#/c/28365/1

Signed-off-by: Martin Sunal <msunal@cisco.com>

diff --git a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoderTest.java b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoderTest.java
index 6e4039450f9cae5dce692b361a5b564559e639ad..bdead5d775772d93c7a9e7c406638a86e48f992a 100644 (file)
--- a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoderTest.java
+++ b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/mapping/rule/SecRuleEntityDecoderTest.java
@@ -276,55 +276,6 @@ public class SecRuleEntityDecoderTest {
             .getValue());
     }
 
-    @Test
-    public final void testGetContractId_noSlashLowercaseUuidID() {
-        secRule.setSecurityRuleUUID("01234567abcdef0101230123456789ab");
-        Assert.assertEquals("01234567-abcd-ef01-0123-0123456789ab", SecRuleEntityDecoder.getContractId(secRule)
-            .getValue());
-    }
-
-    @Test
-    public final void testGetContractId_noSlashUppercaseUuidID() {
-        secRule.setSecurityRuleUUID("01234567ABCDEF0101230123456789AB");
-        Assert.assertEquals("01234567-ABCD-EF01-0123-0123456789AB", SecRuleEntityDecoder.getContractId(secRule)
-            .getValue());
-    }
-
-    @Test
-    public final void testGetContractId_noSlashMixUuidID() {
-        secRule.setSecurityRuleUUID("01234567ABCDef0101230123456789Ab");
-        Assert.assertEquals("01234567-ABCD-ef01-0123-0123456789Ab", SecRuleEntityDecoder.getContractId(secRule)
-            .getValue());
-    }
-
-    @Test
-    public final void testGetContractId_emptyUuidID() {
-        secRule.setSecurityRuleUUID("");
-        thrown.expect(IllegalArgumentException.class);
-        SecRuleEntityDecoder.getContractId(secRule);
-    }
-
-    @Test
-    public final void testGetContractId_badLengthUuidID() {
-        secRule.setSecurityRuleUUID("abcdxy");
-        thrown.expect(IllegalArgumentException.class);
-        SecRuleEntityDecoder.getContractId(secRule);
-    }
-
-    @Test
-    public final void testGetContractId_badContentUuidID() {
-        secRule.setSecurityRuleUUID("xyz34567-abcd-ef01-0123-0123456789ab");
-        thrown.expect(IllegalArgumentException.class);
-        SecRuleEntityDecoder.getContractId(secRule);
-    }
-
-    @Test
-    public final void testGetContractId_nullUuidID() {
-        secRule.setSecurityRuleUUID(null);
-        thrown.expect(NullPointerException.class);
-        SecRuleEntityDecoder.getContractId(secRule);
-    }
-
     @Test
     public final void testGetClassifierInstance_onlyEthertype() {
         secRule.setSecurityRuleEthertype(NeutronUtils.IPv4);

diff --git a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/GbpDataBrokerTest.java b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/GbpDataBrokerTest.java
index 70de32704cb86467bcd76e3f2c7c620c70b6fa96..0a446aea882fb73406745944af228853c2d8d998 100644 (file)
--- a/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/GbpDataBrokerTest.java
+++ b/neutron-mapper/src/test/java/org/opendaylight/groupbasedpolicy/neutron/mapper/test/GbpDataBrokerTest.java
@@ -12,7 +12,6 @@ import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet.Builder;
 
-// TODO this class exists b/c https://bugs.opendaylight.org/show_bug.cgi?id=4281
 /**
  * Loads only modules of GBP and it's dependencies for data broker.
  * <br>Therefore this implementation is faster than {@link AbstractDataBrokerTest}