Consolidate PolicyRestAdapter setup

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

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElasticSearchPolicyUpdateTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElasticSearchPolicyUpdateTest.java
index 2b1300c..2b95be0 100644 (file)
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElasticSearchPolicyUpdateTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/elk/ElasticSearchPolicyUpdateTest.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.
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.policy.pap.xacml.rest.elk;
 
 import static org.junit.Assert.assertTrue;
@@ -40,37 +41,36 @@ import org.onap.policy.rest.jpa.ConfigurationDataEntity;
 import org.onap.policy.rest.jpa.PolicyEntity;
 
 public class ElasticSearchPolicyUpdateTest {
-       
-       private static Logger logger = FlexLogger.getLogger(ElasticSearchPolicyUpdateTest.class);
-       private Object policyContent = "";
-       private XACMLPAPTest papTest;
-       
-       @Before
-       public void setUp() throws IOException, ServletException, SQLException{
-               // Set the system property temporarily
-               System.setProperty("PROPERTY_FILE", "src/test/resources/policyelk.properties");
+
+    private static Logger logger = FlexLogger.getLogger(ElasticSearchPolicyUpdateTest.class);
+    private Object policyContent = "";
+    private XACMLPAPTest papTest;
+
+    @Before
+    public void setUp() throws IOException, ServletException, SQLException {
+        // Set the system property temporarily
+        System.setProperty("PROPERTY_FILE", "src/test/resources/policyelk.properties");
         try {
-                       ClassLoader classLoader = getClass().getClassLoader();
-                       policyContent = IOUtils.toString(classLoader.getResourceAsStream("Config_SampleTest1206.1.xml"));
-               } catch (Exception e1) {
-                       logger.error("Exception Occured"+e1);
-               }
+            ClassLoader classLoader = getClass().getClassLoader();
+            policyContent = IOUtils.toString(classLoader.getResourceAsStream("Config_SampleTest1206.1.xml"));
+        } catch (Exception e1) {
+            logger.error("Exception Occured" + e1);
+        }
         papTest = new XACMLPAPTest();
-               papTest.setDBDao();
-       }
-       
-       @Test
-       public void testElasticSearchMainFunction() throws SQLException{
-               ConfigurationDataEntity configurationEntity = new ConfigurationDataEntity();
+        papTest.setDBDao();
+    }
+
+    @Test
+    public void testElasticSearchMainFunction() throws SQLException {
+        ConfigurationDataEntity configurationEntity = new ConfigurationDataEntity();
         configurationEntity.setConfigBody("Sample Test");
         configurationEntity.setConfigType("OTHER");
         configurationEntity.setConfigurationName("com.Config_SampleTest1206.1.txt");
         configurationEntity.setDescription("test");
         configurationEntity.setModifiedBy("Test");
         configurationEntity.setModifiedDate(new Date());
-        
-        
-               PolicyEntity entity = new PolicyEntity();
+
+        PolicyEntity entity = new PolicyEntity();
         entity.setPolicyName("Config_SampleTest.1.xml");
         entity.setPolicyData(policyContent.toString());
         entity.setScope("com");
@@ -84,14 +84,14 @@ public class ElasticSearchPolicyUpdateTest {
         dao.save(configurationEntity);
         dao.save(entity);
         dao.delete(dao.getEntityItem(PolicyEntity.class, "policyName", "Config_SampleTest.1.xml"));
-               ElasticSearchPolicyUpdate.main(null);
-               StringBuilder policyDataString = new StringBuilder();
-               ElasticSearchPolicyUpdate.constructPolicyData(policyContent, policyDataString);
-               assertTrue(policyDataString.toString().contains("onapName"));
-       }
-       
-       @After
-       public void reset(){
-               System.clearProperty("PROPERTY_FILE");
-       }
+        ElasticSearchPolicyUpdate.main(null);
+        StringBuilder policyDataString = new StringBuilder();
+        ElasticSearchPolicyUpdate.constructPolicyData(policyContent, policyDataString);
+        assertTrue(policyDataString.toString().contains("onapName"));
+    }
+
+    @After
+    public void reset() {
+        System.clearProperty("PROPERTY_FILE");
+    }
 }