1 files changed, 47 insertions, 72 deletions
diff --git a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestParameterService.java b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestParameterService.java
index 2dad4283..fda37816 100644
--- a/common-parameters/src/test/java/org/onap/policy/common/parameters/TestParameterService.java
+++ b/common-parameters/src/test/java/org/onap/policy/common/parameters/TestParameterService.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2018 Ericsson. All rights reserved.
+ *  Modifications Copyright (C) 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,99 +21,73 @@
 
 package org.onap.policy.common.parameters;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.onap.policy.common.parameters.ParameterRuntimeException;
-import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.common.parameters.testclasses.EmptyParameterGroup;
 
 public class TestParameterService {
+    private static final String EMPTY_GROUP = "Empty Group";
 
     @Test
     public void testParameterService() {
         ParameterService.clear();
 
         assertFalse(ParameterService.contains("EmptyGroup"));
-        try {
-            ParameterService.get("EmptyGroup");
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("\"EmptyGroup\" not found in parameter service", e.getMessage());
-        }
-
-        ParameterService.register(new EmptyParameterGroup("Empty Group"));
-        assertTrue(ParameterService.contains("Empty Group"));
-        assertNotNull(ParameterService.get("Empty Group"));
-        
-        try {
-            ParameterService.register(new EmptyParameterGroup("Empty Group"));
-            fail("this test should throw an exception");
-        }
-        catch (ParameterRuntimeException e) {
-            assertEquals("\"Empty Group\" already registered in parameter service", e.getMessage());
-        }
-
-        try {
-            ParameterService.register(new EmptyParameterGroup("Empty Group"), false);
-            fail("this test should throw an exception");
-        }
-        catch (ParameterRuntimeException e) {
-            assertEquals("\"Empty Group\" already registered in parameter service", e.getMessage());
-        }
-
-        ParameterService.register(new EmptyParameterGroup("Empty Group"), true);
-        assertTrue(ParameterService.contains("Empty Group"));
-
-        ParameterService.deregister("Empty Group");
-        assertFalse(ParameterService.contains("Empty Group"));
-
-        ParameterService.register(new EmptyParameterGroup("Empty Group"), true);
-        assertTrue(ParameterService.contains("Empty Group"));
-
-        ParameterService.deregister("Empty Group");
-        assertFalse(ParameterService.contains("Empty Group"));
-
-        EmptyParameterGroup epg = new EmptyParameterGroup("Empty Group");
+
+        assertThatThrownBy(() -> ParameterService.get("EmptyGroup"))
+                        .hasMessage("\"EmptyGroup\" not found in parameter service");
+
+        ParameterService.register(new EmptyParameterGroup(EMPTY_GROUP));
+        assertTrue(ParameterService.contains(EMPTY_GROUP));
+        assertNotNull(ParameterService.get(EMPTY_GROUP));
+
+        assertThatThrownBy(() -> ParameterService.register(new EmptyParameterGroup(EMPTY_GROUP)))
+                        .hasMessage("\"Empty Group\" already registered in parameter service");
+
+        assertThatThrownBy(() -> ParameterService.register(new EmptyParameterGroup(EMPTY_GROUP), false))
+                        .hasMessage("\"Empty Group\" already registered in parameter service");
+
+        ParameterService.register(new EmptyParameterGroup(EMPTY_GROUP), true);
+        assertTrue(ParameterService.contains(EMPTY_GROUP));
+
+        ParameterService.deregister(EMPTY_GROUP);
+        assertFalse(ParameterService.contains(EMPTY_GROUP));
+
+        ParameterService.register(new EmptyParameterGroup(EMPTY_GROUP), true);
+        assertTrue(ParameterService.contains(EMPTY_GROUP));
+
+        ParameterService.deregister(EMPTY_GROUP);
+        assertFalse(ParameterService.contains(EMPTY_GROUP));
+
+        EmptyParameterGroup epg = new EmptyParameterGroup(EMPTY_GROUP);
         ParameterService.register(epg);
-        assertTrue(ParameterService.contains("Empty Group"));
-        assertNotNull(ParameterService.get("Empty Group"));
+        assertTrue(ParameterService.contains(EMPTY_GROUP));
+        assertNotNull(ParameterService.get(EMPTY_GROUP));
 
         ParameterService.deregister(epg);
-        assertFalse(ParameterService.contains("Empty Group"));
-
-        try {
-            ParameterService.deregister("Empty Group");
-            fail("this test should throw an exception");
-        }
-        catch (ParameterRuntimeException e) {
-            assertEquals("\"Empty Group\" not registered in parameter service", e.getMessage());
-        }
-
-        try {
-            ParameterService.get("Empty Group");
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("\"Empty Group\" not found in parameter service", e.getMessage());
-        }
-
-        ParameterService.register(new EmptyParameterGroup("Empty Group"));
-        assertTrue(ParameterService.contains("Empty Group"));
-        assertNotNull(ParameterService.get("Empty Group"));
+        assertFalse(ParameterService.contains(EMPTY_GROUP));
+
+        assertThatThrownBy(() -> ParameterService.deregister(EMPTY_GROUP))
+                        .hasMessage("\"Empty Group\" not registered in parameter service");
+
+        assertThatThrownBy(() -> ParameterService.get(EMPTY_GROUP))
+                        .hasMessage("\"Empty Group\" not found in parameter service");
+
+        ParameterService.register(new EmptyParameterGroup(EMPTY_GROUP));
+        assertTrue(ParameterService.contains(EMPTY_GROUP));
+        assertNotNull(ParameterService.get(EMPTY_GROUP));
 
         assertEquals(1, ParameterService.getAll().size());
         ParameterService.clear();
         assertEquals(0, ParameterService.getAll().size());
-        assertFalse(ParameterService.contains("Empty Group"));
-        try {
-            ParameterService.get("Empty Group");
-            fail("Test should throw an exception here");
-        } catch (final Exception e) {
-            assertEquals("\"Empty Group\" not found in parameter service", e.getMessage());
-        }
+        assertFalse(ParameterService.contains(EMPTY_GROUP));
+
+        assertThatThrownBy(() -> ParameterService.get(EMPTY_GROUP))
+                        .hasMessage("\"Empty Group\" not found in parameter service");
     }
 }