fixed usage of optional and fixed bug in ccap validator test

Switched to guava Optional so java 7 compiles as well.
Fixed validation issue in CcapsValidatorTest

Change-Id: I816268503c44166767f8aae6fc4854db963e2ea7
Signed-off-by: Ryan Vail <r.vail@cablelabs.com>

diff --git a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/test/rules/Params.java b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/test/rules/Params.java
index c4c439b6fc24547614f016d21f12967714077706..7365983759899d7dfec4fa79d9ef7685ab230194 100644 (file)
--- a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/test/rules/Params.java
+++ b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/test/rules/Params.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.controller.packetcable.provider.test.rules;
 
+import com.google.common.base.Optional;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -15,7 +16,6 @@ import java.lang.annotation.Target;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 import org.junit.rules.ErrorCollector;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -77,7 +77,7 @@ public class Params<T> implements TestRule {
                     try {
                         base.evaluate();
                     } catch (Throwable t) {
-                        errorCollector.addError(new ParamsAssertionError(currentParam, t));
+                        errorCollector.addError(new ParamsAssertionError(currentParam.orNull(), t));
                     }
                 }
                 currentParam = null;

diff --git a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidatorTest.java b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidatorTest.java
index 5abfc2c49bc82e780d9e60593ed5297ecbe13d7f..87c7e10f2a0fd638b0881637ea41bbd34f6b3280 100644 (file)
--- a/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidatorTest.java
+++ b/packetcable-policy-server/src/test/java/org/opendaylight/controller/packetcable/provider/validation/impl/validators/ccaps/CcapsValidatorTest.java
@@ -17,7 +17,6 @@ import org.opendaylight.controller.packetcable.provider.validation.Validator;
 import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.Ccaps;
 import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.CcapsBuilder;
 import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.ccaps.Ccap;
-import org.opendaylight.yang.gen.v1.urn.packetcable.rev151101.ccaps.CcapBuilder;
 
 /**
  * @author rvail
@@ -61,13 +60,7 @@ public class CcapsValidatorTest {
 
     @Test
     public void testValid() throws ValidationException {
-        final Ccap ccap = new CcapBuilder().setCcapId("aCcapId").build();
-
-        final Ccaps ccaps = new CcapsBuilder()
-                .setCcap(Collections.singletonList(ccap))
-                .build();
-
-        validator.validate(ccaps, extentParams.getCurrentParam());
+        validator.validate(buildValidCcapsTree(), extentParams.getCurrentParam());
     }
 
     public static Ccaps buildValidCcapsTree() {