aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2019-03-16 18:41:19 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-16 18:41:19 +0000
commit19c0d633921642dc9f00ef60a4e0ed4f94b379d1 (patch)
tree63905421c179214e353cd1459ec8fc363b0edf8f
parent15fd188c104684d12f0f539e1de2e5b778e20fb6 (diff)
parent475721f65b7778e1081072df7249c240f94c0643 (diff)
Merge "uplift oparent version 1.2.1->1.2.3"
-rw-r--r--PolicyEngineAPI/src/test/java/org/onap/policy/test/ConfigFirewallPolicyTest.java14
-rw-r--r--PolicyEngineAPI/src/test/java/org/onap/policy/test/DecisionPolicyApiTest.java14
2 files changed, 16 insertions, 12 deletions
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 bb12adc32..3b0bff671 100644
--- 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 c6dd0d7a7..d70ecef2c 100644
--- 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);