Removing deprecated DMAAP library

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

diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
similarity index 86%
rename from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
rename to feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
index 3d64687..1a85304 100644 (file)
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
+++ b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/StartStateTest.java
@@ -3,7 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2018, 2020 AT&T Intellectual Property. All rights reserved.
- * Modifications Copyright (C) 2020 Nordix Foundation
+ * Modifications Copyright (C) 2020, 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,9 +21,9 @@
 
 package org.onap.policy.drools.pooling.state;
 
-import static org.junit.Assert.assertEquals;
-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.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;
@@ -33,15 +33,15 @@ import static org.mockito.Mockito.when;
 
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
-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.message.Heartbeat;
 import org.onap.policy.drools.pooling.message.Identification;
 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 StartStateTest extends SupportBasicStateTester {
+class StartStateTest extends SupportBasicStateTester {
 
     private StartState state;
 
@@ -49,7 +49,7 @@ public class StartStateTest extends SupportBasicStateTester {
      * Setup.
      */
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
 
@@ -57,7 +57,7 @@ public class StartStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStart() {
+    void testStart() {
         state.start();
 
         Pair<String, Heartbeat> msg = capturePublishedMessage(Heartbeat.class);
@@ -75,11 +75,11 @@ public class StartStateTest extends SupportBasicStateTester {
         assertEquals(STD_INTER_HEARTBEAT_MS, generator.getMiddle().longValue());
 
         // invoke the task - it should generate another heartbeat
-        assertEquals(null, generator.getRight().fire());
+        assertNull(generator.getRight().fire());
         verify(mgr, times(2)).publish(MY_HOST, msg.getRight());
 
         // and again
-        assertEquals(null, generator.getRight().fire());
+        assertNull(generator.getRight().fire());
         verify(mgr, times(3)).publish(MY_HOST, msg.getRight());
 
 
@@ -100,7 +100,7 @@ public class StartStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStartStatePoolingManager() {
+    void testStartStatePoolingManager() {
         /*
          * Prove the state is attached to the manager by invoking getHost(), which
          * delegates to the manager.
@@ -109,7 +109,7 @@ public class StartStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testStartStateState() {
+    void testStartStateState() {
         // create a new state from the current state
         state = new StartState(mgr);
 
@@ -121,7 +121,7 @@ public class StartStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessHeartbeat() {
+    void testProcessHeartbeat() {
         Heartbeat msg = new Heartbeat();
 
         // no matching data in heart beat
@@ -153,27 +153,27 @@ public class StartStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessIdentification() {
+    void testProcessIdentification() {
         assertNull(state.process(new Identification(MY_HOST, null)));
     }
 
     @Test
-    public void testProcessLeader() {
+    void testProcessLeader() {
         assertNull(state.process(new Leader(MY_HOST, null)));
     }
 
     @Test
-    public void testProcessOffline() {
+    void testProcessOffline() {
         assertNull(state.process(new Offline(HOST1)));
     }
 
     @Test
-    public void testProcessQuery() {
+    void testProcessQuery() {
         assertNull(state.process(new Query()));
     }
 
     @Test
-    public void testGetHbTimestampMs() {
+    void testGetHbTimestampMs() {
         long tcurrent = System.currentTimeMillis();
         assertTrue(new StartState(mgr).getHbTimestampMs() >= tcurrent);