X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PDP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdp%2Frest%2Fapi%2Fservices%2FOptimizationPolicyServiceTest.java;h=76cc9229045285701897a9f8b7f5a9f189bff9ff;hb=4179c96ba6fcc5816f3e35130430b2955bc5cbbf;hp=79ca2e6465a65bf473346357ff61a973bd794037;hpb=54d873eda668d7c0dbd79f1ca7764cab75753ec6;p=policy%2Fengine.git

diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/OptimizationPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/OptimizationPolicyServiceTest.java
index 79ca2e646..76cc92290 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/OptimizationPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/OptimizationPolicyServiceTest.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,8 +21,9 @@
  */
 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 java.io.FileInputStream;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
@@ -28,9 +31,9 @@ import java.util.Date;
 import java.util.List;
 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.PolicyConfigType;
 import org.onap.policy.api.PolicyException;
@@ -38,54 +41,57 @@ import org.onap.policy.api.PolicyParameters;
 
 public class OptimizationPolicyServiceTest {
 
-	OptimizationPolicyService service = null;
+    OptimizationPolicyService service = null;
 
-	@Before
-	public void setUp() 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);
-		prop.clear();
-		
-		PolicyParameters policyParameters = new PolicyParameters();
+    @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.Optimization);
         policyParameters.setPolicyName("Test.testOOFPolicy");
-		policyParameters.setOnapName("OOF");
+        policyParameters.setOnapName("OOF");
         policyParameters.setRequestID(UUID.randomUUID());
-      	SimpleDateFormat dateformat3 = new SimpleDateFormat("dd/MM/yyyy");
-		Date date = dateformat3.parse("15/10/2016");
-		policyParameters.setTtlDate(date);
-		policyParameters.setGuard(true);
-		policyParameters.setRiskLevel("5");
-		policyParameters.setRiskType("TEST");
-		policyParameters.setConfigBody("{\"optimization\":\"test\"}");
-		String policyName = "testOOFPolicy";
-		String policyScope = "Test";
-		service = new OptimizationPolicyService(policyName, policyScope, policyParameters, date.toString());
-	}
-
-	@After
-	public void tearDown() throws Exception {
-	}
+        SimpleDateFormat dateformat3 = new SimpleDateFormat("dd/MM/yyyy");
+        Date date = dateformat3.parse("15/10/2016");
+        policyParameters.setTtlDate(date);
+        policyParameters.setGuard(true);
+        policyParameters.setRiskLevel("5");
+        policyParameters.setRiskType("TEST");
+        policyParameters.setConfigBody("{\"optimization\":\"test\"}");
+        String policyName = "testOOFPolicy";
+        String policyScope = "Test";
+        service = new OptimizationPolicyService(policyName, policyScope, policyParameters, date.toString());
+    }
 
-	@Test
-	public final void testOptimizationPolicyService() {
-		assertNotNull(service);
-	}
+    @AfterClass
+    public static void tearDownAfterClass() {
+        PAPServices.setPaps(null);
+        PAPServices.setJunit(false);
+    }
 
-	@Test
-	public final void testGetMessage() {
-		String message = service.getMessage();
-		assertNull(message);
-	}
+    @Test
+    public final void testOptimizationPolicyService() {
+        assertNotNull(service);
+    }
 
-	@Test
-	public final void testGetResult() throws PolicyException {
-		String result = service.getResult(false);
-		assertEquals("success",result);
-	}
+    @Test
+    public final void testGetMessage() {
+        String message = service.getMessage();
+        assertNull(message);
+    }
 
+    @Test
+    public final void testGetResult() throws PolicyException {
+        String result = service.getResult(false);
+        assertEquals("success", result);
+    }
 }