From 95751fdf0e69dec1c2850136447679ac344c9230 Mon Sep 17 00:00:00 2001 From: ramverma Date: Tue, 28 Aug 2018 14:09:39 +0100 Subject: Adding usage of openpojo in policy common * Changing TestHealthCheckReport to use openpojo for testing the HealthCheckReport class. * Adding a custom Tester implementation called ToStringTester as a utility to test toString() method of classes using openpojo. Change-Id: I491a23c471d50454b4d5591c6c09c6758e2c0624 Issue-ID: POLICY-1035 Signed-off-by: ramverma --- policy-endpoints/pom.xml | 5 + .../endpoints/report/TestHealthCheckReport.java | 38 ++-- utils/pom.xml | 222 +++++++++++---------- .../common/utils/validation/ToStringTester.java | 65 ++++++ 4 files changed, 200 insertions(+), 130 deletions(-) create mode 100644 utils/src/main/java/org/onap/policy/common/utils/validation/ToStringTester.java diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml index fb546a5a..aedb56d8 100644 --- a/policy-endpoints/pom.xml +++ b/policy-endpoints/pom.xml @@ -189,6 +189,11 @@ test + + com.openpojo + openpojo + + diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/report/TestHealthCheckReport.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/report/TestHealthCheckReport.java index 72bae0cf..fd4cefb0 100644 --- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/report/TestHealthCheckReport.java +++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/report/TestHealthCheckReport.java @@ -20,9 +20,16 @@ package org.onap.policy.common.endpoints.report; -import static org.junit.Assert.assertEquals; +import com.openpojo.reflection.filters.FilterClassName; +import com.openpojo.validation.Validator; +import com.openpojo.validation.ValidatorBuilder; +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; /** * Class to perform unit test of HealthCheckReport. @@ -32,28 +39,11 @@ import org.junit.Test; public class TestHealthCheckReport { @Test - public void testReport() { - final String name = "Policy"; - final String url = "self"; - final boolean healthy = true; - final int code = 200; - final String message = "alive"; - final HealthCheckReport report = new HealthCheckReport(); - report.setName(name); - report.setUrl(url); - report.setHealthy(healthy); - report.setCode(code); - report.setMessage(message); - validateReport(name, url, healthy, code, message, report); - } - - private void validateReport(final String name, final String url, final boolean healthy, final int code, - final String message, final HealthCheckReport report) { - assertEquals(name, report.getName()); - assertEquals(url, report.getUrl()); - assertEquals(healthy, report.isHealthy()); - assertEquals(code, report.getCode()); - assertEquals(message, report.getMessage()); - assertEquals("Report [name=Policy, url=self, healthy=true, code=200, message=alive]", report.toString()); + public void testHealthCheckReport() { + final Validator validator = + ValidatorBuilder.create().with(new GetterMustExistRule()).with(new SetterMustExistRule()) + .with(new GetterTester()).with(new SetterTester()).with(new ToStringTester()).build(); + validator.validate(HealthCheckReport.class.getPackage().getName(), + new FilterClassName(HealthCheckReport.class.getName())); } } diff --git a/utils/pom.xml b/utils/pom.xml index 73fab751..8285a373 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -19,111 +19,121 @@ --> - 4.0.0 - - - org.onap.policy.common - common-modules - 1.3.0-SNAPSHOT - - - utils - Common Utilities - jar - - - 1.6.6 - 1.7.25 - - - - - org.apache.commons - commons-lang3 - 3.4 - - - junit - junit - test - - - javax.persistence - persistence-api - provided - - - org.slf4j - slf4j-api - provided - - - org.powermock - powermock-api-mockito - ${powermock.version} - test - - - org.powermock - powermock-module-junit4 - ${powermock.version} - test - - - junit - junit - - - org.powermock - powermock-core - - - org.powermock - powermock-reflect - - - org.javassist - javassist - - - - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + + org.onap.policy.common + common-modules + 1.3.0-SNAPSHOT + + + utils + Common Utilities + jar + + + 1.6.6 + 1.7.25 + + + + + org.apache.commons + commons-lang3 + 3.4 + + + junit + junit + test + + + javax.persistence + persistence-api + provided + + + org.slf4j + slf4j-api + provided + + + org.powermock + powermock-api-mockito + ${powermock.version} + test + + + org.powermock + powermock-module-junit4 + ${powermock.version} + test + + + junit + junit + + + org.powermock + powermock-core + + + org.powermock + powermock-reflect + + + org.javassist + javassist + + + + + com.openpojo + openpojo + compile + + + org.hamcrest + hamcrest-core + 1.3 + + - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.jacoco - - jacoco-maven-plugin - - - [0.7.1.201405082137,) - - - prepare-agent - - - - - - - - - - - - - + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.jacoco + + jacoco-maven-plugin + + + [0.7.1.201405082137,) + + + prepare-agent + + + + + + + + + + + + + diff --git a/utils/src/main/java/org/onap/policy/common/utils/validation/ToStringTester.java b/utils/src/main/java/org/onap/policy/common/utils/validation/ToStringTester.java new file mode 100644 index 00000000..9e73a3f4 --- /dev/null +++ b/utils/src/main/java/org/onap/policy/common/utils/validation/ToStringTester.java @@ -0,0 +1,65 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2018 Ericsson. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.common.utils.validation; + +import static org.hamcrest.CoreMatchers.anyOf; +import static org.hamcrest.CoreMatchers.anything; + +import com.openpojo.reflection.PojoClass; +import com.openpojo.validation.affirm.Affirm; +import com.openpojo.validation.test.Tester; +import com.openpojo.validation.utils.ValidationHelper; + +import org.hamcrest.Matcher; + + +/** + * Class to provide toString testing utility for testing pojo classes. + * + * @author Ram Krishna Verma (ram.krishna.verma@ericsson.com) + */ +@SuppressWarnings("rawtypes") +public class ToStringTester implements Tester { + + private final Matcher m; + + public ToStringTester() { + m = anything(); + } + + public ToStringTester(final Matcher m) { + this.m = m; + } + + @SuppressWarnings("unchecked") + @Override + public void run(final PojoClass pojoClass) { + final Class clazz = pojoClass.getClazz(); + if (anyOf(m).matches(clazz)) { + final Object classInstance = ValidationHelper.getBasicInstance(pojoClass); + + Affirm.affirmFalse("Found default toString output", + classInstance.toString().matches(Object.class.getName() + "@" + "\\w+")); + } + + } + +} -- cgit 1.2.3-korg