From 1b04bb3deccf782523b63978c82676c9826bebcc Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 8 Feb 2019 13:38:53 -0500 Subject: Replace PolicyAssert with assertj Removed PolicyAssert from utils-test, as its functionality is superseded by assertj. Change-Id: Ie7620fea98cd368a8ce4f8511e8e88f291013cff Issue-ID: POLICY-1392 Signed-off-by: Jim Hahn --- .../policy/common/utils/test/PolicyAssert.java | 64 ---------------- .../policy/common/utils/test/PolicyAssertTest.java | 85 ---------------------- 2 files changed, 149 deletions(-) delete mode 100644 utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java delete mode 100644 utils-test/src/test/java/org/onap/policy/common/utils/test/PolicyAssertTest.java diff --git a/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java b/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java deleted file mode 100644 index 43bb7792..00000000 --- a/utils-test/src/main/java/org/onap/policy/common/utils/test/PolicyAssert.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * ONAP - * ================================================================================ - * 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.test; - -public class PolicyAssert { - - /** - * Should not instantiate this. - */ - private PolicyAssert() { - // do nothing - } - - /** - * Invokes a function that is expected to throw an exception. - * - * @param clazz class of exception that is expected - * @param func function - * @return the exception that was thrown - * @throws AssertionError if the function does not throw an exception or throws the - * wrong type of exception - */ - public static T assertThrows(Class clazz, RunnableWithEx func) { - try { - func.run(); - - } catch (Throwable thrown) { - try { - return clazz.cast(thrown); - - } catch (ClassCastException thrown2) { - throw new AssertionError("incorrect exception type", thrown2); - } - } - - throw new AssertionError("missing exception"); - } - - /** - * Runnable that may throw an exception. - */ - @FunctionalInterface - public static interface RunnableWithEx { - public void run() throws Throwable; - } -} diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/test/PolicyAssertTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/test/PolicyAssertTest.java deleted file mode 100644 index f41d7b3a..00000000 --- a/utils-test/src/test/java/org/onap/policy/common/utils/test/PolicyAssertTest.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Common Utils-Test - * ================================================================================ - * 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.test; - -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.onap.policy.common.utils.test.PolicyAssert.assertThrows; - -import org.junit.Test; - -public class PolicyAssertTest { - - private static final String EXPECTED = "expected exception"; - - @Test - public void test_ExpectedEx() { - // exact type - assertThrows(IllegalArgumentException.class, () -> { - throw new IllegalArgumentException(EXPECTED); - }); - - // cast to superclass is supported - assertThrows(RuntimeException.class, () -> { - throw new IllegalArgumentException(EXPECTED); - }); - - // supports errors - assertThrows(LinkageError.class, () -> { - throw new LinkageError(EXPECTED); - }); - - // supports any throwable - assertThrows(Throwable.class, () -> { - throw new Throwable(EXPECTED); - }); - } - - @Test - public void test_IncorrectEx() { - try { - assertThrows(IllegalStateException.class, () -> { - throw new IllegalArgumentException(EXPECTED); - }); - - } catch (AssertionError err) { - assertTrue(err.getMessage().contains("incorrect exception type")); - return; - } - - fail("test failed for incorrect exception type"); - } - - @Test - public void test_MissingEx() { - try { - assertThrows(IllegalArgumentException.class, () -> { - }); - - } catch (AssertionError err) { - assertTrue(err.getMessage().contains("missing exception")); - return; - } - - fail("test failed for missing exception"); - } - -} -- cgit 1.2.3-korg