Merge "Convert models to JUnit 5"

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

diff --git a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
index fe06ad5..9ce1b21 100644 (file)
--- a/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
+++ b/models-interactions/model-actors/actor.test/src/test/java/org/onap/policy/controlloop/actor/test/BasicOperationTest.java
@@ -3,6 +3,7 @@
  * 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.
@@ -20,53 +21,58 @@
 
 package org.onap.policy.controlloop.actor.test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-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.assertNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.runner.RunWith;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.resources.ResourceUtils;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
 
-public class BasicOperationTest {
+@ExtendWith(MockitoExtension.class)
+ class BasicOperationTest {
     private static final String ACTOR = "my-actor";
     private static final String OPERATION = "my-operation";
 
     private BasicOperation oper;
 
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeEach
+     void setUp() throws Exception {
         oper = new BasicHttpOperation(ACTOR, OPERATION);
         oper.setUpBasic();
     }
 
     @Test
-    public void testBasicHttpOperation() {
+     void testBasicHttpOperation() {
         oper = new BasicHttpOperation();
         assertEquals(BasicHttpOperation.DEFAULT_ACTOR, oper.actorName);
         assertEquals(BasicHttpOperation.DEFAULT_OPERATION, oper.operationName);
     }
 
     @Test
-    public void testBasicHttpOperationStringString() {
+     void testBasicHttpOperationStringString() {
         assertEquals(ACTOR, oper.actorName);
         assertEquals(OPERATION, oper.operationName);
     }
 
     @Test
-    public void testSetUp() throws Exception {
+     void testSetUp() throws Exception {
         assertNotNull(oper.future);
         assertNotNull(oper.outcome);
         assertNotNull(oper.executor);
     }
 
     @Test
-    public void testMakeContext() {
+     void testMakeContext() {
         oper.makeContext();
 
         assertSame(oper.service, oper.params.getActorService());
@@ -74,16 +80,15 @@ public class BasicOperationTest {
         assertEquals(ACTOR, oper.params.getActor());
         assertEquals(OPERATION, oper.params.getOperation());
         assertSame(BasicHttpOperation.REQ_ID, oper.params.getRequestId());
-        assertEquals(BasicHttpOperation.TARGET_ENTITY, oper.params.getTargetEntity());
     }
 
     @Test
-    public void testMakePayload() {
+     void testMakePayload() {
         assertNull(oper.makePayload());
     }
 
     @Test
-    public void testVerifyRequest() throws CoderException {
+     void testVerifyRequest() throws CoderException {
         Map<String, Object> map = Util.translateToMap("", ResourceUtils.getResourceAsString("actual.json"));
         oper.verifyRequest("expected.json", map, "svc-request-id", "vnf-id");
     }