Added support for priority in all classifiers

[packetcable.git] / packetcable-policy-server / src / test / java / org / opendaylight / controller / packetcable / provider / validation / impl / validators / qos / classifier / Ipv6ClassifierValidatorTest.java

diff --git a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidatorTest.java b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidatorTest.java
index 689c385758013687c64e060a4227d70cc5f7d1fd..d29af4819985d1d73a9c178b7f9c5fa35e524e81 100644 (file)
--- a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidatorTest.java
+++ b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/Ipv6ClassifierValidatorTest.java
@@ -13,12 +13,12 @@ import org.junit.Test;
 import org.opendaylight.controller.packetcable.provider.test.rules.Params;
 import org.opendaylight.controller.packetcable.provider.validation.ValidationException;
 import org.opendaylight.controller.packetcable.provider.validation.Validator;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.TosByte;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.TpProtocol;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.pcmm.qos.ipv6.classifier.Ipv6Classifier;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.pcmm.qos.ipv6.classifier.Ipv6ClassifierBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161107.TosByte;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161107.TpProtocol;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161107.pcmm.qos.ipv6.classifier.Ipv6Classifier;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev161107.pcmm.qos.ipv6.classifier.Ipv6ClassifierBuilder;
 
 /**
  * @author rvail
@@ -41,14 +41,14 @@ public class Ipv6ClassifierValidatorTest {
         validator.validate(buildValidIpv6Classifier(), null);
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullSrcIp6() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setSrcIp6(null).build();
 
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullSrcPortStart() throws ValidationException {
         Ipv6Classifier ipv6Classifier =
                 new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setSrcPortStart(null).build();
@@ -56,7 +56,7 @@ public class Ipv6ClassifierValidatorTest {
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullSrcPortEnd() throws ValidationException {
         Ipv6Classifier ipv6Classifier =
                 new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setSrcPortEnd(null).build();
@@ -64,14 +64,14 @@ public class Ipv6ClassifierValidatorTest {
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullDstIp6() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setDstIp6(null).build();
 
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullDstPortStart() throws ValidationException {
         Ipv6Classifier ipv6Classifier =
                 new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setDstPortStart(null).build();
@@ -79,7 +79,7 @@ public class Ipv6ClassifierValidatorTest {
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullDstPortEnd() throws ValidationException {
         Ipv6Classifier ipv6Classifier =
                 new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setDstPortEnd(null).build();
@@ -87,35 +87,35 @@ public class Ipv6ClassifierValidatorTest {
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullFlowLabel() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setFlowLabel(null).build();
 
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullNextHdr() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setNextHdr(null).build();
 
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullTcHigh() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setTcHigh(null).build();
 
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullTcLow() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setTcLow(null).build();
 
         validator.validate(ipv6Classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullTcMask() throws ValidationException {
         Ipv6Classifier ipv6Classifier = new Ipv6ClassifierBuilder(buildValidIpv6Classifier()).setTcMask(null).build();