diff options
Diffstat (limited to 'controlloop')
| -rw-r--r-- | controlloop/common/feature-controlloop-amsterdam/pom.xml | 16 | ||||
| -rw-r--r-- | controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java | 13 |
2 files changed, 23 insertions, 6 deletions
diff --git a/controlloop/common/feature-controlloop-amsterdam/pom.xml b/controlloop/common/feature-controlloop-amsterdam/pom.xml index 273d05652..3bcda64d8 100644 --- a/controlloop/common/feature-controlloop-amsterdam/pom.xml +++ b/controlloop/common/feature-controlloop-amsterdam/pom.xml @@ -112,6 +112,11 @@ </dependency> <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId> + <artifactId>sdnc</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId> <artifactId>vfc</artifactId> <version>${project.version}</version> </dependency> @@ -212,6 +217,17 @@ </exclusions> </dependency> <dependency> + <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId> + <artifactId>actor.sdnc</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common</groupId> <artifactId>policy-yaml</artifactId> <version>${project.version}</version> diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java index 37f55dc09..06e2aca9b 100644 --- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java +++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VpciControlLoopTest.java @@ -3,6 +3,7 @@ * demo * ================================================================================ * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -293,17 +294,17 @@ public class VpciControlLoopTest implements TopicListener { String policyName = notification.getPolicyName(); logger.debug("Rule Fired: {}", policyName); if (policyName.endsWith("EVENT")) { - assertTrue(ControlLoopNotificationType.ACTIVE.equals(notification.getNotification())); + assertEquals(ControlLoopNotificationType.ACTIVE, notification.getNotification()); } else if (policyName.endsWith("GUARD_NOT_YET_QUERIED")) { - assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification())); + assertEquals(ControlLoopNotificationType.OPERATION, notification.getNotification()); assertNotNull(notification.getMessage()); assertTrue(notification.getMessage().startsWith("Sending guard query")); } else if (policyName.endsWith("GUARD.RESPONSE")) { - assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification())); + assertEquals(ControlLoopNotificationType.OPERATION, notification.getNotification()); assertNotNull(notification.getMessage()); assertTrue(notification.getMessage().toLowerCase().endsWith("permit")); } else if (policyName.endsWith("GUARD_PERMITTED")) { - assertTrue(ControlLoopNotificationType.OPERATION.equals(notification.getNotification())); + assertEquals(ControlLoopNotificationType.OPERATION, notification.getNotification()); assertNotNull(notification.getMessage()); assertTrue(notification.getMessage().startsWith("actor=SDNR")); } else if (policyName.endsWith("OPERATION.TIMEOUT")) { @@ -311,7 +312,7 @@ public class VpciControlLoopTest implements TopicListener { logger.debug("The operation timed out"); fail("Operation Timed Out"); } else if (policyName.endsWith("SDNR.RESPONSE")) { - assertTrue(ControlLoopNotificationType.OPERATION_SUCCESS.equals(notification.getNotification())); + assertEquals(ControlLoopNotificationType.OPERATION_SUCCESS, notification.getNotification()); assertNotNull(notification.getMessage()); assertTrue(notification.getMessage().startsWith("actor=SDNR")); } else if (policyName.endsWith("EVENT.MANAGER")) { @@ -334,7 +335,7 @@ public class VpciControlLoopTest implements TopicListener { */ PciRequestWrapper dmaapRequest = (PciRequestWrapper) obj; PciRequest pciRequest = dmaapRequest.getBody(); - assertTrue(pciRequest.getCommonHeader().getSubRequestId().equals("1")); + assertEquals("1", pciRequest.getCommonHeader().getSubRequestId()); logger.debug("\n============ SDNR received the request!!! ===========\n"); logger.debug("\n============ dmaapRequest ===========\n {} ", dmaapRequest); |