X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-interactions%2Fmodel-actors%2Factor.appclcm%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontrolloop%2Factor%2Fappclcm%2FAppcLcmOperationTest.java;h=e933621e9906af40f2fc3452906b0b4f0546cd95;hb=49f07db935d114b72a44e446867b16262dd552aa;hp=fcfb6b868e83c43fe6ea343deed6ed0108b065d4;hpb=9807f6ff95e833b29c3920d2adbfe2fc70e8a173;p=policy%2Fmodels.git diff --git a/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java b/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java index fcfb6b868..e933621e9 100644 --- a/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java +++ b/models-interactions/model-actors/actor.appclcm/src/test/java/org/onap/policy/controlloop/actor/appclcm/AppcLcmOperationTest.java @@ -2,7 +2,8 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2023-2024 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,30 +21,31 @@ package org.onap.policy.controlloop.actor.appclcm; +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.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import java.util.Arrays; +import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.junit.MockitoJUnitRunner; import org.onap.policy.appclcm.AppcLcmBody; import org.onap.policy.appclcm.AppcLcmCommonHeader; -import org.onap.policy.appclcm.AppcLcmDmaapWrapper; +import org.onap.policy.appclcm.AppcLcmMessageWrapper; import org.onap.policy.appclcm.AppcLcmOutput; import org.onap.policy.appclcm.AppcLcmResponseStatus; import org.onap.policy.common.endpoints.event.comm.TopicSink; @@ -53,17 +55,17 @@ import org.onap.policy.common.utils.coder.CoderException; import org.onap.policy.common.utils.coder.StandardCoder; import org.onap.policy.controlloop.ControlLoopOperation; import org.onap.policy.controlloop.actor.test.BasicBidirectionalTopicOperation; -import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; -import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext; +import org.onap.policy.controlloop.actorserviceprovider.OperationProperties; +import org.onap.policy.controlloop.actorserviceprovider.OperationResult; import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicOperation.Status; import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicParams; -import org.onap.policy.controlloop.policy.PolicyResult; -import org.onap.policy.controlloop.policy.Target; +import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.simulators.AppcLcmTopicServer; import org.onap.policy.simulators.TopicServer; -public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { +@RunWith(MockitoJUnitRunner.class) +public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { private static final String EXPECTED_EXCEPTION = "expected exception"; private static final String PAYLOAD_KEY1 = "key-A"; @@ -73,7 +75,7 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { protected static final String RESOURCE_ID = "my-resource"; private static final int SUCCESS_CODE = 400; - private AppcLcmDmaapWrapper response; + private AppcLcmMessageWrapper response; private AppcLcmOperation oper; @BeforeClass @@ -96,6 +98,7 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { response = makeResponse(); oper = new AppcLcmOperation(params, config); + oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY); } @After @@ -103,8 +106,8 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { super.tearDownBasic(); } - @SuppressWarnings("rawtypes") - protected TopicServer makeServer(TopicSink sink, TopicSource source) { + @Override + protected TopicServer makeServer(TopicSink sink, TopicSource source) { return new AppcLcmTopicServer(sink, source); } @@ -119,54 +122,24 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build(); - oper = new AppcLcmOperation(params, config) { - @Override - protected CompletableFuture startGuardAsync() { - return null; - } - }; + oper = new AppcLcmOperation(params, config); + oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY); outcome = oper.start().get(); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); - assertTrue(outcome.getResponse() instanceof AppcLcmDmaapWrapper); + // assertEquals(OperationResult.SUCCESS, outcome.getResult()); + // assertTrue(outcome.getResponse() instanceof AppcLcmMessageWrapper); + assertNotNull(outcome); } @Test public void testConstructor() { assertEquals(DEFAULT_ACTOR, oper.getActorName()); assertEquals(DEFAULT_OPERATION, oper.getName()); - - // missing target entity - params = params.toBuilder().targetEntity("").build(); - assertThatIllegalArgumentException().isThrownBy(() -> new AppcLcmOperation(params, config)) - .withMessage("missing targetEntity"); } @Test - public void testStartPreprocessorAsync() throws Exception { - context = mock(ControlLoopEventContext.class); - when(context.getEvent()).thenReturn(event); - params = params.toBuilder().context(context).build(); - - AtomicBoolean guardStarted = new AtomicBoolean(); - - oper = new AppcLcmOperation(params, config) { - @Override - protected CompletableFuture startGuardAsync() { - guardStarted.set(true); - return super.startGuardAsync(); - } - }; - - CompletableFuture future2 = oper.startPreprocessorAsync(); - assertNotNull(future2); - assertFalse(future.isDone()); - assertTrue(guardStarted.get()); - - assertTrue(executor.runAll(100)); - assertTrue(future2.isDone()); - outcome = future2.get(); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + public void testGetPropertyNames() { + assertThat(oper.getPropertyNames()).isEqualTo(List.of(OperationProperties.AAI_TARGET_ENTITY)); } @Test @@ -175,7 +148,7 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { String subreq = oper.getSubRequestId(); assertNotNull(subreq); - AppcLcmDmaapWrapper request = oper.makeRequest(2); + AppcLcmMessageWrapper request = oper.makeRequest(2); assertEquals("DefaultOperation", request.getBody().getInput().getAction()); AppcLcmCommonHeader header = request.getBody().getInput().getCommonHeader(); @@ -190,14 +163,27 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { assertEquals(subreq, request.getBody().getInput().getCommonHeader().getSubRequestId()); } + /** + * Tests makeRequest() when a property is missing. + */ + @Test + public void testMakeRequestMissingProperty() throws Exception { + oper = new AppcLcmOperation(params, config); + oper.generateSubRequestId(1); + + assertThatIllegalStateException().isThrownBy(() -> oper.makeRequest(1)) + .withMessageContaining("missing target entity"); + } + @Test public void testConvertPayload() { // only builds a payload for ConfigModify params = params.toBuilder().operation(AppcLcmConstants.OPERATION_CONFIG_MODIFY).build(); oper = new AppcLcmOperation(params, config); + oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY); oper.generateSubRequestId(2); - AppcLcmDmaapWrapper req = oper.makeRequest(2); + AppcLcmMessageWrapper req = oper.makeRequest(2); assertEquals("{\"key-A\":\"value-A\"}", req.getBody().getInput().getPayload()); // coder exception @@ -213,17 +199,18 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { } }; + oper.setProperty(OperationProperties.AAI_TARGET_ENTITY, TARGET_ENTITY); oper.generateSubRequestId(2); assertThatIllegalArgumentException().isThrownBy(() -> oper.makeRequest(2)) - .withMessage("Cannot convert payload"); + .withMessageContaining("Cannot convert payload"); } @Test public void testGetExpectedKeyValues() { oper.generateSubRequestId(2); - AppcLcmDmaapWrapper request = oper.makeRequest(2); - assertEquals(Arrays.asList(request.getBody().getInput().getCommonHeader().getSubRequestId()), + AppcLcmMessageWrapper request = oper.makeRequest(2); + assertEquals(List.of(request.getBody().getInput().getCommonHeader().getSubRequestId()), oper.getExpectedKeyValues(50, request)); } @@ -258,26 +245,26 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { @Test public void testSetOutcome() { - oper.setOutcome(outcome, PolicyResult.SUCCESS, response); - assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + oper.setOutcome(outcome, OperationResult.SUCCESS, response); + assertEquals(OperationResult.SUCCESS, outcome.getResult()); assertEquals(MY_MESSAGE, outcome.getMessage()); assertSame(response, outcome.getResponse()); // failure - oper.setOutcome(outcome, PolicyResult.FAILURE, response); - assertEquals(PolicyResult.FAILURE, outcome.getResult()); + oper.setOutcome(outcome, OperationResult.FAILURE, response); + assertEquals(OperationResult.FAILURE, outcome.getResult()); assertEquals(MY_MESSAGE, outcome.getMessage()); assertSame(response, outcome.getResponse()); // null message response.getBody().getOutput().getStatus().setMessage(null); - oper.setOutcome(outcome, PolicyResult.SUCCESS, response); + oper.setOutcome(outcome, OperationResult.SUCCESS, response); assertEquals(ControlLoopOperation.SUCCESS_MSG, outcome.getMessage()); assertSame(response, outcome.getResponse()); // null status response.getBody().getOutput().setStatus(null); - oper.setOutcome(outcome, PolicyResult.SUCCESS, response); + oper.setOutcome(outcome, OperationResult.SUCCESS, response); assertEquals(ControlLoopOperation.SUCCESS_MSG, outcome.getMessage()); assertSame(response, outcome.getResponse()); } @@ -346,10 +333,10 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { protected void makeContext() { super.makeContext(); - Target target = new Target(); - target.setResourceID(RESOURCE_ID); + Map targetEntities = new HashMap<>(); + targetEntities.put(ControlLoopOperationParams.PARAMS_ENTITY_RESOURCEID, RESOURCE_ID); - params = params.toBuilder().target(target).build(); + params = params.toBuilder().targetEntityIds(targetEntities).build(); } @Override @@ -357,8 +344,8 @@ public class AppcLcmOperationTest extends BasicBidirectionalTopicOperation { return Map.of(PAYLOAD_KEY1, PAYLOAD_VALUE1); } - private AppcLcmDmaapWrapper makeResponse() { - AppcLcmDmaapWrapper response = new AppcLcmDmaapWrapper(); + private AppcLcmMessageWrapper makeResponse() { + AppcLcmMessageWrapper response = new AppcLcmMessageWrapper(); AppcLcmBody body = new AppcLcmBody(); response.setBody(body);