aboutsummaryrefslogtreecommitdiffstats
path: root/feature-lifecycle/src/test/java/org
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-06-11 18:27:56 +0000
committerGerrit Code Review <gerrit@onap.org>2020-06-11 18:27:56 +0000
commit6218853b9a001ef74300ab7d243685950ef32ad6 (patch)
tree75888b59fda4f4f48ee03d569d30f47d2d00c0be /feature-lifecycle/src/test/java/org
parente0c469dccc5e9c65e1e37d1865b29de4cc7b5fe5 (diff)
parentb66a56aed5774e59c693d7cfd22b29512e293458 (diff)
Merge "do strict validation before domain conversion"
Diffstat (limited to 'feature-lifecycle/src/test/java/org')
-rw-r--r--feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java25
1 files changed, 21 insertions, 4 deletions
diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java
index 54f7d68f..54f4b6a6 100644
--- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java
+++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateActiveTest.java
@@ -28,6 +28,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -53,6 +54,15 @@ import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicyTypeIdentifi
*/
public class LifecycleStateActiveTest extends LifecycleStateRunningTest {
+ private static final String POLICY_COMPLIANT_VCPE_BAD_INTEGER_JSON =
+ "src/test/resources/tosca-policy-compliant-vcpe-bad-integer.json";
+ private static final String POLICY_OPERATIONAL_FIREWALL_JSON =
+ "src/test/resources/tosca-policy-operational-firewall.json";
+ private static final String POLICY_OPERATIONAL_RESTART_V_2_JSON =
+ "src/test/resources/tosca-policy-operational-restart.v2.json";
+ private static final String POLICY_OPERATIONAL_RESTART_JSON =
+ "src/test/resources/tosca-policy-operational-restart.json";
+
/**
* Start tests in the Active state.
*/
@@ -199,7 +209,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest {
assertEquals("w", fsm.getSubgroup());
String restartV1 =
- new String(Files.readAllBytes(Paths.get("src/test/resources/tosca-policy-operational-restart.json")));
+ Files.readString(Paths.get(POLICY_OPERATIONAL_RESTART_JSON), StandardCharsets.UTF_8);
ToscaPolicy toscaPolicyRestartV1 = new StandardCoder().decode(restartV1, ToscaPolicy.class);
update.setPolicies(Arrays.asList(toscaPolicyRestartV1));
@@ -237,7 +247,6 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest {
.decode(fsm.client.getSink().getRecentEvents()[qlength + 1], PdpStatus.class);
assertEquals(new ArrayList<>(fsm.policiesMap.keySet()), cachedStatus.getPolicies());
-
factPolicies = controllerSupport.getFacts(ToscaPolicy.class);
assertEquals(1, factPolicies.size());
assertEquals(toscaPolicyRestartV1, factPolicies.get(0));
@@ -275,7 +284,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest {
// deploy a new version of the operational.restart policy
String restartV2 =
- new String(Files.readAllBytes(Paths.get("src/test/resources/tosca-policy-operational-restart.v2.json")));
+ Files.readString(Paths.get(POLICY_OPERATIONAL_RESTART_V_2_JSON), StandardCharsets.UTF_8);
ToscaPolicy toscaPolicyRestartV2 = new StandardCoder().decode(restartV2, ToscaPolicy.class);
update.setPolicies(Arrays.asList(toscaPolicyRestartV2));
assertTrue(fsm.update(update));
@@ -294,7 +303,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest {
// deploy another policy : firewall
String firewall =
- new String(Files.readAllBytes(Paths.get("src/test/resources/tosca-policy-operational-firewall.json")));
+ Files.readString(Paths.get(POLICY_OPERATIONAL_FIREWALL_JSON), StandardCharsets.UTF_8);
ToscaPolicy toscaPolicyFirewall = new StandardCoder().decode(firewall, ToscaPolicy.class);
update.setPolicies(Arrays.asList(toscaPolicyRestartV2, toscaPolicyFirewall));
assertTrue(fsm.update(update));
@@ -320,6 +329,14 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest {
assertEquals(PdpState.ACTIVE, fsm.state());
assertEquals(interval, fsm.getStatusTimerSeconds());
+ // bad policy deployment
+
+ String badIntegerPolicy =
+ Files.readString(Paths.get(POLICY_COMPLIANT_VCPE_BAD_INTEGER_JSON), StandardCharsets.UTF_8);
+ ToscaPolicy toscaPolicyRestartBad = new StandardCoder().decode(badIntegerPolicy, ToscaPolicy.class);
+ update.setPolicies(Arrays.asList(toscaPolicyRestartBad));
+ assertFalse(fsm.update(update));
+
assertTrue(controllerSupport.getController().getDrools().delete(ToscaPolicy.class));
fsm.shutdown();