Remove Target and TargetType

[policy/models.git] / models-interactions / model-actors / actor.guard / src / test / java / org / onap / policy / controlloop / actor / guard / DecisionOperationTest.java

diff --git a/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/DecisionOperationTest.java b/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/DecisionOperationTest.java
index da0ee95..5502ec6 100644 (file)
--- a/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/DecisionOperationTest.java
+++ b/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/DecisionOperationTest.java
@@ -20,6 +20,7 @@
 
 package org.onap.policy.controlloop.actor.guard;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -48,13 +49,13 @@ import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInst
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.controlloop.actor.test.BasicHttpOperation;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
+import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
-import org.onap.policy.controlloop.policy.PolicyResult;
 import org.onap.policy.models.decisions.concepts.DecisionRequest;
 import org.onap.policy.models.decisions.concepts.DecisionResponse;
 import org.onap.policy.simulators.GuardSimulatorJaxRs;
 
-public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
+public class DecisionOperationTest extends BasicHttpOperation {
 
     @Mock
     private Consumer<OperationOutcome> started;
@@ -120,7 +121,7 @@ public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
         oper = new DecisionOperation(params, config);
 
         outcome = oper.start().get();
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof DecisionResponse);
     }
 
@@ -137,7 +138,7 @@ public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
         oper = new DecisionOperation(params, config);
 
         outcome = oper.start().get();
-        assertEquals(PolicyResult.FAILURE, outcome.getResult());
+        assertEquals(OperationResult.FAILURE, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof DecisionResponse);
     }
 
@@ -147,6 +148,11 @@ public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
         assertEquals(DEFAULT_OPERATION, oper.getName());
     }
 
+    @Test
+    public void testGetPropertyNames() {
+        assertThat(oper.getPropertyNames()).isEmpty();
+    }
+
     @Test
     public void testStartOperationAsync() throws Exception {
         CompletableFuture<OperationOutcome> future2 = oper.start();
@@ -164,7 +170,7 @@ public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
         assertTrue(future2.isDone());
 
         outcome = future2.get();
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertEquals(resp, outcome.getResponse());
 
         assertNotNull(oper.getSubRequestId());
@@ -188,7 +194,7 @@ public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
         assertTrue(future2.isDone());
 
         outcome = future2.get();
-        assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+        assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertNull(outcome.getResponse());
 
         // ensure callbacks were invoked
@@ -231,26 +237,26 @@ public class DecisionOperationTest extends BasicHttpOperation<DecisionRequest> {
 
         // null status
         response.setStatus(null);
-        verifyOutcome(response, PolicyResult.FAILURE, "response contains no status");
+        verifyOutcome(response, OperationResult.FAILURE, "response contains no status");
 
         // permit, mixed case
         response.setStatus("peRmit");
-        verifyOutcome(response, PolicyResult.SUCCESS, "peRmit");
+        verifyOutcome(response, OperationResult.SUCCESS, "peRmit");
 
         // indeterminate, mixed case
         response.setStatus("inDETerminate");
-        verifyOutcome(response, PolicyResult.SUCCESS, "inDETerminate");
+        verifyOutcome(response, OperationResult.SUCCESS, "inDETerminate");
 
         // deny, mixed case
         response.setStatus("deNY");
-        verifyOutcome(response, PolicyResult.FAILURE, "deNY");
+        verifyOutcome(response, OperationResult.FAILURE, "deNY");
 
         // unknown status
         response.setStatus("unknown");
-        verifyOutcome(response, PolicyResult.FAILURE, "unknown");
+        verifyOutcome(response, OperationResult.FAILURE, "unknown");
     }
 
-    private void verifyOutcome(DecisionResponse response, PolicyResult expectedResult, String expectedMessage) {
+    private void verifyOutcome(DecisionResponse response, OperationResult expectedResult, String expectedMessage) {
         oper.postProcessResponse(outcome, BASE_URI, rawResponse, response);
         assertEquals(expectedResult, outcome.getResult());
         assertEquals(expectedMessage, outcome.getMessage());