Update oparent version to 1.1.0

Directive from ONAP project that all repos should be updated.
Change vierified with a build with .m2 /org/onap cleared.

The test cases are updated becasue changing the oparent version changed the
order of test execution and tests failed due to the static data in PAPServices
not being cleared. Clearing of PAPServices data in those test cases is now
done in an @After method.

The test case in the test below has a test dependency:
ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/notifications/test/NotificationTest.java
depends on com.att.aft.dme2 version 3.1.200-oss

That dependency was added to the POM of ONAP-PDP-REST

Issue-ID: POLICY-693
Change-Id: Ie070f9e94216f4a81f114380782a834ce8663fd5
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

7 files changed, 15 insertions, 3 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 70b717d9d..8867a7828 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
@@ -79,6 +79,8 @@ public class BRMSParamPolicyServiceTest {
 
 	@After
 	public void tearDown() throws Exception {
+		PAPServices.setPaps(null);
+		PAPServices.junit = false;
 	}
 
 	@Test
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java
index 458cfc6c6..de884b349 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopFaultPolicyServiceTest.java
@@ -68,6 +68,8 @@ public class ClosedLoopFaultPolicyServiceTest {
 
 		@After
 		public void tearDown() throws Exception {
+			PAPServices.setPaps(null);
+			PAPServices.junit = false;
 		}
 
 		@Test
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java
index e00c71d9b..19bb279e6 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/ClosedLoopPMPolicyServiceTest.java
@@ -68,6 +68,8 @@ public class ClosedLoopPMPolicyServiceTest {
 
 	@After
 	public void tearDown() throws Exception {
+		PAPServices.setPaps(null);
+		PAPServices.junit = false;
 	}
 
 	@Test
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java
index 5236b28c7..0fcb0027c 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/DecisionPolicyServiceTest.java
@@ -93,6 +93,8 @@ public class DecisionPolicyServiceTest {
 
 	@After
 	public void tearDown() throws Exception {
+		PAPServices.setPaps(null);
+		PAPServices.junit = false;
 	}
 
 	@Test
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java
index 111a39f8a..4343a5060 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/FirewallPolicyServiceTest.java
@@ -37,7 +37,8 @@ import org.onap.policy.api.PolicyParameters;
 public class FirewallPolicyServiceTest {
 
     FirewallPolicyService firewallPolicyService = null;
-	
+   
+    
 	@Before
 	public void setUp() throws Exception {
 		Properties prop = new Properties();
@@ -65,6 +66,8 @@ public class FirewallPolicyServiceTest {
 
 	@After
 	public void tearDown() throws Exception {
+		PAPServices.setPaps(null);
+		PAPServices.junit = false;
 	}
 
 	@Test
@@ -89,5 +92,4 @@ public class FirewallPolicyServiceTest {
 		String result = firewallPolicyService.getResult(false);
 		assertEquals("success",result);
 	}
-
 }
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java
index 6830fccbd..a9301e728 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/MicroServicesPolicyServiceTest.java
@@ -68,6 +68,8 @@ public class MicroServicesPolicyServiceTest {
 
 	@After
 	public void tearDown() throws Exception {
+		PAPServices.setPaps(null);
+		PAPServices.junit = false;
 	}
 
 	@Test
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java
index 13f728790..9d1d13910 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/api/services/PAPServicesTest.java
@@ -31,7 +31,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.onap.policy.api.PolicyException;
-import org.onap.policy.rest.XACMLRestProperties;
 import org.onap.policy.xacml.std.pap.StdPAPPolicy;
 import org.onap.policy.xacml.std.pap.StdPDPPolicy;
 
@@ -53,6 +52,7 @@ public class PAPServicesTest {
 
 	@After
 	public void tearDown() throws Exception {
+		PAPServices.setPaps(null);
 		PAPServices.junit = false;
 	}