Merge "uplift oparent version 1.2.1->1.2.3"

diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java
index bb12adc..3b0bff6 100644 (file)
--- a/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java
@@ -58,6 +58,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
      *
      * @see TestCase#setUp()
      */
+    @Override
     public void setUp() throws Exception {
         try {
             policyEngine = new PolicyEngine("Test/config_pass.properties");
@@ -119,6 +120,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
      *
      * @see TestCase#tearDown()
      */
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         // Add additional tear down code here
@@ -204,7 +206,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
 
     @Test
     public final void testCreatePolicyNullPolicyName() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName(null);
         try {
             result = policyEngine.createPolicy(policyParameters);
@@ -216,7 +218,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
 
     @Test
     public final void testCreatePolicyNullPolicyScope() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName("test");
         try {
             result = policyEngine.createPolicy(policyParameters);
@@ -228,7 +230,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
 
     @Test
     public final void testCreatePolicyNullPolicyConfigBody() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setConfigBody(null);
         try {
             result = policyEngine.createPolicy(policyParameters);
@@ -240,7 +242,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
 
     @Test
     public final void testUpdatePolicyNullPolicyName() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName(null);
         try {
             result = policyEngine.updatePolicy(policyParameters);
@@ -252,7 +254,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
 
     @Test
     public final void testUpdatePolicyNullPolicyScope() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName("test");
         try {
             result = policyEngine.updatePolicy(policyParameters);
@@ -264,7 +266,7 @@ public class ConfigFirewallPolicyTest extends TestCase {
 
     @Test
     public final void testUpdatePolicyNullPolicyConfigBody() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setConfigBody(null);
         try {
             result = policyEngine.createPolicy(policyParameters);

diff --git a/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java
index c6dd0d7..d70ecef 100644 (file)
--- a/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java
+++ b/PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java
@@ -62,6 +62,7 @@ public class DecisionPolicyApiTest extends TestCase {
      *
      * @see TestCase#setUp()
      */
+    @Override
     public void setUp() throws Exception {
         try {
             policyEngine = new PolicyEngine("Test/config_pass.properties");
@@ -97,6 +98,7 @@ public class DecisionPolicyApiTest extends TestCase {
      *
      * @see TestCase#tearDown()
      */
+    @Override
     public void tearDown() throws Exception {
         super.tearDown();
         // Add additional tear down code here
@@ -138,7 +140,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
     @Test
     public final void testCreatePolicyNullPolicyName() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName(null);
         try {
             result = policyEngine.createPolicy(policyParameters);
@@ -150,7 +152,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
     @Test
     public final void testCreatePolicyNullPolicyScope() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName("test");
         try {
             result = policyEngine.createPolicy(policyParameters);
@@ -162,7 +164,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
     @Test
     public final void testCreatePolicyNullOnapName() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setOnapName(null);
         try {
             result = policyEngine.createPolicy(policyParameters);
@@ -174,7 +176,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
     @Test
     public final void testUpdatePolicyNullPolicyName() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName(null);
         try {
             result = policyEngine.updatePolicy(policyParameters);
@@ -186,7 +188,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
     @Test
     public final void testUpdatePolicyNullPolicyScope() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setPolicyName("test");
         try {
             result = policyEngine.updatePolicy(policyParameters);
@@ -198,7 +200,7 @@ public class DecisionPolicyApiTest extends TestCase {
 
     @Test
     public final void testUpdatePolicyNullOnapName() {
-        response.setResponseMessage("PE500 - Process Flow Issue: :500:");
+        response.setResponseMessage("PE500 - Process Flow Issue: :500 INTERNAL_SERVER_ERROR:");
         policyParameters.setOnapName(null);
         try {
             result = policyEngine.updatePolicy(policyParameters);