diff options
Diffstat (limited to 'feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle')
4 files changed, 63 insertions, 8 deletions
diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java index c22a0d88..3a3434ac 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/ControllerSupport.java @@ -30,6 +30,7 @@ import org.kie.api.builder.ReleaseId; import org.onap.policy.drools.properties.DroolsProperties; import org.onap.policy.drools.system.PolicyController; import org.onap.policy.drools.util.KieUtils; +import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy; /** * Controller Test Support. @@ -59,7 +60,9 @@ public class ControllerSupport { */ public PolicyController createController() throws IOException { try { - getController(); + PolicyController controller = getController(); + controller.getDrools().delete(ToscaPolicy.class); + return controller; } catch (IllegalArgumentException e) { ; } 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 d28ab14c..550379be 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 @@ -74,6 +74,7 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { change.setState(PdpState.ACTIVE); change.setName(fsm.getName()); + fsm.setGroupAction("A", "a"); fsm.source.offer(new StandardCoder().encode(change)); controllerSupport.getController().start(); } @@ -169,8 +170,8 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { change.setName(fsm.getName()); fsm.source.offer(new StandardCoder().encode(change)); assertEquals(PdpState.ACTIVE, fsm.state()); - assertEquals("B", fsm.getGroup()); - assertEquals("b", fsm.getSubgroup()); + assertEquals("A", fsm.getGroup()); + assertEquals("a", fsm.getSubgroup()); change.setState(PdpState.SAFE); fsm.source.offer(new StandardCoder().encode(change)); @@ -319,6 +320,8 @@ public class LifecycleStateActiveTest extends LifecycleStateRunningTest { assertEquals(PdpState.ACTIVE, fsm.state()); assertEquals(interval, fsm.getStatusTimerSeconds()); + assertTrue(controllerSupport.getController().getDrools().delete(ToscaPolicy.class)); + fsm.shutdown(); } } diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java index 181b11cf..71147e2a 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java @@ -167,6 +167,9 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { @Test public void update() throws IOException, CoderException { + controllerSupport.getController().getDrools().delete(ToscaPolicy.class); + assertEquals(0, controllerSupport.getController().getDrools().factCount("junits")); + PdpUpdate update = new PdpUpdate(); update.setName(NetworkUtil.getHostname()); update.setPdpGroup("Z"); @@ -206,13 +209,59 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { assertTrue(fsm.policyTypesMap.isEmpty()); assertTrue(fsm.policiesMap.isEmpty()); + update.setPdpGroup(null); + update.setPdpSubgroup(null); + + assertFalse(fsm.update(update)); + + assertEquals(PdpState.PASSIVE, fsm.state()); + assertEquals(interval, fsm.getStatusTimerSeconds()); + assertNull(fsm.getGroup()); + assertNull(fsm.getSubgroup()); + assertBasicPassive(); + assertTrue(fsm.policyTypesMap.isEmpty()); + assertTrue(fsm.policiesMap.isEmpty()); + + update.setPdpGroup("A"); + update.setPdpSubgroup("a"); + + assertFalse(fsm.update(update)); + + assertEquals(PdpState.PASSIVE, fsm.state()); + assertEquals(interval, fsm.getStatusTimerSeconds()); + assertEquals("A", fsm.getGroup()); + assertEquals("a", fsm.getSubgroup()); + assertBasicPassive(); + assertTrue(fsm.policyTypesMap.isEmpty()); + assertTrue(fsm.policiesMap.isEmpty()); + fsm.start(controllerSupport.getController()); assertEquals(1, fsm.policyTypesMap.size()); assertTrue(fsm.policiesMap.isEmpty()); assertTrue(fsm.update(update)); assertEquals(1, fsm.policyTypesMap.size()); - assertTrue(fsm.policiesMap.isEmpty()); + assertEquals(1, fsm.policiesMap.size()); + assertEquals(fsm.policiesMap.get(toscaPolicy.getIdentifier()), toscaPolicy); + assertEquals(PdpState.PASSIVE, fsm.state()); + assertEquals(interval, fsm.getStatusTimerSeconds()); + assertEquals("A", fsm.getGroup()); + assertEquals("a", fsm.getSubgroup()); + assertBasicPassive(); + assertEquals(0, controllerSupport.getController().getDrools().factCount("junits")); + + update.setPdpGroup(null); + update.setPdpSubgroup(null); + update.setPolicies(Collections.emptyList()); + assertTrue(fsm.update(update)); + assertEquals(1, fsm.policyTypesMap.size()); + assertEquals(0, fsm.policiesMap.size()); + assertEquals(PdpState.PASSIVE, fsm.state()); + assertEquals(interval, fsm.getStatusTimerSeconds()); + assertNull(fsm.getGroup()); + assertNull(fsm.getSubgroup()); + assertBasicPassive(); + assertEquals(0, controllerSupport.getController().getDrools().factCount("junits")); fsm.shutdown(); } @@ -238,8 +287,8 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest { fsm.source.offer(new StandardCoder().encode(change)); assertEquals(PdpState.ACTIVE, fsm.state()); - assertEquals("A", fsm.getGroup()); - assertEquals("a", fsm.getSubgroup()); + assertNull(fsm.getGroup()); + assertNull(fsm.getSubgroup()); fsm.shutdown(); } diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateTerminatedTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateTerminatedTest.java index 587098f8..50c4f1a7 100644 --- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateTerminatedTest.java +++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStateTerminatedTest.java @@ -142,12 +142,12 @@ public class LifecycleStateTerminatedTest { update.setPdpGroup("A"); update.setPdpSubgroup("a"); update.setPolicies(Collections.emptyList()); - update.setPdpHeartbeatIntervalMs(2 * 600000L); + update.setPdpHeartbeatIntervalMs(4 * 600000L); assertFalse(fsm.update(update)); assertEquals(PdpState.TERMINATED, fsm.state.state()); - assertNotEquals((2 * 60000L) / 1000L, fsm.getStatusTimerSeconds()); + assertNotEquals((4 * 60000L) / 1000L, fsm.getStatusTimerSeconds()); } @Test |