diff options
8 files changed, 27 insertions, 17 deletions
diff --git a/models-decisions/src/test/java/org/onap/policy/models/decisions/concepts/TestModels.java b/models-decisions/src/test/java/org/onap/policy/models/decisions/concepts/TestModels.java index 25b1016b2..81d35d606 100644 --- a/models-decisions/src/test/java/org/onap/policy/models/decisions/concepts/TestModels.java +++ b/models-decisions/src/test/java/org/onap/policy/models/decisions/concepts/TestModels.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * ONAP Policy Decision Models * ================================================================================ @@ -27,7 +27,7 @@ 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; public class TestModels { diff --git a/models-errors/src/test/java/org/onap/policy/models/errors/concepts/TestModels.java b/models-errors/src/test/java/org/onap/policy/models/errors/concepts/TestModels.java index 03dd8e6a4..9ff7574bb 100644 --- a/models-errors/src/test/java/org/onap/policy/models/errors/concepts/TestModels.java +++ b/models-errors/src/test/java/org/onap/policy/models/errors/concepts/TestModels.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * ONAP Policy Decision Models * ================================================================================ @@ -27,7 +27,7 @@ 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; public class TestModels { diff --git a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java index c87aead9c..83a58eea7 100644 --- a/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java +++ b/models-pap/src/test/java/org/onap/policy/models/pap/concepts/TestModels.java @@ -27,7 +27,7 @@ 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. 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 743839362..dbe163efe 100644 --- 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 @@ -27,8 +27,9 @@ import com.openpojo.validation.Validator; 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,11 +42,10 @@ public class ModelsTest { @Test public void testPdpModels() { final Validator validator = ValidatorBuilder.create().with(new ToStringTester()).with(new SetterTester()) - .with(new GetterTester()).build(); + .with(new GetterTester()).build(); // exclude Test classes and PdpMessage - validator.validate(POJO_PACKAGE, new FilterPackageInfo(), - new FilterClassName("^((?!Test$).)*$"), - new FilterClassName("^((?!" + PdpMessage.class.getName() + ").)*$")); + validator.validate(POJO_PACKAGE, new FilterPackageInfo(), new FilterClassName("^((?!Test$).)*$"), + new FilterClassName("^((?!" + PdpMessage.class.getName() + ").)*$")); } } diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/PojosTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/PojosTest.java index d850052b4..07c7461c3 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/PojosTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/PojosTest.java @@ -30,8 +30,9 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule; import com.openpojo.validation.rule.impl.SetterMustExistRule; 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 tests of all pojos. diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/TestPojos.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/TestPojos.java index 26077189e..b0209b0e6 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/TestPojos.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/concepts/TestPojos.java @@ -29,8 +29,9 @@ import com.openpojo.validation.rule.impl.GetterMustExistRule; import com.openpojo.validation.rule.impl.SetterMustExistRule; 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 tests of all pojos. diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/TestPojos.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/TestPojos.java index edb6e2e58..444a0d100 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/TestPojos.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/concepts/TestPojos.java @@ -31,7 +31,7 @@ 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 tests of all pojos. @@ -19,13 +19,15 @@ SPDX-License-Identifier: Apache-2.0 ============LICENSE_END========================================================= ---><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.policy.parent</groupId> <artifactId>integration</artifactId> <version>3.0.0</version> - <relativePath/> + <relativePath /> </parent> <groupId>org.onap.policy.models</groupId> @@ -46,7 +48,7 @@ <sonar.jacoco.itReportPath>${project.basedir}/../target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath> <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis> - <policy.common.version>1.5.0</policy.common.version> + <policy.common.version>1.5.1-SNAPSHOT</policy.common.version> </properties> <modules> @@ -134,6 +136,12 @@ <groupId>org.eclipse.persistence</groupId> <artifactId>eclipselink</artifactId> </dependency> + <dependency> + <groupId>org.onap.policy.common</groupId> + <artifactId>utils-test</artifactId> + <version>${policy.common.version}</version> + <scope>test</scope> + </dependency> </dependencies> <dependencyManagement> @@ -267,7 +275,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore/> + <ignore /> </action> </pluginExecution> </pluginExecutions> |