Upgrade and clean up dependencies

[policy/models.git] / models-interactions / model-actors / actor.sdnr / src / test / java / org / onap / policy / controlloop / actor / sdnr / SdnrOperationTest.java

diff --git a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java
index 90452a9..20d76e7 100644 (file)
--- a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java
+++ b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java
@@ -2,7 +2,8 @@
  * ============LICENSE_START=======================================================
  * SdnrOperation
  * ================================================================================
- * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2020-2022 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.
@@ -21,29 +22,23 @@
 package org.onap.policy.controlloop.actor.sdnr;
 
 import static org.assertj.core.api.Assertions.assertThat;
+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.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.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.policy.controlloop.actor.test.BasicBidirectionalTopicOperation;
-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.impl.BidirectionalTopicOperation.Status;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicConfig;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicParams;
@@ -52,6 +47,7 @@ import org.onap.policy.sdnr.PciMessage;
 import org.onap.policy.sdnr.PciRequest;
 import org.onap.policy.sdnr.util.StatusCodeEnum;
 
+@RunWith(MockitoJUnitRunner.class)
 public class SdnrOperationTest extends BasicSdnrOperation {
 
     private SdnrOperation operation;
@@ -75,6 +71,7 @@ public class SdnrOperationTest extends BasicSdnrOperation {
         super.setUp();
 
         operation = new SdnrOperation(params, config);
+        operation.setProperty(OperationProperties.EVENT_PAYLOAD, "my payload");
     }
 
     @After
@@ -114,12 +111,26 @@ public class SdnrOperationTest extends BasicSdnrOperation {
         assertEquals(params.getRequestId(), header.getRequestId());
     }
 
+    /**
+     * Tests makeRequest() when a property is missing.
+     */
+    @Test
+    public void testMakeRequestMissingProperty() {
+        operation = new SdnrOperation(params, config);
+
+        operation.generateSubRequestId(1);
+        outcome.setSubRequestId(operation.getSubRequestId());
+
+        assertThatIllegalStateException().isThrownBy(() -> operation.makeRequest(1))
+                        .withMessageContaining("missing event payload");
+    }
+
     @Test
     public void testGetExpectedKeyValues() {
         operation.generateSubRequestId(1);
 
         PciMessage request = operation.makeRequest(1);
-        assertEquals(Arrays.asList(request.getBody().getInput().getCommonHeader().getSubRequestId()),
+        assertEquals(List.of(request.getBody().getInput().getCommonHeader().getSubRequestId()),
                         operation.getExpectedKeyValues(50, request));
     }
 
@@ -134,46 +145,14 @@ public class SdnrOperationTest extends BasicSdnrOperation {
 
         params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build();
 
-        operation = new SdnrOperation(params, config) {
-            @Override
-            protected CompletableFuture<OperationOutcome> startGuardAsync() {
-                return null;
-            }
-        };
+        operation = new SdnrOperation(params, config);
+        operation.setProperty(OperationProperties.EVENT_PAYLOAD, "my payload");
 
         outcome = operation.start().get();
         assertEquals(OperationResult.SUCCESS, outcome.getResult());
         assertTrue(outcome.getResponse() instanceof PciMessage);
     }
 
-    @Test
-    public void testStartPreprocessorAsync() throws Exception {
-        final CompletableFuture<OperationOutcome> future2 = new CompletableFuture<>();
-        context = mock(ControlLoopEventContext.class);
-        when(context.getEvent()).thenReturn(event);
-        params = params.toBuilder().context(context).build();
-
-        AtomicBoolean guardStarted = new AtomicBoolean();
-
-        operation = new SdnrOperation(params, config) {
-            @Override
-            protected CompletableFuture<OperationOutcome> startGuardAsync() {
-                guardStarted.set(true);
-                return super.startGuardAsync();
-            }
-        };
-        CompletableFuture<OperationOutcome> future3 = operation.startPreprocessorAsync();
-
-        assertNotNull(future3);
-        assertFalse(future.isDone());
-        assertTrue(guardStarted.get());
-
-        future2.complete(params.makeOutcome(null));
-        assertTrue(executor.runAll(100));
-        assertTrue(future3.isDone());
-        assertEquals(OperationResult.SUCCESS, future3.get().getResult());
-    }
-
     @Test
     public void testDetmStatusStringResponse() {
         final org.onap.policy.sdnr.Status status = response.getBody().getOutput().getStatus();
@@ -236,24 +215,6 @@ public class SdnrOperationTest extends BasicSdnrOperation {
         checkOutcome();
     }
 
-    @Test
-    public void testGetEventPayload() {
-        // in neither property nor event
-        assertNull(operation.getEventPayload());
-
-        // only in event
-        event.setPayload("valueA2");
-        assertEquals("valueA2", operation.getEventPayload());
-
-        // both - should choose the property
-        operation.setProperty(OperationProperties.EVENT_PAYLOAD, "valueB");
-        assertEquals("valueB", operation.getEventPayload());
-
-        // both - should choose the property, even if it's null
-        operation.setProperty(OperationProperties.EVENT_PAYLOAD, null);
-        assertNull(operation.getEventPayload());
-    }
-
     protected void checkOutcome() {
         assertSame(outcome, operation.setOutcome(outcome, OperationResult.SUCCESS, response));
         assertEquals(OperationResult.SUCCESS, outcome.getResult());