1 files changed, 106 insertions, 59 deletions

diff --git a/ONAP-REST/src/test/java/org/onap/policy/rest/util/PDPPolicyContainerTest.java b/ONAP-REST/src/test/java/org/onap/policy/rest/util/PDPPolicyContainerTest.java
index 806816b12..457df7062 100644
--- a/ONAP-REST/src/test/java/org/onap/policy/rest/util/PDPPolicyContainerTest.java
+++ b/ONAP-REST/src/test/java/org/onap/policy/rest/util/PDPPolicyContainerTest.java
@@ -19,73 +19,120 @@
  */
 package org.onap.policy.rest.util;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-
 import java.util.HashSet;
-
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.policy.rest.util.PDPPolicyContainer.PDPPolicyItem;
+import org.onap.policy.xacml.std.pap.StdPDP;
 import org.onap.policy.xacml.std.pap.StdPDPGroup;
 import org.onap.policy.xacml.std.pap.StdPDPPolicy;
-
+import com.att.research.xacml.api.pap.PDP;
 import com.att.research.xacml.api.pap.PDPPolicy;
 
 public class PDPPolicyContainerTest {
-	
-	StdPDPGroup group;
-	PDPPolicyContainer container;
-	StdPDPPolicy policy;
-	
-	@Before
-	public void setUp(){
-		group = new StdPDPGroup();
-		group.setDefault(true);
-		group.setDefaultGroup(true);
-		group.setDescription("Test");
-		group.setId("Test");
-		group.setName("Test");
-		group.setOnapPdps(new HashSet<>());
-		group.setOperation("Test");
-		group.setPipConfigs(new HashSet<>());
-		HashSet<PDPPolicy> policies = new HashSet<>();
-		policy = new StdPDPPolicy();
-		policy.setName("Config_test.1.xml");
-		policy.setId("Config_test");
-		policies.add(policy);
-		group.setPolicies(policies);
-		group.setSelectedPolicies(new HashSet<>());
-		container = new PDPPolicyContainer(group);
-	}
+  StdPDPGroup group;
+  PDPPolicyContainer container;
+  StdPDPPolicy policy;
+
+  @Before
+  public void setUp() {
+    group = new StdPDPGroup();
+    group.setDefault(true);
+    group.setDefaultGroup(true);
+    group.setDescription("Test");
+    group.setId("Test");
+    group.setName("Test");
+    group.setOnapPdps(new HashSet<>());
+    group.setOperation("Test");
+    group.setPipConfigs(new HashSet<>());
+    HashSet<PDPPolicy> policies = new HashSet<>();
+    policy = new StdPDPPolicy();
+    policy.setName("Config_test.1.xml");
+    policy.setId("Config_test");
+    policy.setVersion("1.0");
+    policy.setDescription("testDescription");
+    policies.add(policy);
+    group.setPolicies(policies);
+    group.setSelectedPolicies(new HashSet<>());
+    container = new PDPPolicyContainer(group);
+  }
+
+  @Test
+  public void testPDPPolicyContainer() {
+    container.nextItemId(policy);
+    container.prevItemId(policy);
+    container.firstItemId();
+    container.lastItemId();
+    container.isFirstId(policy);
+    container.isLastId(policy);
+    container.addItemAfter(policy);
+    container.getContainerPropertyIds();
+    container.getItemIds();
+    container.getType("Id");
+    assertTrue(String.class.equals(String.class));
+    container.getType("Name");
+    assertTrue(String.class.equals(String.class));
+    container.getType("Version");
+    assertTrue(String.class.equals(String.class));
+    container.getType("Description");
+    assertTrue(String.class.equals(String.class));
+    container.getType("Root");
+    assertTrue(Boolean.class.equals(Boolean.class));
+    assertTrue(container.size() == 1);
+    container.containsId(policy);
+    container.removeItem(policy);
+    container.addContainerProperty(null, null, null);
+    container.removeContainerProperty(policy);
+    container.removeAllItems();
+    container.addItemAt(0);
+  }
+
+  @Test(expected = NullPointerException.class)
+  public void testConstructor() {
+    // Test PDP based constructor
+    PDP pdp = new StdPDP();
+    PDPPolicyContainer container1 = new PDPPolicyContainer(pdp);
+    assertNotNull(container1);
+
+    // Test set based constructor
+    Set<PDPPolicy> set = new HashSet<PDPPolicy>();
+    PDPPolicyContainer container2 = new PDPPolicyContainer(set);
+    assertNotNull(container2);
+
+    // Test object based constructor
+    PDPPolicyContainer container3 = new PDPPolicyContainer("testObject");
+    assertNotNull(container3);
+  }
+
+  @Test(expected = UnsupportedOperationException.class)
+  public void testAddItem() {
+    container.addItem();
+  }
+
+  @Test
+  public void testGetters() {
+    assertNull(container.nextItemId("testItem"));
+    assertNull(container.prevItemId("testItem"));
+    assertNotNull(container.firstItemId());
+    assertNotNull(container.lastItemId());
+    assertEquals(container.indexOfId("testItem"), -1);
+    assertNotNull(container.getIdByIndex(0));
+    assertNotNull(container.getItemIds(0, 1));
+  }
 
-	
-	@Test
-	public void testPDPPolicyContainer(){
-		container.nextItemId(policy);
-		container.prevItemId(policy);
-		container.firstItemId();
-		container.lastItemId();
-		container.isFirstId(policy);
-		container.isLastId(policy);
-		container.addItemAfter(policy);
-		container.getContainerPropertyIds();
-		container.getItemIds();
-		container.getType("Id");
-		assertTrue(String.class.equals(String.class));
-		container.getType("Name");
-		assertTrue(String.class.equals(String.class));
-		container.getType("Version");
-		assertTrue(String.class.equals(String.class));
-		container.getType("Description");
-		assertTrue(String.class.equals(String.class));
-		container.getType("Root");
-		assertTrue(Boolean.class.equals(Boolean.class));
-		assertTrue(container.size() == 1);
-		container.containsId(policy);
-		container.removeItem(policy);
-		container.addContainerProperty(null, null, null);
-		container.removeContainerProperty(policy);
-		container.removeAllItems();
-		container.addItemAt(0);
-		
-	}
+  @Test
+  public void testPDPPolicyItem() {
+    PDPPolicyItem item = container.new PDPPolicyItem(policy);
+    assertEquals(item.getId(), "Config_test");
+    assertEquals(item.getName(), "Config_test.1.xml");
+    assertEquals(item.getVersion(), "1.0");
+    assertEquals(item.getDescription(), "testDescription");
+    item.setRoot(true);
+    assertEquals(item.getRoot(), true);
+  }
 }