From 54800b25c8bcb27725c559e5fe7329dc46daf1a0 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 19 Feb 2018 10:24:33 -0500 Subject: Rename utils-test testXxx() methods Fixed sonar complaints about the testXxx_Yyy() methods in the XxxTester classes. In most cases, they were renamed to testYyy(). The top-level method, test(), was not renamed so-as not to break existing tests that already depend on it. Renamed testStringConstuctor() to testString(). Change-Id: I00e8993c71fa9d9cb83bea82276d9706dd0e7c45 Issue-ID: POLICY-246 Signed-off-by: Jim Hahn --- .../common/utils/test/ConstructionErrorTest.java | 2 +- .../policy/common/utils/test/ErrorsTesterTest.java | 4 ++-- .../common/utils/test/ThrowablesTesterTest.java | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'utils-test/src/test/java/org/onap/policy/common/utils/test') diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/test/ConstructionErrorTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/test/ConstructionErrorTest.java index e88180b9..27387bfd 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/test/ConstructionErrorTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/test/ConstructionErrorTest.java @@ -31,7 +31,7 @@ public class ConstructionErrorTest extends ErrorsTester { @Test public void test() throws Exception { - assertEquals(4, testError(ConstructionError.class)); + assertEquals(4, testAllError(ConstructionError.class)); } } diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/test/ErrorsTesterTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/test/ErrorsTesterTest.java index 2d76f750..60aed22d 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/test/ErrorsTesterTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/test/ErrorsTesterTest.java @@ -28,8 +28,8 @@ public class ErrorsTesterTest { @Test public void test() { - assertEquals(2, new ErrorsTester().testError(SimpleError.class)); - assertEquals(5, new ErrorsTester().testError(StaticError.class)); + assertEquals(2, new ErrorsTester().testAllError(SimpleError.class)); + assertEquals(5, new ErrorsTester().testAllError(StaticError.class)); } /** diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/test/ThrowablesTesterTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/test/ThrowablesTesterTest.java index ea79dba8..cb8c0ef6 100644 --- a/utils-test/src/test/java/org/onap/policy/common/utils/test/ThrowablesTesterTest.java +++ b/utils-test/src/test/java/org/onap/policy/common/utils/test/ThrowablesTesterTest.java @@ -28,50 +28,50 @@ public class ThrowablesTesterTest { @Test public void test() { - assertEquals(2, new ThrowablesTester().testThrowable(SimpleThrowable.class)); - assertEquals(5, new ThrowablesTester().testThrowable(StaticThrowable.class)); + assertEquals(2, new ThrowablesTester().testAllThrowable(SimpleThrowable.class)); + assertEquals(5, new ThrowablesTester().testAllThrowable(StaticThrowable.class)); } @Test public void testNoConstructorsThrowable() { // this will not throw an error, but it should return 0, as there are // no matching constructors - assertEquals(0, new ThrowablesTester().testThrowable(NoConstructorsThrowable.class)); + assertEquals(0, new ThrowablesTester().testAllThrowable(NoConstructorsThrowable.class)); } @Test(expected = AssertionError.class) public void testIgnoreMessageThrowable() { - new ThrowablesTester().testThrowable(IgnoreMessageThrowable.class); + new ThrowablesTester().testAllThrowable(IgnoreMessageThrowable.class); } @Test(expected = AssertionError.class) public void testIgnoreCauseThrowable() { - new ThrowablesTester().testThrowable(IgnoreCauseThrowable.class); + new ThrowablesTester().testAllThrowable(IgnoreCauseThrowable.class); } @Test(expected = AssertionError.class) public void testAlwaysSuppressThrowable() { - new ThrowablesTester().testThrowable(AlwaysSuppressThrowable.class); + new ThrowablesTester().testAllThrowable(AlwaysSuppressThrowable.class); } @Test(expected = AssertionError.class) public void testNeverSuppressThrowable() { - new ThrowablesTester().testThrowable(NeverSuppressThrowable.class); + new ThrowablesTester().testAllThrowable(NeverSuppressThrowable.class); } @Test(expected = AssertionError.class) public void testAlwaysWritableThrowable() { - new ThrowablesTester().testThrowable(AlwaysWritableThrowable.class); + new ThrowablesTester().testAllThrowable(AlwaysWritableThrowable.class); } @Test(expected = AssertionError.class) public void testNeverWritableThrowable() { - new ThrowablesTester().testThrowable(NeverWritableThrowable.class); + new ThrowablesTester().testAllThrowable(NeverWritableThrowable.class); } @Test(expected = ConstructionError.class) public void testThrowInstantiationException() { - new ThrowablesTester().testThrowable(ThrowInstantiationException.class); + new ThrowablesTester().testAllThrowable(ThrowInstantiationException.class); } /** -- cgit 1.2.3-korg