From f6658bcf0374eaf2efa8e5a7c6fb135ced67d44c Mon Sep 17 00:00:00 2001 From: Parshad Patel Date: Fri, 23 Nov 2018 15:41:03 +0900 Subject: Rename test classes in policy/common Make test classes name consistence Issue-ID: POLICY-1281 Change-Id: I2d70eda0a2fe7dc60e020dd91c743c1708d1f11a Signed-off-by: Parshad Patel --- .../exception/BasicPropertyExceptionTester.java | 131 --------------------- .../exception/PropertyAccessExceptionTest.java | 2 +- .../exception/PropertyAnnotationExceptionTest.java | 2 +- .../exception/PropertyExceptionTest.java | 2 +- .../exception/PropertyInvalidExceptionTest.java | 2 +- .../exception/PropertyMissingExceptionTest.java | 2 +- .../SupportBasicPropertyExceptionTester.java | 131 +++++++++++++++++++++ 7 files changed, 136 insertions(+), 136 deletions(-) delete mode 100644 utils/src/test/java/org/onap/policy/common/utils/properties/exception/BasicPropertyExceptionTester.java create mode 100644 utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/BasicPropertyExceptionTester.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/BasicPropertyExceptionTester.java deleted file mode 100644 index c972e648..00000000 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/BasicPropertyExceptionTester.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP Policy Engine - Common Modules - * ================================================================================ - * Copyright (C) 2018 AT&T Intellectual Property. 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. - * ============LICENSE_END========================================================= - */ - -package org.onap.policy.common.utils.properties.exception; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThat; - -import org.hamcrest.CoreMatchers; - -/** - * Superclass used to test subclasses of {@link PropertyException}. - */ -public class BasicPropertyExceptionTester { - - /** - * The "message" that's passed each time an exception is constructed. - */ - protected static final String MESSAGE = "some error"; - - /** - * The "throwable" that's passed each time an exception is constructed. - */ - protected static final Throwable THROWABLE = new Throwable(); - - /** - * Name of the "property" to be passed each time an exception is constructed. - */ - protected static final String PROPERTY = "myName"; - - /** - * Name of the "property" field. - */ - protected static final String FIELD = "PROPERTY"; - - /* - * Methods to perform various tests on the except subclass. - */ - - protected void doTestPropertyExceptionStringField_AllPopulated(PropertyException ex) { - standardTests(ex); - } - - protected void doTestPropertyExceptionStringField_NullProperty(PropertyException ex) { - assertEquals(null, ex.getPropertyName()); - assertEquals(FIELD, ex.getFieldName()); - assertNotNull(ex.getMessage()); - assertNotNull(ex.toString()); - } - - protected void doTestPropertyExceptionStringField_NullField(PropertyException ex) { - assertEquals(PROPERTY, ex.getPropertyName()); - assertEquals(null, ex.getFieldName()); - assertNotNull(ex.getMessage()); - assertNotNull(ex.toString()); - } - - protected void doTestPropertyExceptionStringField_BothNull(PropertyException ex) { - assertEquals(null, ex.getPropertyName()); - assertEquals(null, ex.getFieldName()); - assertNotNull(ex.getMessage()); - assertNotNull(ex.toString()); - } - - protected void doTestPropertyExceptionStringFieldString(PropertyException ex) { - standardTests(ex); - standardMessageTests(ex); - } - - protected void doTestPropertyExceptionStringFieldThrowable(PropertyException ex) { - standardTests(ex); - standardThrowableTests(ex); - } - - protected void doTestPropertyExceptionStringFieldStringThrowable(PropertyException ex) { - standardTests(ex); - standardMessageTests(ex); - standardThrowableTests(ex); - } - - /** - * Performs standard tests that should apply to all subclasses. - * - * @param ex exception to test - */ - protected void standardTests(PropertyException ex) { - assertEquals(PROPERTY, ex.getPropertyName()); - assertEquals(FIELD, ex.getFieldName()); - assertNotNull(ex.getMessage()); - assertNotNull(ex.toString()); - } - - /** - * Performs standard tests for exceptions that were provided a message in their - * constructor. - * - * @param ex exception to test - */ - protected void standardMessageTests(PropertyException ex) { - assertThat(ex.getMessage(), CoreMatchers.endsWith(MESSAGE)); - } - - /** - * Performs standard tests for exceptions that were provided a throwable in their - * constructor. - * - * @param ex exception to test - */ - protected void standardThrowableTests(PropertyException ex) { - assertEquals(THROWABLE, ex.getCause()); - } - -} diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java index 57581d9e..190fddd5 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAccessExceptionTest.java @@ -25,7 +25,7 @@ import org.junit.Test; /** * Test class for PropertyAccessException. */ -public class PropertyAccessExceptionTest extends BasicPropertyExceptionTester { +public class PropertyAccessExceptionTest extends SupportBasicPropertyExceptionTester { /** * Test method for diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java index 934ca026..c4803912 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyAnnotationExceptionTest.java @@ -25,7 +25,7 @@ import org.junit.Test; /** * Test class for PropertyAnnotationException. */ -public class PropertyAnnotationExceptionTest extends BasicPropertyExceptionTester { +public class PropertyAnnotationExceptionTest extends SupportBasicPropertyExceptionTester { /** * Test method for diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java index a0d4645f..9055aeb7 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyExceptionTest.java @@ -25,7 +25,7 @@ import org.junit.Test; /** * Test class for PropertyException. */ -public class PropertyExceptionTest extends BasicPropertyExceptionTester { +public class PropertyExceptionTest extends SupportBasicPropertyExceptionTester { /** * Test method for diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java index ce7be108..69ab1bd3 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyInvalidExceptionTest.java @@ -25,7 +25,7 @@ import org.junit.Test; /** * Test class for PropertyInvalidException. */ -public class PropertyInvalidExceptionTest extends BasicPropertyExceptionTester { +public class PropertyInvalidExceptionTest extends SupportBasicPropertyExceptionTester { /** * Test method for diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java index 320a0c23..81a7c36a 100644 --- a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/PropertyMissingExceptionTest.java @@ -25,7 +25,7 @@ import org.junit.Test; /** * Test class for PropertyMissingException. */ -public class PropertyMissingExceptionTest extends BasicPropertyExceptionTester { +public class PropertyMissingExceptionTest extends SupportBasicPropertyExceptionTester { /** * Test method for diff --git a/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java new file mode 100644 index 00000000..97503f8c --- /dev/null +++ b/utils/src/test/java/org/onap/policy/common/utils/properties/exception/SupportBasicPropertyExceptionTester.java @@ -0,0 +1,131 @@ +/* + * ============LICENSE_START======================================================= + * ONAP Policy Engine - Common Modules + * ================================================================================ + * Copyright (C) 2018 AT&T Intellectual Property. 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.policy.common.utils.properties.exception; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + +import org.hamcrest.CoreMatchers; + +/** + * Superclass used to test subclasses of {@link PropertyException}. + */ +public class SupportBasicPropertyExceptionTester { + + /** + * The "message" that's passed each time an exception is constructed. + */ + protected static final String MESSAGE = "some error"; + + /** + * The "throwable" that's passed each time an exception is constructed. + */ + protected static final Throwable THROWABLE = new Throwable(); + + /** + * Name of the "property" to be passed each time an exception is constructed. + */ + protected static final String PROPERTY = "myName"; + + /** + * Name of the "property" field. + */ + protected static final String FIELD = "PROPERTY"; + + /* + * Methods to perform various tests on the except subclass. + */ + + protected void doTestPropertyExceptionStringField_AllPopulated(PropertyException ex) { + standardTests(ex); + } + + protected void doTestPropertyExceptionStringField_NullProperty(PropertyException ex) { + assertEquals(null, ex.getPropertyName()); + assertEquals(FIELD, ex.getFieldName()); + assertNotNull(ex.getMessage()); + assertNotNull(ex.toString()); + } + + protected void doTestPropertyExceptionStringField_NullField(PropertyException ex) { + assertEquals(PROPERTY, ex.getPropertyName()); + assertEquals(null, ex.getFieldName()); + assertNotNull(ex.getMessage()); + assertNotNull(ex.toString()); + } + + protected void doTestPropertyExceptionStringField_BothNull(PropertyException ex) { + assertEquals(null, ex.getPropertyName()); + assertEquals(null, ex.getFieldName()); + assertNotNull(ex.getMessage()); + assertNotNull(ex.toString()); + } + + protected void doTestPropertyExceptionStringFieldString(PropertyException ex) { + standardTests(ex); + standardMessageTests(ex); + } + + protected void doTestPropertyExceptionStringFieldThrowable(PropertyException ex) { + standardTests(ex); + standardThrowableTests(ex); + } + + protected void doTestPropertyExceptionStringFieldStringThrowable(PropertyException ex) { + standardTests(ex); + standardMessageTests(ex); + standardThrowableTests(ex); + } + + /** + * Performs standard tests that should apply to all subclasses. + * + * @param ex exception to test + */ + protected void standardTests(PropertyException ex) { + assertEquals(PROPERTY, ex.getPropertyName()); + assertEquals(FIELD, ex.getFieldName()); + assertNotNull(ex.getMessage()); + assertNotNull(ex.toString()); + } + + /** + * Performs standard tests for exceptions that were provided a message in their + * constructor. + * + * @param ex exception to test + */ + protected void standardMessageTests(PropertyException ex) { + assertThat(ex.getMessage(), CoreMatchers.endsWith(MESSAGE)); + } + + /** + * Performs standard tests for exceptions that were provided a throwable in their + * constructor. + * + * @param ex exception to test + */ + protected void standardThrowableTests(PropertyException ex) { + assertEquals(THROWABLE, ex.getCause()); + } + +} -- cgit 1.2.3-korg