Replace expectException with AssertJ

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

8 files changed, 51 insertions, 83 deletions

diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index 059d1108..87139bc8 100644
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -1,7 +1,7 @@
 <!--
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
-   Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+   Modifications 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.
@@ -194,6 +194,13 @@
             <artifactId>powermock-api-mockito</artifactId>
             <scope>test</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.11.1</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.openpojo</groupId>
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()));
     }
 }
diff --git a/utils-test/pom.xml b/utils-test/pom.xml
index cf5da469..bf36472b 100644
--- a/utils-test/pom.xml
+++ b/utils-test/pom.xml
@@ -2,7 +2,7 @@
   ============LICENSE_START=======================================================
   ONAP Policy Engine - Common Modules
   ================================================================================
-  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.
@@ -42,6 +42,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.11.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
         </dependency>
diff --git a/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java b/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java
index 613897d9..36812b3b 100644
--- a/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java
+++ b/utils-test/src/test/java/org/onap/policy/common/utils/io/SerializerTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine - Common Modules
  * ================================================================================
- * 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.utils.io;
 
+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;
@@ -116,7 +117,7 @@ public class SerializerTest {
             }
         });
 
-        assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(100))));
+        assertThatThrownBy(() -> Serializer.serialize(new MyObject(100))).isEqualTo(ex);
     }
 
     @Test
@@ -133,7 +134,7 @@ public class SerializerTest {
             }
         });
 
-        assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(110))));
+        assertThatThrownBy(() -> Serializer.serialize(new MyObject(110))).isEqualTo(ex);
     }
 
     @Test
@@ -159,7 +160,7 @@ public class SerializerTest {
             }
         });
 
-        assertEquals(ex, expectException(() -> Serializer.serialize(new MyObject(120))));
+        assertThatThrownBy(() -> Serializer.serialize(new MyObject(120))).isEqualTo(ex);
     }
 
     @Test
@@ -206,7 +207,7 @@ public class SerializerTest {
             }
         });
 
-        assertEquals(ex2, expectException(() -> Serializer.serialize(new MyObject(130))));
+        assertThatThrownBy(() -> Serializer.serialize(new MyObject(130))).isEqualTo(ex2);
         
     }
 
@@ -246,7 +247,7 @@ public class SerializerTest {
         });
 
         byte[] data = Serializer.serialize(new MyObject(300));
-        assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+        assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
     }
 
     @Test
@@ -264,7 +265,7 @@ public class SerializerTest {
         });
 
         byte[] data = Serializer.serialize(new MyObject(310));
-        assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+        assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
     }
 
     @Test
@@ -288,7 +289,7 @@ public class SerializerTest {
         });
 
         byte[] data = Serializer.serialize(new MyObject(320));
-        assertEquals(ex, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+        assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex);
     }
 
     @Test
@@ -323,7 +324,7 @@ public class SerializerTest {
         });
 
         byte[] data = Serializer.serialize(new MyObject(330));
-        assertEquals(ex2, expectException(() -> Serializer.deserialize(MyObject.class, data)));
+        assertThatThrownBy(() -> Serializer.deserialize(MyObject.class, data)).isEqualTo(ex2);
     }
 
     @Test
@@ -349,28 +350,6 @@ public class SerializerTest {
     }
 
     /**
-     * Applies a function, which is expected to throw an exception.
-     *
-     * @param func the function to apply
-     * @return the exception thrown by the function, or {@code null} if it did not throw
-     *         an exception
-     */
-    private Exception expectException(RunnerWithEx func) {
-        try {
-            func.apply();
-            return null;
-
-        } catch (Exception ex) {
-            return ex;
-        }
-    }
-
-    @FunctionalInterface
-    private static interface RunnerWithEx {
-        public void apply() throws Exception;
-    }
-
-    /**
      * Simple, serializable object.
      */
     public static class MyObject implements Serializable {