Replace expectException with AssertJ

Change-Id: I73c186f181960ac7ac8cd985e55db1831963910f
Issue-ID: POLICY-1392
Signed-off-by: Jim Hahn <jrh3@att.com>

5 files changed, 26 insertions, 50 deletions

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicFactoryTestBase.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicFactoryTestBase.java
index d68f55e6..71d4fe27 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicFactoryTestBase.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/BusTopicFactoryTestBase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -20,6 +20,7 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -104,12 +105,10 @@ public abstract class BusTopicFactoryTestBase<T extends Topic> extends TopicFact
      */
     public void testBuildBusTopicParams_Ex() {
         // null topic
-        RuntimeException actual = expectException(() -> buildTopic(makeBuilder().topic(null).build()));
-        assertEquals(IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().isThrownBy(() -> buildTopic(makeBuilder().topic(null).build()));
 
         // empty topic
-        actual = expectException(() -> buildTopic(makeBuilder().topic("").build()));
-        assertEquals(IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().isThrownBy(() -> buildTopic(makeBuilder().topic("").build()));
     }
 
     /**
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java
index 440120e6..877246e2 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/DmaapTopicFactoryTestBase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -20,6 +20,7 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
 import static org.onap.policy.common.endpoints.properties.PolicyEndPointProperties.PROPERTY_DMAAP_DME2_EP_CONN_TIMEOUT_SUFFIX;
 import static org.onap.policy.common.endpoints.properties.PolicyEndPointProperties.PROPERTY_DMAAP_DME2_EP_READ_TIMEOUT_MS_SUFFIX;
@@ -116,18 +117,15 @@ public abstract class DmaapTopicFactoryTestBase<T extends Topic> extends BusTopi
     @Override
     public void testGet_Ex() {
         // null topic
-        RuntimeException actual = expectException(() -> getTopic(null));
-        assertEquals("null topic", IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("null topic").isThrownBy(() -> getTopic(null));
 
         // empty topic
-        actual = expectException(() -> getTopic(""));
-        assertEquals("empty topic", IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("empty topic").isThrownBy(() -> getTopic(""));
 
         // unknown topic
         initFactory();
         buildTopics(makePropBuilder().makeTopic(MY_TOPIC).build());
 
-        actual = expectException(() -> getTopic(TOPIC2));
-        assertEquals("unknown topic", IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("unknown topic").isThrownBy(() -> getTopic(TOPIC2));
     }
 }
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactoryTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactoryTest.java
index 2ba6fb3d..82a9df4c 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactoryTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/NoopTopicSinkFactoryTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -20,6 +20,7 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -112,7 +113,7 @@ public class NoopTopicSinkFactoryTest extends TopicFactoryTestBase<NoopTopicSink
         initFactory();
         assertEquals(1, buildTopics(makePropBuilder().makeTopic(MY_TOPIC)
                         .setTopicProperty(PROPERTY_MANAGED_SUFFIX, "false").build()).size());
-        assertNotNull(expectException(() -> factory.get(MY_TOPIC)));
+        assertThatThrownBy(() -> factory.get(MY_TOPIC));
 
         // managed undefined - default to true
         initFactory();
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/TopicFactoryTestBase.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/TopicFactoryTestBase.java
index 29816c6e..419f9506 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/TopicFactoryTestBase.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/TopicFactoryTestBase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -20,10 +20,11 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 import static org.onap.policy.common.endpoints.properties.PolicyEndPointProperties.PROPERTY_TOPIC_SERVERS_SUFFIX;
 
 import java.util.List;
@@ -175,12 +176,10 @@ public abstract class TopicFactoryTestBase<T extends Topic> extends TopicTestBas
      */
     public void testDestroyString_Ex() {
         // null topic
-        RuntimeException actual = expectException(() -> destroyTopic(null));
-        assertEquals(IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("null topic").isThrownBy(() -> destroyTopic(null));
 
         // empty topic
-        actual = expectException(() -> destroyTopic(""));
-        assertEquals(IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("empty topic").isThrownBy(() -> destroyTopic(""));
     }
 
     /**
@@ -210,36 +209,15 @@ public abstract class TopicFactoryTestBase<T extends Topic> extends TopicTestBas
      */
     public void testGet_Ex() {
         // null topic
-        RuntimeException actual = expectException(() -> getTopic(null));
-        assertEquals("null topic", IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("null topic").isThrownBy(() -> getTopic(null));
 
         // empty topic
-        actual = expectException(() -> getTopic(""));
-        assertEquals("empty topic", IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("empty topic").isThrownBy(() -> getTopic(""));
 
         // unknown topic
         initFactory();
         buildTopics(makePropBuilder().makeTopic(MY_TOPIC).build());
 
-        actual = expectException(() -> getTopic(TOPIC2));
-        assertEquals("unknown topic", IllegalStateException.class, actual.getClass());
-    }
-
-    /**
-     * Runs a function that is expected to throw an exception. Invokes fail() if the
-     * function does not throw an exception.
-     *
-     * @param function the function to run
-     * @return the exception thrown by the function
-     */
-    public RuntimeException expectException(Runnable function) {
-        try {
-            function.run();
-            fail("missing exception");
-            return null;
-
-        } catch (RuntimeException e) {
-            return e;
-        }
+        assertThatIllegalStateException().as("unknown topic").isThrownBy(() -> getTopic(TOPIC2));
     }
 }
diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactoryTestBase.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactoryTestBase.java
index fbc2e46b..41dbac8c 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactoryTestBase.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/UebTopicFactoryTestBase.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * policy-endpoints
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 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.
@@ -20,7 +20,7 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus;
 
-import static org.junit.Assert.assertEquals;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 
 import java.util.Collections;
 import org.onap.policy.common.endpoints.event.comm.Topic;
@@ -38,11 +38,11 @@ public abstract class UebTopicFactoryTestBase<T extends Topic> extends BusTopicF
         super.testBuildBusTopicParams_Ex();
 
         // null servers
-        RuntimeException actual = expectException(() -> buildTopic(makeBuilder().servers(null).build()));
-        assertEquals(IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("null servers")
+                        .isThrownBy(() -> buildTopic(makeBuilder().servers(null).build()));
 
         // empty servers
-        actual = expectException(() -> buildTopic(makeBuilder().servers(Collections.emptyList()).build()));
-        assertEquals(IllegalArgumentException.class, actual.getClass());
+        assertThatIllegalArgumentException().as("empty servers")
+                        .isThrownBy(() -> buildTopic(makeBuilder().servers(Collections.emptyList()).build()));
     }
 }