Improve ONAP-PDP-REST JUnit test case independency

Handle cleanup of changed system properties and other test-related
static parameters to prevent unexpected behaviour of other test cases
that are dependent of the same properties and parameters when order
of the execution changes

Add Samsung modification copyrights for changed files

Fix some loggings and a minor typo in documentation

Change-Id: Ib6920d6300da79bfc426e4f348b503e3fd6a31ee
Issue-ID: POLICY-1501
Signed-off-by: kaihlavi <l.kaihlavirt@partner.samsung.com>

1 files changed, 25 insertions, 16 deletions

diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java
index 23e47f418..3461825ac 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/BRMSParamPolicyServiceTest.java
@@ -1,15 +1,17 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP-PAP-REST
+ * ONAP-PDP-REST
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright (C) 2019 Samsung
+ * ================================================================================
  * 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.
@@ -19,7 +21,10 @@
  */
 package org.onap.policy.pdp.rest.api.services;
 
-import static org.junit.Assert.*;
+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.io.FileInputStream;
 import java.text.SimpleDateFormat;
@@ -31,8 +36,9 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 
-import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.onap.policy.api.AttributeType;
 import org.onap.policy.api.PolicyConfigType;
@@ -40,18 +46,21 @@ import org.onap.policy.api.PolicyException;
 import org.onap.policy.api.PolicyParameters;
 
 public class BRMSParamPolicyServiceTest {
-    
+
 	BRMSParamPolicyService service = null;
-	
-	@Before
-	public void setUp() throws Exception {
+
+	@BeforeClass
+	public static void setUpBeforeClass() throws Exception {
 		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.setJunit(true);
-		
+	}
+
+	@Before
+	public void setUp() throws Exception {
 		PolicyParameters policyParameters = new PolicyParameters();
         policyParameters.setPolicyConfigType(PolicyConfigType.BRMS_PARAM);
         policyParameters.setPolicyName("Test.testBRMSPolicy");
@@ -62,23 +71,23 @@ public class BRMSParamPolicyServiceTest {
 		policyParameters.setGuard(true);
 		policyParameters.setRiskLevel("5");
 		policyParameters.setRiskType("TEST");
-		
+
         Map<String, String> ruleAttributes = new HashMap<>();
         ruleAttributes.put("templateName", "Sample");
-        ruleAttributes.put("controller", "default"); 
-        ruleAttributes.put("SamPoll", "300");  
+        ruleAttributes.put("controller", "default");
+        ruleAttributes.put("SamPoll", "300");
         ruleAttributes.put("value", "abcd");
         Map<AttributeType, Map<String, String>> attributes = new HashMap<>();
         attributes.put(AttributeType.RULE, ruleAttributes);
         policyParameters.setAttributes(attributes);
-        
+
 		String policyName = "testBRMSPolicy";
 		String policyScope = "Test";
 		service = new BRMSParamPolicyService(policyName, policyScope, policyParameters, date.toString());
 	}
 
-	@After
-	public void tearDown() throws Exception {
+	@AfterClass
+	public static void tearDownAfterClass() {
 		PAPServices.setPaps(null);
 		PAPServices.setJunit(false);
 	}