Upgrade and clean up dependencies

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

diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
index 5eb35e9..34d0d12 100644 (file)
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2023 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,20 +25,17 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.policy.aai.AaiCqResponse;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.resources.ResourceUtils;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
-import org.onap.policy.controlloop.actorserviceprovider.impl.OperationPartial;
-import org.onap.policy.controlloop.policy.PolicyResult;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BasicOperationTest {
     private static final String ACTOR = "my-actor";
     private static final String OPERATION = "my-operation";
@@ -47,13 +45,13 @@ public class BasicOperationTest {
 
     @Before
     public void setUp() throws Exception {
-        oper = new BasicHttpOperation<>(ACTOR, OPERATION);
+        oper = new BasicHttpOperation(ACTOR, OPERATION);
         oper.setUpBasic();
     }
 
     @Test
     public void testBasicHttpOperation() {
-        oper = new BasicHttpOperation<>();
+        oper = new BasicHttpOperation();
         assertEquals(BasicHttpOperation.DEFAULT_ACTOR, oper.actorName);
         assertEquals(BasicHttpOperation.DEFAULT_OPERATION, oper.operationName);
     }
@@ -67,39 +65,23 @@ public class BasicOperationTest {
     @Test
     public void testSetUp() throws Exception {
         assertNotNull(oper.future);
-        assertNotNull(oper.context);
         assertNotNull(oper.outcome);
         assertNotNull(oper.executor);
-        assertNotNull(oper.guardOperation);
-
-        CompletableFuture<OperationOutcome> future = oper.service.getActor(OperationPartial.GUARD_ACTOR_NAME)
-                        .getOperator(OperationPartial.GUARD_OPERATION_NAME).buildOperation(null).start();
-        assertTrue(future.isDone());
-        assertEquals(PolicyResult.SUCCESS, future.get().getResult());
     }
 
     @Test
     public void testMakeContext() {
         oper.makeContext();
 
-        assertTrue(oper.enrichment.isEmpty());
-
-        assertSame(BasicHttpOperation.REQ_ID, oper.event.getRequestId());
-        assertSame(oper.enrichment, oper.event.getAai());
-
-        assertSame(oper.event, oper.context.getEvent());
-
-        assertSame(oper.context, oper.params.getContext());
         assertSame(oper.service, oper.params.getActorService());
         assertSame(oper.executor, oper.params.getExecutor());
         assertEquals(ACTOR, oper.params.getActor());
         assertEquals(OPERATION, oper.params.getOperation());
-        assertEquals(BasicHttpOperation.TARGET_ENTITY, oper.params.getTargetEntity());
+        assertSame(BasicHttpOperation.REQ_ID, oper.params.getRequestId());
     }
 
     @Test
-    public void testMakeEnrichment_testMakePayload() {
-        assertTrue(oper.makeEnrichment().isEmpty());
+    public void testMakePayload() {
         assertNull(oper.makePayload());
     }
 
@@ -108,14 +90,4 @@ public class BasicOperationTest {
         Map<String, Object> map = Util.translateToMap("", ResourceUtils.getResourceAsString("actual.json"));
         oper.verifyRequest("expected.json", map, "svc-request-id", "vnf-id");
     }
-
-    @Test
-    public void testProvideCqResponse() throws Exception {
-        AaiCqResponse cq = new AaiCqResponse("{}");
-        oper.provideCqResponse(cq);
-
-        assertSame(cq, oper.context.getProperty(AaiCqResponse.CONTEXT_KEY));
-        assertTrue(oper.cqFuture.isDone());
-        assertEquals(PolicyResult.SUCCESS, oper.cqFuture.get().getResult());
-    }
 }