X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.test%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Ftest%2FBasicHttpOperationTest.java;h=c0351d12c28844cba82c7ecf017dba5dc211fb8d;hb=e3938e43b8a1f02f74368ecb75c38530285feac0;hp=1de2f923deeeae2c973953038f32ac5e7660f27c;hpb=708a8b0cc4f4d828976d20747a222aac917c6b38;p=policy%2Fmodels.git

diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
index 1de2f923d..c0351d12c 100644
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicHttpOperationTest.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.
@@ -23,7 +24,6 @@ package org.onap.policy.controlloop.actor.test;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
@@ -31,25 +31,28 @@ import javax.ws.rs.client.InvocationCallback;
 import javax.ws.rs.core.Response;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class BasicHttpOperationTest {
     private static final String ACTOR = "my-actor";
     private static final String OPERATION = "my-operation";
 
-    private BasicHttpOperation<String> oper;
+    private BasicHttpOperation oper;
 
 
     @Before
     public void setUp() throws Exception {
-        oper = new BasicHttpOperation<>(ACTOR, OPERATION);
-        oper.setUp();
+        oper = new BasicHttpOperation(ACTOR, OPERATION);
+        oper.setUpBasic();
     }
 
     @Test
     public void testBasicHttpOperation() {
-        oper = new BasicHttpOperation<>();
-        assertEquals(BasicHttpOperation.DEFAULT_ACTOR, oper.actorName);
-        assertEquals(BasicHttpOperation.DEFAULT_OPERATION, oper.operationName);
+        oper = new BasicHttpOperation();
+        assertEquals(BasicOperation.DEFAULT_ACTOR, oper.actorName);
+        assertEquals(BasicOperation.DEFAULT_OPERATION, oper.operationName);
     }
 
     @Test
@@ -65,44 +68,16 @@ public class BasicHttpOperationTest {
         assertEquals(200, oper.rawResponse.getStatus());
         assertNotNull(oper.future);
         assertEquals(BasicHttpOperation.BASE_URI, oper.client.getBaseUrl());
-        assertNotNull(oper.context);
         assertNotNull(oper.outcome);
-        assertTrue(oper.operator.isAlive());
-    }
-
-    @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());
-        assertEquals(ACTOR, oper.params.getActor());
-        assertEquals(OPERATION, oper.params.getOperation());
-        assertEquals(BasicHttpOperation.TARGET_ENTITY, oper.params.getTargetEntity());
+        assertNotNull(oper.executor);
     }
 
     @Test
     public void testInitOperator() throws Exception {
-        oper.initOperator();
-
-        assertTrue(oper.operator.isAlive());
-        assertEquals(ACTOR + "." + OPERATION, oper.operator.getFullName());
-        assertEquals(ACTOR, oper.operator.getActorName());
-        assertEquals(OPERATION, oper.operator.getName());
-        assertSame(oper.client, oper.operator.getClient());
-        assertEquals(BasicHttpOperation.PATH, oper.operator.getPath());
-    }
+        oper.initConfig();
 
-    @Test
-    public void testMakeEnrichment() {
-        assertTrue(oper.makeEnrichment().isEmpty());
+        assertSame(oper.client, oper.config.getClient());
+        assertEquals(BasicHttpOperation.PATH, oper.config.getPath());
     }
 
     @Test