1 files changed, 1 insertions, 99 deletions
diff --git a/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperationTest.java b/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperationTest.java
index 749b6c86c..ee3ac0242 100644
--- a/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperationTest.java
+++ b/models-interactions/model-actors/actor.appc/src/test/java/org/onap/policy/controlloop/actor/appc/ModifyConfigOperationTest.java
@@ -21,48 +21,26 @@
 package org.onap.policy.controlloop.actor.appc;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.mockito.Mock;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.appc.Request;
 import org.onap.policy.appc.Response;
 import org.onap.policy.common.utils.coder.CoderException;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 import org.onap.policy.controlloop.actorserviceprovider.OperationProperties;
 import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
-import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicConfig;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicParams;
 
 public class ModifyConfigOperationTest extends BasicAppcOperation {
 
-    @Mock
-    private GenericVnf genvnf;
-    @Mock
-    private AaiCqResponse cq;
-
     private ModifyConfigOperation oper;
 
 
@@ -85,8 +63,6 @@ public class ModifyConfigOperationTest extends BasicAppcOperation {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        when(genvnf.getVnfId()).thenReturn(MY_VNF);
-        when(cq.getGenericVnfByModelInvariantId(any())).thenReturn(genvnf);
 
         oper = new ModifyConfigOperation(params, config);
     }
@@ -106,16 +82,9 @@ public class ModifyConfigOperationTest extends BasicAppcOperation {
                         BidirectionalTopicParams.builder().sinkTopic(MY_SINK).sourceTopic(MY_SINK).build();
         config = new BidirectionalTopicConfig(blockingExecutor, opParams, topicMgr, AppcOperation.SELECTOR_KEYS);
 
-        params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, cq);
-
         params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).preprocessed(true).build();
 
-        oper = new ModifyConfigOperation(params, config) {
-            @Override
-            protected CompletableFuture<OperationOutcome> startGuardAsync() {
-                return null;
-            }
-        };
+        oper = new ModifyConfigOperation(params, config);
 
         oper.setProperty(OperationProperties.AAI_RESOURCE_VNF, genvnf);
 
@@ -136,45 +105,6 @@ public class ModifyConfigOperationTest extends BasicAppcOperation {
     }
 
     @Test
-    public void testStartPreprocessorAsync() throws Exception {
-        CompletableFuture<OperationOutcome> future2 = new CompletableFuture<>();
-        context = mock(ControlLoopEventContext.class);
-        when(context.obtain(eq(AaiCqResponse.CONTEXT_KEY), any())).thenReturn(future2);
-        when(context.getEvent()).thenReturn(event);
-        params = params.toBuilder().context(context).build();
-
-        AtomicBoolean guardStarted = new AtomicBoolean();
-
-        oper = new ModifyConfigOperation(params, config) {
-            @Override
-            protected CompletableFuture<OperationOutcome> startGuardAsync() {
-                guardStarted.set(true);
-                return super.startGuardAsync();
-            }
-        };
-
-        CompletableFuture<OperationOutcome> future3 = oper.startPreprocessorAsync();
-        assertNotNull(future3);
-        assertFalse(future.isDone());
-        assertTrue(guardStarted.get());
-        verify(context).obtain(eq(AaiCqResponse.CONTEXT_KEY), any());
-
-        future2.complete(params.makeOutcome(null));
-        assertTrue(executor.runAll(100));
-        assertTrue(future3.isDone());
-        assertEquals(OperationResult.SUCCESS, future3.get().getResult());
-    }
-
-    /**
-     * Tests startPreprocessorAsync(), when preprocessing is disabled.
-     */
-    @Test
-    public void testStartPreprocessorAsyncDisabled() {
-        params = params.toBuilder().preprocessed(true).build();
-        assertNull(new ModifyConfigOperation(params, config).startPreprocessorAsync());
-    }
-
-    @Test
     public void testMakeRequest() throws CoderException {
         oper.setProperty(OperationProperties.AAI_RESOURCE_VNF, genvnf);
 
@@ -185,32 +115,4 @@ public class ModifyConfigOperationTest extends BasicAppcOperation {
 
         verifyRequest("modifyConfig.json", request, IGNORE_FIELDS);
     }
-
-    @Test
-    public void testGetVnfIdViaProperty() throws CoderException {
-        oper.setProperty(OperationProperties.AAI_RESOURCE_VNF, genvnf);
-        assertEquals(MY_VNF, oper.getVnfId());
-    }
-
-    @Test
-    public void testGetVnfId() throws CoderException {
-        // no CQ data
-        assertThatIllegalStateException().isThrownBy(() -> oper.getVnfId())
-                        .withMessage("target vnf-id could not be determined");
-
-        cq = new AaiCqResponse("{}");
-
-        // missing vnf-id
-        params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, cq);
-        assertThatIllegalArgumentException().isThrownBy(() -> oper.getVnfId())
-                        .withMessage("target vnf-id could not be found");
-
-        // populate the CQ data with a vnf-id
-        genvnf = new GenericVnf();
-        genvnf.setVnfId(MY_VNF);
-        genvnf.setModelInvariantId(RESOURCE_ID);
-        cq.setInventoryResponseItems(Arrays.asList(genvnf));
-
-        assertEquals(MY_VNF, oper.getVnfId());
-    }
 }