summaryrefslogtreecommitdiffstats
path: root/controlloop/common/controller-usecases/src/test
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-11-20 13:28:27 +0000
committerGerrit Code Review <gerrit@onap.org>2020-11-20 13:28:27 +0000
commit022405974f42fc183d8de46a603a1049dfb2ee15 (patch)
treee34c31c1233a1dfcf4771ca2de1b233f9b84d0f9 /controlloop/common/controller-usecases/src/test
parent03c9f7be0e81f39f71c5ba87a77448a726db06db (diff)
parent3d776b9d24b73b366b2f1e70b6c536e4d2705202 (diff)
Merge "Delete preprocessed flag from actors"
Diffstat (limited to 'controlloop/common/controller-usecases/src/test')
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiCqStep2Test.java3
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiGetTenantStep2Test.java2
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java1
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/LockStep2Test.java2
-rw-r--r--controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/Step2Test.java2
5 files changed, 4 insertions, 6 deletions
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiCqStep2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiCqStep2Test.java
index 9869c2182..d05aa604c 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiCqStep2Test.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiCqStep2Test.java
@@ -48,7 +48,6 @@ import org.onap.policy.controlloop.actorserviceprovider.spi.Actor;
import org.onap.policy.controlloop.eventmanager.StepContext;
public class AaiCqStep2Test {
- private static final String MY_TARGET = "my-target";
private static final UUID REQ_ID = UUID.randomUUID();
@Mock
@@ -80,7 +79,7 @@ public class AaiCqStep2Test {
future = new CompletableFuture<>();
when(params.toBuilder()).thenReturn(ControlLoopOperationParams.builder().actorService(actors)
- .targetEntity(MY_TARGET).requestId(REQ_ID));
+ .requestId(REQ_ID));
// configure policy operation
when(actors.getActor(AaiActor.NAME)).thenReturn(policyActor);
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiGetTenantStep2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiGetTenantStep2Test.java
index 65c27b45f..7b1bae7d8 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiGetTenantStep2Test.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/AaiGetTenantStep2Test.java
@@ -84,7 +84,7 @@ public class AaiGetTenantStep2Test {
future = new CompletableFuture<>();
when(params.toBuilder()).thenReturn(ControlLoopOperationParams.builder().actorService(actors)
- .targetEntity("my-target").requestId(REQ_ID));
+ .requestId(REQ_ID));
// configure policy operation
when(actors.getActor(AaiActor.NAME)).thenReturn(policyActor);
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java
index ab9507221..2ab647aa4 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java
@@ -168,7 +168,6 @@ public class GuardStep2Test {
params = ControlLoopOperationParams.builder()
.actor(MASTER_ACTOR)
.operation(MASTER_OPERATION)
- .targetEntity(MY_TARGET)
.requestId(REQ_ID)
.targetType(target)
.build();
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/LockStep2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/LockStep2Test.java
index 2afd39547..c68f1873f 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/LockStep2Test.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/LockStep2Test.java
@@ -107,7 +107,7 @@ public class LockStep2Test {
assertTrue(step.start(100));
// complete the operation's future
- OperationOutcome outcome = params.makeOutcome();
+ OperationOutcome outcome = step.makeOutcome();
outcome.setTarget(MY_TARGET);
future.complete(outcome);
diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/Step2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/Step2Test.java
index 7695d5b20..811901963 100644
--- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/Step2Test.java
+++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/Step2Test.java
@@ -132,7 +132,7 @@ public class Step2Test {
params = ControlLoopOperationParams.builder().actor(POLICY_ACTOR).actorService(actors)
.completeCallback(completions::add).executor(ForkJoinPool.commonPool())
.operation(POLICY_OPERATION).payload(new TreeMap<>(payload)).startCallback(starts::add)
- .targetType(TargetType.VM).targetEntityIds(entityIds).targetEntity(MY_TARGET)
+ .targetType(TargetType.VM).targetEntityIds(entityIds)
.requestId(REQ_ID).build();
step = new Step2(stepContext, params, event);