1 files changed, 35 insertions, 22 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 efd3e304..0b7e46ca 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
@@ -27,6 +27,9 @@ 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 {
 
@@ -34,47 +37,57 @@ public class TestParameterService {
     public void testParameterService() {
         ParameterService.clear();
 
-        assertFalse(ParameterService.existsParameters(LegalParameters.class));
+        assertFalse(ParameterService.contains("EmptyGroup"));
         try {
-            ParameterService.getParameters(LegalParameters.class);
+            ParameterService.get("EmptyGroup");
             fail("Test should throw an exception here");
         } catch (final Exception e) {
-            assertEquals(
-                    "Parameters for org.onap.policy.common.parameters.LegalParameters not found in parameter service",
-                    e.getMessage());
+            assertEquals("\"EmptyGroup\" not found in parameter service", e.getMessage());
         }
 
-        ParameterService.registerParameters(new LegalParameters());
-        assertTrue(ParameterService.existsParameters(LegalParameters.class));
-        assertNotNull(ParameterService.getParameters(LegalParameters.class));
+        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());
+        }
+
+        ParameterService.deregister("Empty Group");
+        assertFalse(ParameterService.contains("Empty Group"));
 
-        ParameterService.deregisterParameters(LegalParameters.class);
+        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());
+        }
 
-        assertFalse(ParameterService.existsParameters(LegalParameters.class));
         try {
-            ParameterService.getParameters(LegalParameters.class);
+            ParameterService.get("Empty Group");
             fail("Test should throw an exception here");
         } catch (final Exception e) {
-            assertEquals(
-                    "Parameters for org.onap.policy.common.parameters.LegalParameters not found in parameter service",
-                    e.getMessage());
+            assertEquals("\"Empty Group\" not found in parameter service", e.getMessage());
         }
 
-        ParameterService.registerParameters(new LegalParameters());
-        assertTrue(ParameterService.existsParameters(LegalParameters.class));
-        assertNotNull(ParameterService.getParameters(LegalParameters.class));
+        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.existsParameters(LegalParameters.class));
+        assertFalse(ParameterService.contains("Empty Group"));
         try {
-            ParameterService.getParameters(LegalParameters.class);
+            ParameterService.get("Empty Group");
             fail("Test should throw an exception here");
         } catch (final Exception e) {
-            assertEquals(
-                    "Parameters for org.onap.policy.common.parameters.LegalParameters not found in parameter service",
-                    e.getMessage());
+            assertEquals("\"Empty Group\" not found in parameter service", e.getMessage());
         }
     }
 }