From: bobbymander <bobby.mander@att.com>
Date: Tue, 6 Mar 2018 14:53:30 +0000 (-0500)
Subject: JUnit workaround for PAP-REST, sonar bug
X-Git-Tag: v1.2.0~85^2~1
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=83fcb4f327512d857c7df91e35d9e1cb81dc4228

JUnit workaround for PAP-REST, sonar bug

Issue-ID: POLICY-600
Change-Id: I9d4d986b0703c67f65b67eedabca8d0d56965f2d
Signed-off-by: bobbymander <bobby.mander@att.com>
---

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