X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.sdnc%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Fsdnc%2FSdncActorTest.java;h=f0f280cb6bd72ccc3c554de94f935d5b334a9d7e;hb=c88676ec64c4c870252502bc1cfaa8990c8fd964;hp=020b09e8c93bccf387aade425586bad0669e9b95;hpb=e4e7d15db6d2f79658e3a5f9e8326ea092afcfab;p=policy%2Fmodels.git

diff --git a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java
index 020b09e8c..f0f280cb6 100644
--- a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java
+++ b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java
@@ -23,44 +23,16 @@
 package org.onap.policy.controlloop.actor.sdnc;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 
 import java.util.Arrays;
-import java.util.Objects;
-import java.util.UUID;
 import java.util.stream.Collectors;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
 import org.junit.Test;
-import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
-import org.onap.policy.controlloop.ControlLoopOperation;
-import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.actor.test.BasicActor;
-import org.onap.policy.controlloop.policy.Policy;
-import org.onap.policy.sdnc.SdncRequest;
 
 public class SdncActorTest extends BasicActor {
 
-    private static final String REROUTE = RerouteOperation.NAME;
-
-    /**
-     * Set up before test class.
-     *
-     * @throws Exception if the A&AI simulator cannot be started
-     */
-    @BeforeClass
-    public static void setUpSimulator() throws Exception {
-        org.onap.policy.simulators.Util.buildAaiSim();
-    }
-
-    @AfterClass
-    public static void tearDownSimulator() {
-        HttpServletServerFactoryInstance.getServerFactory().destroy();
-    }
-
     @Test
-    public void testSdncActorServiceProvider() {
+    public void testSdncActor() {
         final SdncActor prov = new SdncActor();
 
         // verify that it has the operators we expect
@@ -73,52 +45,4 @@ public class SdncActorTest extends BasicActor {
         // verify that it all plugs into the ActorService
         verifyActorService(SdncActor.NAME, "service.yaml");
     }
-
-    @Test
-    public void testConstructRequest() {
-        VirtualControlLoopEvent onset = new VirtualControlLoopEvent();
-        ControlLoopOperation operation = new ControlLoopOperation();
-
-        Policy policy = new Policy();
-        policy.setRecipe(REROUTE);
-
-        SdncActor provider = new SdncActor();
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        onset.getAai().put("network-information.network-id", "network-5555");
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        UUID requestId = UUID.randomUUID();
-        onset.setRequestId(requestId);
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        assertNull(provider.constructRequest(onset, operation, policy));
-
-        onset.getAai().put("service-instance.service-instance-id", "service-instance-01");
-        assertNotNull(provider.constructRequest(onset, operation, policy));
-
-        policy.setRecipe(REROUTE);
-        assertNotNull(provider.constructRequest(onset, operation, policy));
-
-        SdncRequest request = provider.constructRequest(onset, operation, policy);
-
-        assertEquals(requestId, Objects.requireNonNull(request).getRequestId());
-        assertEquals("reoptimize", request.getHealRequest().getRequestHeaderInfo().getSvcAction());
-        assertEquals("ReoptimizeSOTNInstance", request.getHealRequest().getRequestInfo().getRequestAction());
-        assertEquals("network-5555", request.getHealRequest().getNetworkInfo().getNetworkId());
-        assertEquals("service-instance-01", request.getHealRequest().getServiceInfo().getServiceInstanceId());
-    }
-
-    @Test
-    public void testMethods() {
-        SdncActor sp = new SdncActor();
-
-        assertEquals("SDNC", sp.actor());
-        assertEquals(1, sp.recipes().size());
-        assertEquals(REROUTE, sp.recipes().get(0));
-        assertEquals("VM", sp.recipeTargets(REROUTE).get(0));
-        assertEquals(0, sp.recipePayloads(REROUTE).size());
-    }
 }