RPC gate set/delete/info and Patch operation support

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

diff --git a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierValidatorTest.java b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierValidatorTest.java
index b32f10c6fdd7389c79264e523be07e6d32cf7b5a..2fe3267c2f2066faca5dfbc36f2bf173caac17d2 100644 (file)
--- a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierValidatorTest.java
+++ b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/qos/classifier/ClassifierValidatorTest.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.Ipv4Address;
-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.classifier.Classifier;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.pcmm.qos.classifier.ClassifierBuilder;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+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.rev170224.TosByte;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev170224.TpProtocol;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev170224.pcmm.qos.classifier.Classifier;
+import org.opendaylight.yang.gen.v1.urn.packetcable.rev170224.pcmm.qos.classifier.ClassifierBuilder;
 
 /**
  * @author rvail
@@ -42,7 +42,7 @@ public class ClassifierValidatorTest {
         validator.validate(buildValidClassifierTree(), null);
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullSrcIp() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setSrcIp(null)
@@ -51,7 +51,7 @@ public class ClassifierValidatorTest {
         validator.validate(classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
      public void nullSrcPort() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setSrcPort(null)
@@ -60,7 +60,7 @@ public class ClassifierValidatorTest {
         validator.validate(classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullDstIp() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setDstIp(null)
@@ -69,7 +69,7 @@ public class ClassifierValidatorTest {
         validator.validate(classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullDstPort() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setDstPort(null)
@@ -78,7 +78,7 @@ public class ClassifierValidatorTest {
         validator.validate(classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullProtocol() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setProtocol(null)
@@ -87,7 +87,7 @@ public class ClassifierValidatorTest {
         validator.validate(classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
     public void nullTosByte() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setTosByte(null)
@@ -96,7 +96,7 @@ public class ClassifierValidatorTest {
         validator.validate(classifier, extentParams.getCurrentParam());
     }
 
-    @Test(expected = ValidationException.class)
+    @Test
      public void nullTosMask() throws ValidationException {
         Classifier classifier = new ClassifierBuilder(buildValidClassifierTree())
                 .setTosMask(null)