1 files changed, 16 insertions, 3 deletions

diff --git a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.java b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.java
index 0cf1486f..0f09b12e 100644
--- a/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.java
+++ b/policy-endpoints/src/test/java/org/onap/policy/common/endpoints/event/comm/bus/internal/TopicBaseTest.java
@@ -20,6 +20,7 @@
 
 package org.onap.policy.common.endpoints.event.comm.bus.internal;
 
+import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -97,7 +98,7 @@ public class TopicBaseTest extends TopicTestBase {
 
     @Test
     public void testSerialize() {
-        new GsonTestUtils().compareGson(base, TopicBaseTest.class);
+        assertThatCode(() -> new GsonTestUtils().compareGson(base, TopicBaseTest.class)).doesNotThrowAnyException();
     }
 
     @Test
@@ -193,9 +194,15 @@ public class TopicBaseTest extends TopicTestBase {
         assertTrue(base.unlock());
         assertEquals(1, base.startCount);
         assertEquals(1, base.stopCount);
+    }
+
+    /**
+     * Tests lock/unlock when the stop/start methods return false.
+     */
+    @Test
+    public void testLock_testUnlock_FalseReturns() {
 
         // lock, but stop returns false
-        base = new TopicBaseImpl(servers, MY_TOPIC);
         base.stopReturn = false;
         assertFalse(base.lock());
         assertTrue(base.isLocked());
@@ -206,9 +213,15 @@ public class TopicBaseTest extends TopicTestBase {
         assertFalse(base.unlock());
         assertFalse(base.isLocked());
         assertTrue(base.unlock());
+    }
+
+    /**
+     * Tests lock/unlock when the start method throws an exception.
+     */
+    @Test
+    public void testLock_testUnlock_Exception() {
 
         // lock & re-lock, but start throws an exception
-        base = new TopicBaseImpl(servers, MY_TOPIC);
         base.startEx = true;
         assertTrue(base.lock());
         assertFalse(base.unlock());