summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mokry <mm117s@att.com>2018-02-15 07:23:11 -0600
committerMichael Mokry <mm117s@att.com>2018-02-15 07:28:07 -0600
commitaee733bc72df351a0e3c4aa4df7807362fb515c1 (patch)
tree726d68df3c00617089640f0055da8b19e15c1baf
parent472f049b84fd69caa1e0a07bbe3e088bbfd0a44d (diff)
Adding Junits in ONAP-PDP-REST
- This commit adds one Junit for PAPServices - I needed to make a minor modification to the PAPServices class in order to set the PAPs Change-Id: Ia54650307e8d9e96d40ce6e68ad18508d4030a4a Issue-ID: POLICY-338 Signed-off-by: Michael Mokry <mm117s@att.com>
-rw-r--r--ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java8
-rw-r--r--ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java79
2 files changed, 85 insertions, 2 deletions
diff --git a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java
index 57a80b5d1..9ab4252c7 100644
--- a/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java
+++ b/ONAP-PDP-REST/src/main/java/org/onap/policy/pdp/rest/api/services/PAPServices.java
@@ -53,9 +53,9 @@ public class PAPServices {
private int responseCode = 0;
private static String environment = "DEVL";
- private static Boolean junit = false;
+ public static Boolean junit = false;
private static List<String> paps = null;
- private static final Object papResourceLock = new Object();
+ private static final Object papResourceLock = new Object();
private String operation = null;
private String requestMethod = null;
private String encoding = null;
@@ -96,6 +96,10 @@ public class PAPServices {
}
return result;
}
+
+ public static void setPaps(List<String> paps) {
+ PAPServices.paps = paps;
+ }
public int getResponseCode() {
return responseCode;
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java
new file mode 100644
index 000000000..13f728790
--- /dev/null
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java
@@ -0,0 +1,79 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-PAP-REST
+ * ================================================================================
+ * 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.pdp.rest.api.services;
+
+import static org.junit.Assert.*;
+
+import java.io.FileInputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.policy.api.PolicyException;
+import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.xacml.std.pap.StdPAPPolicy;
+import org.onap.policy.xacml.std.pap.StdPDPPolicy;
+
+public class PAPServicesTest {
+
+ PAPServices papServices = null;
+
+ @Before
+ public void setUp() throws Exception {
+ PAPServices.junit = true;
+ Properties prop = new Properties();
+ prop.load(new FileInputStream("src/test/resources/pass.xacml.pdp.properties"));
+ String succeeded = prop.getProperty("xacml.rest.pap.url");
+ List<String> paps = Arrays.asList(succeeded.split(","));
+ PAPServices.setPaps(paps);
+ papServices = new PAPServices();
+
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ PAPServices.junit = false;
+ }
+
+ @Test
+ public final void testCallPAP() throws PolicyException {
+ StdPAPPolicy newPAPPolicy = new StdPAPPolicy();
+ String response = null;
+ response = (String) papServices.callPAP(newPAPPolicy, new String[] {"operation=create", "apiflag=api", "policyType=Config"}, UUID.randomUUID(), "Config");
+ assertEquals("success",response);
+ }
+
+ @Test
+ public final void testGetActiveVersion() {
+ String activeVersion = papServices.getActiveVersion("test", "Config_", "test.testpolicy", "Config", UUID.randomUUID());
+ assertNull(activeVersion);
+ }
+
+ @Test
+ public final void testPushPolicy() throws PolicyException {
+ StdPDPPolicy selectedPolicy = papServices.pushPolicy("test", "Config_", "test.testpolicy", "Config", "default", UUID.randomUUID());
+ assertNull(selectedPolicy);
+ }
+
+}