1 files changed, 6 insertions, 8 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java
index 7cad29cc2c4..7d6e243fba4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/ContainerRestartValidatorTest.java
@@ -7,15 +7,13 @@ import com.yahoo.vespa.defaults.Defaults;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.vespa.model.test.utils.VespaModelCreatorWithMockPkg;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.Collections;
 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.*;
 
 /**
  * @author bjorncs
@@ -23,7 +21,7 @@ import static org.junit.Assert.assertTrue;
 public class ContainerRestartValidatorTest {
 
     @Test
-    public void validator_returns_action_for_containers_with_restart_on_deploy_enabled() {
+    void validator_returns_action_for_containers_with_restart_on_deploy_enabled() {
         VespaModel current = createModel(true);
         VespaModel next = createModel(true);
         List<ConfigChangeAction> result = validateModel(current, next);
@@ -31,7 +29,7 @@ public class ContainerRestartValidatorTest {
     }
 
     @Test
-    public void validator_returns_empty_list_for_containers_with_restart_on_deploy_disabled() {
+    void validator_returns_empty_list_for_containers_with_restart_on_deploy_disabled() {
         VespaModel current = createModel(false);
         VespaModel next = createModel(false);
         List<ConfigChangeAction> result = validateModel(current, next);
@@ -39,7 +37,7 @@ public class ContainerRestartValidatorTest {
     }
 
     @Test
-    public void validator_returns_empty_list_for_containers_with_restart_on_deploy_disabled_where_previously_enabled() {
+    void validator_returns_empty_list_for_containers_with_restart_on_deploy_disabled_where_previously_enabled() {
         VespaModel current = createModel(true);
         VespaModel next = createModel(false);
         List<ConfigChangeAction> result = validateModel(current, next);
@@ -47,7 +45,7 @@ public class ContainerRestartValidatorTest {
     }
 
     @Test
-    public void restart_on_deploy_is_propagated_to_cluster() {
+    void restart_on_deploy_is_propagated_to_cluster() {
         VespaModel model1 = createModel(false);
         assertFalse(model1.getContainerClusters().get("cluster1").getDeferChangesUntilRestart());
         assertFalse(model1.getContainerClusters().get("cluster2").getDeferChangesUntilRestart());