From: Jorge Hernandez <jh1730@att.com>
Date: Tue, 6 Mar 2018 22:54:21 +0000 (+0000)
Subject: Merge "JUnit workaround for PAP-REST, sonar bug"
X-Git-Tag: v1.2.0~89
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=47cf51f5ec5e618d1ca9e1e9607a40ddef9283d8;hp=ef7f703ce46a3bfec3051ff53f7a058cd859e07e

Merge "JUnit workaround for PAP-REST, sonar bug"
---

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java
index fa4bd20f5..39b21f184 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/MicroServicePolicyTest.java
@@ -40,7 +40,6 @@ import java.io.File;
 import java.util.Collections;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({MicroServiceConfigPolicy.class, CreateNewMicroServiceModel.class})
 public class MicroServicePolicyTest {
 	@Rule
     public ExpectedException thrown = ExpectedException.none();
@@ -60,6 +59,7 @@ public class MicroServicePolicyTest {
 		assertNull(policy.getCorrectPolicyDataObject());
 	}
 	
+	@PrepareForTest({MicroServiceConfigPolicy.class})
 	@Test
 	public void testPrepareToSave() throws Exception {
 		// Need to mock internal dictionary retrieval
@@ -84,6 +84,7 @@ public class MicroServicePolicyTest {
 		assertNotNull(model);
 	}
 	
+	@PrepareForTest({CreateNewMicroServiceModel.class})
 	@Test
 	public void testCreateModel() throws Exception {
 		// Mock file retrieval
diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java
index 9e9da17a5..3941593e9 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/handler/DeleteHandlerTest.java
@@ -46,7 +46,6 @@ import java.util.List;
 import javax.persistence.EntityManager;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({DeleteHandler.class, XACMLPapServlet.class})
 public class DeleteHandlerTest {
 	@Test
 	public void testGets() {
@@ -62,6 +61,7 @@ public class DeleteHandlerTest {
 		assertNotNull(handler);
 	}
 	
+	@PrepareForTest({DeleteHandler.class, XACMLPapServlet.class})
 	@Test
 	public void testDeletes() throws Exception {
 		// Mock request