1 files changed, 29 insertions, 31 deletions
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java
index 2361a5cefd8..0e3c3c6d4b3 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/StateVersionTrackerTest.java
@@ -7,13 +7,11 @@ import com.yahoo.vdslib.state.NodeState;
 import com.yahoo.vdslib.state.NodeType;
 import com.yahoo.vdslib.state.State;
 import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -40,7 +38,7 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void version_is_incremented_when_new_state_is_applied() {
+    void version_is_incremented_when_new_state_is_applied() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.setVersionRetrievedFromZooKeeper(100);
         updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:2 storage:2"), 123);
@@ -49,33 +47,33 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void version_is_1_upon_construction() {
+    void version_is_1_upon_construction() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         assertEquals(1, versionTracker.getCurrentVersion());
     }
 
     @Test
-    public void set_current_version_caps_lowest_version_to_1() {
+    void set_current_version_caps_lowest_version_to_1() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.setVersionRetrievedFromZooKeeper(0);
         assertEquals(1, versionTracker.getCurrentVersion());
     }
 
     @Test
-    public void new_version_from_zk_predicate_initially_false() {
+    void new_version_from_zk_predicate_initially_false() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         assertFalse(versionTracker.hasReceivedNewVersionFromZooKeeper());
     }
 
     @Test
-    public void new_version_from_zk_predicate_true_after_setting_zk_version() {
+    void new_version_from_zk_predicate_true_after_setting_zk_version() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.setVersionRetrievedFromZooKeeper(5);
         assertTrue(versionTracker.hasReceivedNewVersionFromZooKeeper());
     }
 
     @Test
-    public void new_version_from_zk_predicate_false_after_applying_higher_version() {
+    void new_version_from_zk_predicate_false_after_applying_higher_version() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.setVersionRetrievedFromZooKeeper(5);
         updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:2 storage:2"), 123);
@@ -83,14 +81,14 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void exposed_states_are_empty_upon_construction() {
+    void exposed_states_are_empty_upon_construction() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         assertTrue(versionTracker.getVersionedClusterState().toString().isEmpty());
         assertTrue(versionTracker.getAnnotatedVersionedClusterState().getClusterState().toString().isEmpty());
     }
 
     @Test
-    public void diff_from_initial_state_implies_changed_state() {
+    void diff_from_initial_state_implies_changed_state() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.updateLatestCandidateStateBundle(stateBundleWithoutAnnotations("cluster:d"));
         assertTrue(versionTracker.candidateChangedEnoughFromCurrentToWarrantPublish());
@@ -104,48 +102,48 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void version_mismatch_not_counted_as_changed_state() {
+    void version_mismatch_not_counted_as_changed_state() {
         assertFalse(stateChangedBetween("distributor:2 storage:2", "distributor:2 storage:2"));
     }
 
     @Test
-    public void different_distributor_node_count_implies_changed_state() {
+    void different_distributor_node_count_implies_changed_state() {
         assertTrue(stateChangedBetween("distributor:2 storage:2", "distributor:3 storage:2"));
         assertTrue(stateChangedBetween("distributor:3 storage:2", "distributor:2 storage:2"));
     }
 
     @Test
-    public void different_storage_node_count_implies_changed_state() {
+    void different_storage_node_count_implies_changed_state() {
         assertTrue(stateChangedBetween("distributor:2 storage:2", "distributor:2 storage:3"));
         assertTrue(stateChangedBetween("distributor:2 storage:3", "distributor:2 storage:2"));
     }
 
     @Test
-    public void different_distributor_node_state_implies_changed_state() {
+    void different_distributor_node_state_implies_changed_state() {
         assertTrue(stateChangedBetween("distributor:2 storage:2", "distributor:2 .0.s:d storage:2"));
         assertTrue(stateChangedBetween("distributor:2 .0.s:d storage:2", "distributor:2 storage:2"));
     }
 
     @Test
-    public void different_storage_node_state_implies_changed_state() {
+    void different_storage_node_state_implies_changed_state() {
         assertTrue(stateChangedBetween("distributor:2 storage:2", "distributor:2 storage:2 .0.s:d"));
         assertTrue(stateChangedBetween("distributor:2 storage:2 .0.s:d", "distributor:2 storage:2"));
     }
 
     @Test
-    public void init_progress_change_not_counted_as_changed_state() {
+    void init_progress_change_not_counted_as_changed_state() {
         assertFalse(stateChangedBetween("distributor:2 storage:2 .0.s:i .0.i:0.5",
-                                        "distributor:2 storage:2 .0.s:i .0.i:0.6"));
+                "distributor:2 storage:2 .0.s:i .0.i:0.6"));
     }
 
     @Test
-    public void lowest_observed_distribution_bit_is_initially_16() {
+    void lowest_observed_distribution_bit_is_initially_16() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         assertEquals(16, versionTracker.getLowestObservedDistributionBits());
     }
 
     @Test
-    public void lowest_observed_distribution_bit_is_tracked_across_states() {
+    void lowest_observed_distribution_bit_is_tracked_across_states() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         updateAndPromote(versionTracker, stateWithoutAnnotations("bits:15 distributor:2 storage:2"), 100);
         assertEquals(15, versionTracker.getLowestObservedDistributionBits());
@@ -161,7 +159,7 @@ public class StateVersionTrackerTest {
     // min used bits. The former is derived from the latter, but the latter is not visible in the
     // published state (but _is_ visible in the internal ClusterState structures).
     @Test
-    public void per_node_min_bits_changes_are_not_considered_different() {
+    void per_node_min_bits_changes_are_not_considered_different() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         final AnnotatedClusterState stateWithMinBits = stateWithoutAnnotations("distributor:2 storage:2");
         stateWithMinBits.getClusterState().setNodeState(
@@ -173,7 +171,7 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void state_history_is_initially_empty() {
+    void state_history_is_initially_empty() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         assertTrue(versionTracker.getClusterStateHistory().isEmpty());
     }
@@ -188,9 +186,9 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void applying_state_adds_to_cluster_state_history() {
+    void applying_state_adds_to_cluster_state_history() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
-        updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:2 storage:2") ,100);
+        updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:2 storage:2"), 100);
         updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:3 storage:3"), 200);
         updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:4 storage:4"), 300);
 
@@ -204,11 +202,11 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void old_states_pruned_when_state_history_limit_reached() {
+    void old_states_pruned_when_state_history_limit_reached() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.setMaxHistoryEntryCount(2);
 
-        updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:2 storage:2") ,100);
+        updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:2 storage:2"), 100);
         updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:3 storage:3"), 200);
         updateAndPromote(versionTracker, stateWithoutAnnotations("distributor:4 storage:4"), 300);
 
@@ -227,7 +225,7 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void can_get_latest_non_published_candidate_state() {
+    void can_get_latest_non_published_candidate_state() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
 
         AnnotatedClusterState candidate = stateWithoutAnnotations("distributor:2 storage:2");
@@ -258,7 +256,7 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void version_change_check_takes_derived_states_into_account() {
+    void version_change_check_takes_derived_states_into_account() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.updateLatestCandidateStateBundle(baselineBundle(false));
         versionTracker.promoteCandidateToVersionedState(1234);
@@ -273,7 +271,7 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void buckets_pending_state_is_tracked_between_cluster_states() {
+    void buckets_pending_state_is_tracked_between_cluster_states() {
         final StateVersionTracker tracker = createWithMockedMetrics();
         final NodeInfo distributorNode = mock(DistributorNodeInfo.class);
         when(distributorNode.isDistributor()).thenReturn(true);
@@ -307,7 +305,7 @@ public class StateVersionTrackerTest {
     }
 
     @Test
-    public void setting_zookeeper_retrieved_bundle_sets_current_versioned_state_and_resets_candidate_state() {
+    void setting_zookeeper_retrieved_bundle_sets_current_versioned_state_and_resets_candidate_state() {
         final StateVersionTracker versionTracker = createWithMockedMetrics();
         versionTracker.setVersionRetrievedFromZooKeeper(100);
         versionTracker.updateLatestCandidateStateBundle(