* ONAP
* ================================================================================
* Copyright (C) 2020 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.
package org.onap.policy.controlloop.actor.appc;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import java.util.TreeMap;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
import org.onap.policy.appc.CommonHeader;
import org.onap.policy.appc.Request;
import org.onap.policy.appc.ResponseCode;
import org.onap.policy.appc.ResponseStatus;
+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.ControlLoopOperationParams;
-import org.onap.policy.controlloop.policy.PolicyResult;
-public class AppcOperationTest extends BasicAppcOperation {
+@ExtendWith(MockitoExtension.class)
+ class AppcOperationTest extends BasicAppcOperation {
private AppcOperation oper;
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
+ @BeforeAll
+ static void setUpBeforeClass() throws Exception {
// use same topic name for both sides
initBeforeClass(MY_SINK, MY_SINK);
}
- @AfterClass
- public static void tearDownAfterClass() {
+ @AfterAll
+ static void tearDownAfterClass() {
destroyAfterClass();
}
/**
* Sets up.
*/
- @Before
+ @BeforeEach
@Override
- public void setUp() throws Exception {
+ void setUp() throws Exception {
super.setUp();
oper = new MyOper(params, config);
}
- @After
+ @AfterEach
@Override
- public void tearDown() {
+ void tearDown() {
super.tearDown();
}
@Test
- public void testConstructor() {
+ void testConstructor() {
assertEquals(DEFAULT_ACTOR, oper.getActorName());
assertEquals(DEFAULT_OPERATION, oper.getName());
}
@Test
- public void testStartPreprocessorAsync() {
- assertNotNull(oper.startPreprocessorAsync());
- }
-
- @Test
- public void testMakeRequest() {
+ void testMakeRequest() {
oper.generateSubRequestId(2);
String subreq = oper.getSubRequestId();
assertNotNull(subreq);
- Request request = oper.makeRequest(2, MY_VNF);
+ Request request = oper.makeRequest(genvnf);
assertEquals(DEFAULT_OPERATION, request.getAction());
assertNotNull(request.getPayload());
assertEquals(subreq, header.getSubRequestId());
- request = oper.makeRequest(2, MY_VNF);
+ request = oper.makeRequest(genvnf);
assertEquals(subreq, request.getCommonHeader().getSubRequestId());
// repeat using a null payload
params = params.toBuilder().payload(null).build();
oper = new MyOper(params, config);
- assertEquals(Map.of(AppcOperation.VNF_ID_KEY, MY_VNF), oper.makeRequest(2, MY_VNF).getPayload());
+ assertEquals(Map.of(AppcOperation.VNF_ID_KEY, MY_VNF), oper.makeRequest(genvnf).getPayload());
}
@Test
- public void testConvertPayload() {
- Request request = oper.makeRequest(2, MY_VNF);
+ void testConvertPayload() {
+ Request request = oper.makeRequest(genvnf);
// @formatter:off
assertEquals(
params = params.toBuilder().payload(payload).build();
oper = new MyOper(params, config);
- request = oper.makeRequest(2, MY_VNF);
+ request = oper.makeRequest(genvnf);
// @formatter:off
assertEquals(
params = params.toBuilder().payload(payload).build();
oper = new MyOper(params, config);
- request = oper.makeRequest(2, MY_VNF);
+ request = oper.makeRequest(genvnf);
payload.put(AppcOperation.VNF_ID_KEY, MY_VNF);
payload.put(KEY1, "abc");
}
@Test
- public void testGetExpectedKeyValues() {
+ void testGetExpectedKeyValues() {
oper.generateSubRequestId(2);
- Request request = oper.makeRequest(2, MY_VNF);
+ Request request = oper.makeRequest(genvnf);
assertEquals(Arrays.asList(request.getCommonHeader().getSubRequestId()),
oper.getExpectedKeyValues(50, request));
}
@Test
- public void testDetmStatusStringResponse() {
+ void testDetmStatusStringResponse() {
final ResponseStatus status = response.getStatus();
// null status (i.e., it's a Request, not a Response)
}
@Test
- public void testSetOutcome() {
+ void testSetOutcome() {
final ResponseStatus status = response.getStatus();
// null status
response.setStatus(null);
- assertSame(outcome, oper.setOutcome(outcome, PolicyResult.SUCCESS, response));
- assertEquals(PolicyResult.SUCCESS, outcome.getResult());
+ assertSame(outcome, oper.setOutcome(outcome, OperationResult.SUCCESS, response));
+ assertEquals(OperationResult.SUCCESS, outcome.getResult());
assertNotNull(outcome.getMessage());
assertSame(response, outcome.getResponse());
response.setStatus(status);
// null description
status.setDescription(null);
- assertSame(outcome, oper.setOutcome(outcome, PolicyResult.FAILURE, response));
- assertEquals(PolicyResult.FAILURE, outcome.getResult());
+ assertSame(outcome, oper.setOutcome(outcome, OperationResult.FAILURE, response));
+ assertEquals(OperationResult.FAILURE, outcome.getResult());
assertNotNull(outcome.getMessage());
assertSame(response, outcome.getResponse());
status.setDescription(MY_DESCRIPTION);
- for (PolicyResult result : PolicyResult.values()) {
+ for (OperationResult result : OperationResult.values()) {
assertSame(outcome, oper.setOutcome(outcome, result, response));
assertEquals(result, outcome.getResult());
assertEquals(MY_DESCRIPTION, outcome.getMessage());
}
}
- private static class MyOper extends AppcOperation {
+ private class MyOper extends AppcOperation {
- public MyOper(ControlLoopOperationParams params, BidirectionalTopicConfig config) {
+ MyOper(ControlLoopOperationParams params, BidirectionalTopicConfig config) {
super(params, config, Collections.emptyList());
}
@Override
protected Request makeRequest(int attempt) {
- return makeRequest(attempt, MY_VNF);
+ return makeRequest(genvnf);
}
}
}