Removing deprecated DMAAP library

[policy/drools-pdp.git] / feature-pooling-messages / src / test / java / org / onap / policy / drools / pooling / state / StateTest.java

diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
similarity index 84%
rename from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
rename to feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
index 87868a7..cfae6f3 100644 (file)
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
+++ b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/StateTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2018, 2020 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 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.
@@ -21,18 +22,18 @@
 package org.onap.policy.drools.pooling.state;
 
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.onap.policy.drools.pooling.CancellableScheduledTask;
 import org.onap.policy.drools.pooling.PoolingManager;
 import org.onap.policy.drools.pooling.message.BucketAssignments;
@@ -42,14 +43,14 @@ import org.onap.policy.drools.pooling.message.Leader;
 import org.onap.policy.drools.pooling.message.Offline;
 import org.onap.policy.drools.pooling.message.Query;
 
-public class StateTest extends SupportBasicStateTester {
+class StateTest extends SupportBasicStateTester {
 
     private State state;
 
     /**
      * Setup.
      */
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
 
@@ -57,7 +58,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStatePoolingManager() {
+    void testStatePoolingManager() {
         /*
          * Prove the state is attached to the manager by invoking getHost(), which
          * delegates to the manager.
@@ -66,7 +67,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStateState() {
+    void testStateState() {
         // allocate a new state, copying from the old state
         state = new MyState(mgr);
 
@@ -78,7 +79,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testCancelTimers() {
+    void testCancelTimers() {
         int delay = 100;
         int initDelay = 200;
 
@@ -122,12 +123,12 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStart() {
+    void testStart() {
         assertThatCode(() -> state.start()).doesNotThrowAnyException();
     }
 
     @Test
-    public void testGoStart() {
+    void testGoStart() {
         State next = mock(State.class);
         when(mgr.goStart()).thenReturn(next);
 
@@ -136,7 +137,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testGoQuery() {
+    void testGoQuery() {
         State next = mock(State.class);
         when(mgr.goQuery()).thenReturn(next);
 
@@ -145,7 +146,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testGoActive_WithAssignment() {
+    void testGoActive_WithAssignment() {
         State act = mock(State.class);
         State inact = mock(State.class);
 
@@ -161,7 +162,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testGoActive_WithoutAssignment() {
+    void testGoActive_WithoutAssignment() {
         State act = mock(State.class);
         State inact = mock(State.class);
 
@@ -177,7 +178,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testGoActive_NullAssignment() {
+    void testGoActive_NullAssignment() {
         State act = mock(State.class);
         State inact = mock(State.class);
 
@@ -190,7 +191,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testGoInactive() {
+    void testGoInactive() {
         State next = mock(State.class);
         when(mgr.goInactive()).thenReturn(next);
 
@@ -199,28 +200,28 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessHeartbeat() {
+    void testProcessHeartbeat() {
         assertNull(state.process(new Heartbeat()));
     }
 
     @Test
-    public void testProcessIdentification() {
+    void testProcessIdentification() {
         assertNull(state.process(new Identification()));
     }
 
     @Test
-    public void testProcessLeader() {
+    void testProcessLeader() {
         String[] arr = {HOST2, HOST1};
         BucketAssignments asgn = new BucketAssignments(arr);
         Leader msg = new Leader(HOST1, asgn);
 
         // should ignore it
-        assertEquals(null, state.process(msg));
+        assertNull(state.process(msg));
         verify(mgr).startDistributing(asgn);
     }
 
     @Test
-    public void testProcessLeader_Invalid() {
+    void testProcessLeader_Invalid() {
         Leader msg = new Leader(PREV_HOST, null);
 
         // should stay in the same state, and not start distributing
@@ -231,24 +232,24 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testIsValidLeader_NullAssignment() {
+    void testIsValidLeader_NullAssignment() {
         assertFalse(state.isValid(new Leader(PREV_HOST, null)));
     }
 
     @Test
-    public void testIsValidLeader_NullSource() {
+    void testIsValidLeader_NullSource() {
         String[] arr = {HOST2, PREV_HOST, MY_HOST};
         BucketAssignments asgn = new BucketAssignments(arr);
         assertFalse(state.isValid(new Leader(null, asgn)));
     }
 
     @Test
-    public void testIsValidLeader_EmptyAssignment() {
+    void testIsValidLeader_EmptyAssignment() {
         assertFalse(state.isValid(new Leader(PREV_HOST, new BucketAssignments())));
     }
 
     @Test
-    public void testIsValidLeader_FromSelf() {
+    void testIsValidLeader_FromSelf() {
         String[] arr = {HOST2, MY_HOST};
         BucketAssignments asgn = new BucketAssignments(arr);
 
@@ -256,7 +257,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testIsValidLeader_WrongLeader() {
+    void testIsValidLeader_WrongLeader() {
         String[] arr = {HOST2, HOST3};
         BucketAssignments asgn = new BucketAssignments(arr);
 
@@ -264,7 +265,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testIsValidLeader() {
+    void testIsValidLeader() {
         String[] arr = {HOST2, HOST1};
         BucketAssignments asgn = new BucketAssignments(arr);
 
@@ -272,17 +273,17 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessOffline() {
+    void testProcessOffline() {
         assertNull(state.process(new Offline()));
     }
 
     @Test
-    public void testProcessQuery() {
+    void testProcessQuery() {
         assertNull(state.process(new Query()));
     }
 
     @Test
-    public void testPublishIdentification() {
+    void testPublishIdentification() {
         Identification msg = new Identification();
         state.publish(msg);
 
@@ -290,7 +291,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testPublishLeader() {
+    void testPublishLeader() {
         Leader msg = new Leader();
         state.publish(msg);
 
@@ -298,7 +299,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testPublishOffline() {
+    void testPublishOffline() {
         Offline msg = new Offline();
         state.publish(msg);
 
@@ -306,7 +307,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testPublishQuery() {
+    void testPublishQuery() {
         Query msg = new Query();
         state.publish(msg);
 
@@ -314,7 +315,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testPublishStringHeartbeat() {
+    void testPublishStringHeartbeat() {
         String chnl = "channelH";
         Heartbeat msg = new Heartbeat();
 
@@ -324,7 +325,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStartDistributing() {
+    void testStartDistributing() {
         BucketAssignments asgn = new BucketAssignments();
         state.startDistributing(asgn);
 
@@ -332,14 +333,14 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStartDistributing_NullAssignments() {
+    void testStartDistributing_NullAssignments() {
         state.startDistributing(null);
 
         verify(mgr, never()).startDistributing(any());
     }
 
     @Test
-    public void testSchedule() {
+    void testSchedule() {
         int delay = 100;
 
         StateTimerTask task = mock(StateTimerTask.class);
@@ -361,7 +362,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testScheduleWithFixedDelay() {
+    void testScheduleWithFixedDelay() {
         int initdel = 100;
         int delay = 200;
 
@@ -384,7 +385,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testMissedHeartbeat() {
+    void testMissedHeartbeat() {
         State next = mock(State.class);
         when(mgr.goStart()).thenReturn(next);
 
@@ -399,7 +400,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testInternalTopicFailed() {
+    void testInternalTopicFailed() {
         State next = mock(State.class);
         when(mgr.goInactive()).thenReturn(next);
 
@@ -414,7 +415,7 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testMakeHeartbeat() {
+    void testMakeHeartbeat() {
         long timestamp = 30000L;
         Heartbeat msg = state.makeHeartbeat(timestamp);
 
@@ -423,40 +424,40 @@ public class StateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testMakeIdentification() {
+    void testMakeIdentification() {
         Identification ident = state.makeIdentification();
         assertEquals(MY_HOST, ident.getSource());
         assertEquals(ASGN3, ident.getAssignments());
     }
 
     @Test
-    public void testMakeOffline() {
+    void testMakeOffline() {
         Offline msg = state.makeOffline();
 
         assertEquals(MY_HOST, msg.getSource());
     }
 
     @Test
-    public void testMakeQuery() {
+    void testMakeQuery() {
         Query msg = state.makeQuery();
 
         assertEquals(MY_HOST, msg.getSource());
     }
 
     @Test
-    public void testGetHost() {
+    void testGetHost() {
         assertEquals(MY_HOST, state.getHost());
     }
 
     @Test
-    public void testGetTopic() {
+    void testGetTopic() {
         assertEquals(MY_TOPIC, state.getTopic());
     }
 
     /**
      * State used for testing purposes, with abstract methods implemented.
      */
-    private class MyState extends State {
+    private static class MyState extends State {
 
         public MyState(PoolingManager mgr) {
             super(mgr);