Removing deprecated DMAAP library

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

diff --git a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
similarity index 87%
rename from feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
rename to feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
index 70abb96..aae6e05 100644 (file)
--- a/feature-pooling-dmaap/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.java
+++ b/feature-pooling-messages/src/test/java/org/onap/policy/drools/pooling/state/QueryStateTest.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,10 +21,10 @@
 
 package org.onap.policy.drools.pooling.state;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-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.assertNotNull;
+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,14 +33,14 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.apache.commons.lang3.tuple.Pair;
-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.BucketAssignments;
 import org.onap.policy.drools.pooling.message.Identification;
 import org.onap.policy.drools.pooling.message.Leader;
 import org.onap.policy.drools.pooling.message.Offline;
 
-public class QueryStateTest extends SupportBasicStateTester {
+class QueryStateTest extends SupportBasicStateTester {
 
     private QueryState state;
 
@@ -48,7 +48,7 @@ public class QueryStateTest extends SupportBasicStateTester {
      * Setup.
      */
     @Override
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
         super.setUp();
 
@@ -56,12 +56,12 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testGoQuery() {
+    void testGoQuery() {
         assertNull(state.goQuery());
     }
 
     @Test
-    public void testStart() {
+    void testStart() {
         state.start();
 
         Pair<Long, StateTimerTask> timer = onceTasks.remove();
@@ -71,7 +71,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessIdentification_SameSource() {
+    void testProcessIdentification_SameSource() {
         String[] arr = {HOST2, PREV_HOST, MY_HOST};
         BucketAssignments asgn = new BucketAssignments(arr);
 
@@ -83,7 +83,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessIdentification_DiffSource() {
+    void testProcessIdentification_DiffSource() {
         String[] arr = {HOST2, PREV_HOST, MY_HOST};
         BucketAssignments asgn = new BucketAssignments(arr);
 
@@ -97,7 +97,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @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
@@ -112,12 +112,12 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessLeader_SameLeader() {
+    void testProcessLeader_SameLeader() {
         String[] arr = {HOST2, PREV_HOST, MY_HOST};
         BucketAssignments asgn = new BucketAssignments(arr);
 
         // identify a leader that's better than my host
-        assertEquals(null, state.process(new Identification(PREV_HOST, asgn)));
+        assertNull(state.process(new Identification(PREV_HOST, asgn)));
 
         // now send a Leader message for that leader
         Leader msg = new Leader(PREV_HOST, asgn);
@@ -134,7 +134,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessLeader_BetterLeaderWithAssignment() {
+    void testProcessLeader_BetterLeaderWithAssignment() {
         String[] arr = {HOST2, PREV_HOST, MY_HOST};
         BucketAssignments asgn = new BucketAssignments(arr);
         Leader msg = new Leader(PREV_HOST, asgn);
@@ -149,7 +149,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessLeader_BetterLeaderWithoutAssignment() {
+    void testProcessLeader_BetterLeaderWithoutAssignment() {
         String[] arr = {HOST2, PREV_HOST, HOST1};
         BucketAssignments asgn = new BucketAssignments(arr);
         Leader msg = new Leader(PREV_HOST, asgn);
@@ -164,7 +164,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessLeader_NotABetterLeader() {
+    void testProcessLeader_NotABetterLeader() {
         // no assignments yet
         mgr.startDistributing(null);
         state = new QueryState(mgr);
@@ -191,19 +191,19 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testProcessOffline_NullHost() {
+    void testProcessOffline_NullHost() {
         assertNull(state.process(new Offline()));
         assertEquals(MY_HOST, state.getLeader());
     }
 
     @Test
-    public void testProcessOffline_SameHost() {
+    void testProcessOffline_SameHost() {
         assertNull(state.process(new Offline(MY_HOST)));
         assertEquals(MY_HOST, state.getLeader());
     }
 
     @Test
-    public void testProcessOffline_DiffHost() {
+    void testProcessOffline_DiffHost() {
         BucketAssignments asgn = new BucketAssignments(new String[] {PREV_HOST, HOST1});
         mgr.startDistributing(asgn);
         state = new QueryState(mgr);
@@ -226,7 +226,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testQueryState() {
+    void testQueryState() {
         /*
          * Prove the state is attached to the manager by invoking getHost(), which
          * delegates to the manager.
@@ -235,7 +235,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testAwaitIdentification_MissingSelfIdent() {
+    void testAwaitIdentification_MissingSelfIdent() {
         state.start();
 
         Pair<Long, StateTimerTask> timer = onceTasks.remove();
@@ -258,7 +258,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testAwaitIdentification_Leader() {
+    void testAwaitIdentification_Leader() {
         state.start();
         state.process(new Identification(MY_HOST, null));
 
@@ -279,7 +279,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testAwaitIdentification_HasAssignment() {
+    void testAwaitIdentification_HasAssignment() {
         // not the leader, but has an assignment
         BucketAssignments asgn = new BucketAssignments(new String[] {PREV_HOST, MY_HOST, HOST2});
         mgr.startDistributing(asgn);
@@ -310,7 +310,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testAwaitIdentification_NoAssignment() {
+    void testAwaitIdentification_NoAssignment() {
         // not the leader and no assignment
         BucketAssignments asgn = new BucketAssignments(new String[] {HOST1, HOST2});
         mgr.startDistributing(asgn);
@@ -338,7 +338,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_NullSource() {
+    void testRecordInfo_NullSource() {
         state.setAssignments(ASGN3);
         state.setLeader(MY_HOST);
 
@@ -353,7 +353,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_SourcePreceedsMyHost() {
+    void testRecordInfo_SourcePreceedsMyHost() {
         state.setAssignments(ASGN3);
         state.setLeader(MY_HOST);
 
@@ -368,7 +368,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_SourceFollowsMyHost() {
+    void testRecordInfo_SourceFollowsMyHost() {
         mgr.startDistributing(null);
         state.setLeader(MY_HOST);
 
@@ -383,7 +383,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_NewIsNull() {
+    void testRecordInfo_NewIsNull() {
         state.setAssignments(ASGN3);
         state.process(new Identification(HOST1, null));
 
@@ -391,7 +391,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_NewIsEmpty() {
+    void testRecordInfo_NewIsEmpty() {
         state.setAssignments(ASGN3);
         state.process(new Identification(PREV_HOST, new BucketAssignments()));
 
@@ -399,7 +399,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_OldIsNull() {
+    void testRecordInfo_OldIsNull() {
         mgr.startDistributing(null);
 
         BucketAssignments asgn = new BucketAssignments(new String[] {HOST1, HOST2});
@@ -409,7 +409,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_OldIsEmpty() {
+    void testRecordInfo_OldIsEmpty() {
         state.setAssignments(new BucketAssignments());
 
         BucketAssignments asgn = new BucketAssignments(new String[] {HOST1, HOST2});
@@ -419,7 +419,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_NewLeaderPreceedsOld() {
+    void testRecordInfo_NewLeaderPreceedsOld() {
         state.setAssignments(ASGN3);
         state.setLeader(MY_HOST);
 
@@ -430,7 +430,7 @@ public class QueryStateTest extends SupportBasicStateTester {
     }
 
     @Test
-    public void testRecordInfo_NewLeaderSucceedsOld() {
+    void testRecordInfo_NewLeaderSucceedsOld() {
         state.setAssignments(ASGN3);
         state.setLeader(MY_HOST);