JUnit additions and powermock pom fixes

Issue-ID: POLICY-602
Change-Id: I2484b47cc52a07413de69c1022a056fd0cf2d7d7
Signed-off-by: bobbymander <bobby.mander@att.com>

3 files changed, 103 insertions, 23 deletions

diff --git a/ONAP-XACML/pom.xml b/ONAP-XACML/pom.xml
index b6f12c005..8bfa06b35 100644
--- a/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@ -32,6 +32,25 @@
 	<artifactId>ONAP-XACML</artifactId>
 	<packaging>jar</packaging>
 	<dependencies>
+		<!-- https://mvnrepository.com/artifact/org.powermock/powermock-api-mockito -->
+		<dependency>
+    		<groupId>org.powermock</groupId>
+    		<artifactId>powermock-api-mockito</artifactId>
+    		<version>1.7.3</version>
+    		<scope>test</scope>
+		</dependency>
+		<dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>1.7.3</version>
+            <scope>test</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>  
 		<dependency>
 			<groupId>org.onap.policy.engine</groupId>
 			<version>${project.version}</version>
@@ -59,11 +78,6 @@
 			<scope>test</scope>
 		</dependency> 
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>2.7.22</version>
-		</dependency>  
-		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-mock</artifactId>
 			<version>2.0.8</version>
diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
index 3fa49551b..500136fc0 100644
--- a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdEngineFactoryTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-XACML
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 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,32 +20,55 @@
 package org.onap.policy.xacml.test.std.pap;
 
 import static org.junit.Assert.assertTrue;
-
+import static org.junit.Assert.fail;
 import java.io.IOException;
 import java.util.Properties;
-
 import org.junit.Test;
 import org.onap.policy.xacml.std.pap.StdEngineFactory;
-
 import com.att.research.xacml.api.pap.PAPException;
+import com.att.research.xacml.std.pap.StdEngine;
 import com.att.research.xacml.util.FactoryException;
 
 public class StdEngineFactoryTest {
+  @Test
+  public void testStdEngineFactory() throws FactoryException, PAPException, IOException {
+    StdEngineFactory stdFactory = new StdEngineFactory();
+    System.setProperty("xacml.pap.pdps", "src/test/resources/pdps");
+    assertTrue(stdFactory.newEngine() != null);
+    Properties properties = new Properties();
+    properties.setProperty("xacml.pap.pdps", "src/test/resources/pdps");
+    assertTrue(stdFactory.newEngine(properties) != null);
+
+    StdEngineFactory stdFactoryNew = new StdEngineFactory();
+    System.setProperty("xacml.pap.pdps", "src/test/resources/pdpstest");
+    assertTrue(stdFactoryNew.newEngine() != null);
+  }
+
+  @Test
+  public void testNegativeCase() throws FactoryException, PAPException {
+    // Setup test data
+    Properties props = new Properties();
+    props.setProperty(StdEngine.PROP_PAP_REPO, "/tmp");
 
+    // Set the system property temporarily
+    String systemKey = StdEngine.PROP_PAP_REPO;
+    String oldProperty = System.getProperty(systemKey);
+    System.setProperty(systemKey, "/tmp");
 
-	@Test
-	public void testStdEngineFactory() throws FactoryException, PAPException, IOException{
-		
-		StdEngineFactory stdFactory = new StdEngineFactory();
-		System.setProperty("xacml.pap.pdps", "src/test/resources/pdps");
-		assertTrue(stdFactory.newEngine() != null);
-		Properties properties = new Properties();
-		properties.setProperty("xacml.pap.pdps", "src/test/resources/pdps");
-		assertTrue(stdFactory.newEngine(properties) != null);
-		
-		StdEngineFactory stdFactoryNew = new StdEngineFactory();
-		System.setProperty("xacml.pap.pdps", "src/test/resources/pdpstest");
-		assertTrue(stdFactoryNew.newEngine() != null);
+    // Test factory failure cases
+    try {
+      StdEngineFactory factory = new StdEngineFactory();
+      factory.newEngine();
+      factory.newEngine(props);
+    } catch (Exception ex) {
+      fail("Not expecting any exceptions: " + ex);
+    }
 
-	}
+    // Restore the original system property
+    if (oldProperty != null) {
+      System.setProperty(systemKey, oldProperty);
+    } else {
+      System.clearProperty(systemKey);
+    }
+  }
 }
diff --git a/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPItemSetChangeNotifierTest.java b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPItemSetChangeNotifierTest.java
new file mode 100644
index 000000000..1be34ee00
--- /dev/null
+++ b/ONAP-XACML/src/test/java/org/onap/policy/xacml/test/std/pap/StdPDPItemSetChangeNotifierTest.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-XACML
+ * ================================================================================
+ * Copyright (C) 2018 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.xacml.test.std.pap;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.onap.policy.xacml.api.pap.OnapPDP;
+import org.onap.policy.xacml.api.pap.OnapPDPGroup;
+import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier;
+import org.onap.policy.xacml.std.pap.StdPDPItemSetChangeNotifier.StdItemSetChangeListener;
+
+public class StdPDPItemSetChangeNotifierTest {
+  @Test
+  public void testNotifier() {
+    StdPDPItemSetChangeNotifier notifier = new StdPDPItemSetChangeNotifier();
+    StdItemSetChangeListener listener = Mockito.mock(StdItemSetChangeListener.class);
+    notifier.addItemSetChangeListener(listener);
+    notifier.removeItemSetChangeListener(listener);
+    notifier.fireChanged();
+    OnapPDP pdp = Mockito.mock(OnapPDP.class);
+    notifier.firePDPChanged(pdp);
+    OnapPDPGroup group = Mockito.mock(OnapPDPGroup.class);
+    notifier.firePDPGroupChanged(group);
+  }
+}