Merge "Convert models to JUnit 5"

[policy/models.git] / models-pdp / src / test / java / org / onap / policy / models / pdp / concepts / ModelsTest.java

diff --git a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/ModelsTest.java b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/ModelsTest.java
index 7a6c03c..95af265 100644 (file)
--- a/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/ModelsTest.java
+++ b/models-pdp/src/test/java/org/onap/policy/models/pdp/concepts/ModelsTest.java
@@ -28,7 +28,7 @@ import com.openpojo.validation.ValidatorBuilder;
 import com.openpojo.validation.test.impl.GetterTester;
 import com.openpojo.validation.test.impl.SetterTester;
 import org.junit.Test;
-import org.onap.policy.common.utils.validation.ToStringTester;
+import org.onap.policy.common.utils.test.ToStringTester;
 
 /**
  * Class to perform unit testing of models.
@@ -41,7 +41,10 @@ public class ModelsTest {
     @Test
     public void testPdpModels() {
         final Validator validator = ValidatorBuilder.create().with(new ToStringTester()).with(new SetterTester())
-                        .with(new GetterTester()).build();
-        validator.validate(POJO_PACKAGE, new FilterPackageInfo(), new FilterClassName(PdpMessage.class.getName()));
+                .with(new GetterTester()).build();
+
+        // exclude Test classes and PdpMessage
+        validator.validate(POJO_PACKAGE, new FilterPackageInfo(), new FilterClassName("^((?!Test$).)*$"),
+                new FilterClassName("^((?!" + PdpMessage.class.getName() + ").)*$"));
     }
 }