Consolidate PolicyRestAdapter setup

[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / xacml / rest / XACMLPapServletTest.java

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java
index 3630889..8e93ee4 100644 (file)
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/XACMLPapServletTest.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-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.
  * 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.
@@ -22,48 +22,48 @@ package org.onap.policy.pap.xacml.rest;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+
 import org.junit.Test;
 import org.onap.policy.pap.xacml.rest.XACMLPapServlet;
 
 public class XACMLPapServletTest {
-       @Test
-       public void testSetAndGet() {
-               String systemKey = "xacml.properties";
-               String testVal = "testVal";
-               XACMLPapServlet servlet = new XACMLPapServlet();
-               
-               // Set the system property temporarily
-               String oldProperty = System.getProperty(systemKey);
-               System.setProperty(systemKey, "xacml.pap.properties");
-                               
-               assertNotNull(XACMLPapServlet.getConfigHome());
-               assertNotNull(XACMLPapServlet.getActionHome());
-               assertEquals(XACMLPapServlet.getPersistenceUnit(), "XACML-PAP-REST");
+    @Test
+    public void testSetAndGet() {
+        String systemKey = "xacml.properties";
+        String testVal = "testVal";
+        XACMLPapServlet servlet = new XACMLPapServlet();
+
+        // Set the system property temporarily
+        String oldProperty = System.getProperty(systemKey);
+        System.setProperty(systemKey, "xacml.pap.properties");
+
+        assertNotNull(XACMLPapServlet.getConfigHome());
+        assertNotNull(XACMLPapServlet.getActionHome());
+        assertEquals(XACMLPapServlet.getPersistenceUnit(), "XACML-PAP-REST");
+
+        // assertNull(XACMLPapServlet.getEmf());
+        // assertNull(XACMLPapServlet.getPDPFile());
+        // assertNull(XACMLPapServlet.getPAPEngine());
+        // assertNull(servlet.getIa());
+
+        XACMLPapServlet.setPapDbDriver(testVal);
+        assertEquals(XACMLPapServlet.getPapDbDriver(), testVal);
+        XACMLPapServlet.setPapDbUrl(testVal);
+        assertEquals(XACMLPapServlet.getPapDbUrl(), testVal);
+        XACMLPapServlet.setPapDbUser(testVal);
+        assertEquals(XACMLPapServlet.getPapDbUser(), testVal);
+        XACMLPapServlet.setPapDbPassword(testVal);
+        assertEquals(XACMLPapServlet.getPapDbPassword(), testVal);
+        XACMLPapServlet.setMsOnapName(testVal);
+        assertEquals(XACMLPapServlet.getMsOnapName(), testVal);
+        XACMLPapServlet.setMsPolicyName(testVal);
+        assertEquals(XACMLPapServlet.getMsPolicyName(), testVal);
 
-               //assertNull(XACMLPapServlet.getEmf());
-               //assertNull(XACMLPapServlet.getPDPFile());
-               //assertNull(XACMLPapServlet.getPAPEngine());
-               //assertNull(servlet.getIa());
-               
-               XACMLPapServlet.setPapDbDriver(testVal);
-               assertEquals(XACMLPapServlet.getPapDbDriver(), testVal);
-               XACMLPapServlet.setPapDbUrl(testVal);
-               assertEquals(XACMLPapServlet.getPapDbUrl(), testVal);
-               XACMLPapServlet.setPapDbUser(testVal);
-               assertEquals(XACMLPapServlet.getPapDbUser(), testVal);
-               XACMLPapServlet.setPapDbPassword(testVal);
-               assertEquals(XACMLPapServlet.getPapDbPassword(), testVal);
-               XACMLPapServlet.setMsOnapName(testVal);
-               assertEquals(XACMLPapServlet.getMsOnapName(), testVal);
-               XACMLPapServlet.setMsPolicyName(testVal);
-               assertEquals(XACMLPapServlet.getMsPolicyName(), testVal);
-               
-               // Restore the original system property
-               if (oldProperty != null) {
-                       System.setProperty(systemKey,  oldProperty);
-               }
-               else {
-                       System.clearProperty(systemKey);
-               }
-       }
+        // Restore the original system property
+        if (oldProperty != null) {
+            System.setProperty(systemKey, oldProperty);
+        } else {
+            System.clearProperty(systemKey);
+        }
+    }
 }