1 files changed, 19 insertions, 19 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSchemaClusterChangeValidatorTest.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSchemaClusterChangeValidatorTest.java
index 7b1474f9754..309ad4094e4 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSchemaClusterChangeValidatorTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/change/IndexedSchemaClusterChangeValidatorTest.java
@@ -10,7 +10,7 @@ import com.yahoo.config.application.api.ValidationOverrides;
 import com.yahoo.vespa.model.content.utils.ApplicationPackageBuilder;
 import com.yahoo.vespa.model.content.utils.ContentClusterBuilder;
 import com.yahoo.vespa.model.content.utils.SchemaBuilder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.time.Instant;
 import java.util.List;
@@ -19,7 +19,7 @@ import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTe
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRefeedAction;
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.newRestartAction;
 import static com.yahoo.vespa.model.application.validation.change.ConfigChangeTestUtils.normalizeServicesInActions;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class IndexedSchemaClusterChangeValidatorTest {
 
@@ -99,56 +99,56 @@ public class IndexedSchemaClusterChangeValidatorTest {
             new ServiceInfo("searchnode2", "null", null, null, "bar/search/cluster.bar/0", "null"));
 
     @Test
-    public void requireThatDocumentDatabaseChangeIsDiscovered() {
+    void requireThatDocumentDatabaseChangeIsDiscovered() {
         Fixture.newOneDocFixture(STRING_FIELD, ATTRIBUTE_FIELD).
                 assertValidation(newRestartAction(ClusterSpec.Id.from("test"),
-                                                  "Document type 'd1': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE));
+                "Document type 'd1': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE));
     }
 
     @Test
-    public void requireThatChangeInSeveralDocumentDatabasesAreDiscovered() {
+    void requireThatChangeInSeveralDocumentDatabasesAreDiscovered() {
         Fixture.newTwoDocFixture(STRING_FIELD, ATTRIBUTE_FIELD).
                 assertValidation(List.of(newRestartAction(ClusterSpec.Id.from("test"),
-                                                          "Document type 'd1': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE),
-                                         newRestartAction(ClusterSpec.Id.from("test"),
-                                                          "Document type 'd2': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE)));
+                "Document type 'd1': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE),
+                newRestartAction(ClusterSpec.Id.from("test"),
+                        "Document type 'd2': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE)));
     }
 
     @Test
-    public void requireThatChangeInSeveralContentClustersAreDiscovered() {
+    void requireThatChangeInSeveralContentClustersAreDiscovered() {
         Fixture.newTwoClusterFixture(STRING_FIELD, ATTRIBUTE_FIELD).
                 assertValidation(List.of(newRestartAction(ClusterSpec.Id.from("test"),
-                                                          "Document type 'd1': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE),
-                                         newRestartAction(ClusterSpec.Id.from("test"),
-                                                          "Document type 'd2': " + ATTRIBUTE_CHANGE_MSG, BAR_SERVICE)));
+                "Document type 'd1': " + ATTRIBUTE_CHANGE_MSG, FOO_SERVICE),
+                newRestartAction(ClusterSpec.Id.from("test"),
+                        "Document type 'd2': " + ATTRIBUTE_CHANGE_MSG, BAR_SERVICE)));
     }
 
     @Test
-    public void requireThatAddingDocumentDatabaseIsOk() {
+    void requireThatAddingDocumentDatabaseIsOk() {
         new Fixture(Fixture.newOneDocModel(STRING_FIELD), Fixture.newTwoDocModel(STRING_FIELD, STRING_FIELD)).assertValidation();
     }
 
     @Test
-    public void requireThatRemovingDocumentDatabaseIsOk() {
+    void requireThatRemovingDocumentDatabaseIsOk() {
         new Fixture(Fixture.newTwoDocModel(STRING_FIELD, STRING_FIELD), Fixture.newOneDocModel(STRING_FIELD)).assertValidation();
     }
 
     @Test
-    public void requireThatAddingContentClusterIsOk() {
+    void requireThatAddingContentClusterIsOk() {
         new Fixture(Fixture.newOneDocModel(STRING_FIELD), Fixture.newTwoClusterModel(STRING_FIELD, STRING_FIELD)).assertValidation();
     }
 
     @Test
-    public void requireThatRemovingContentClusterIsOk() {
+    void requireThatRemovingContentClusterIsOk() {
         new Fixture(Fixture.newTwoClusterModel(STRING_FIELD, STRING_FIELD), Fixture.newOneDocModel(STRING_FIELD)).assertValidation();
     }
 
     @Test
-    public void requireThatChangingFieldTypeIsDiscovered() {
+    void requireThatChangingFieldTypeIsDiscovered() {
         Fixture f = Fixture.newOneDocFixture(STRING_FIELD, INT_FIELD);
         f.assertValidation(List.of(newRefeedAction(ClusterSpec.Id.from("test"),
-                                                   ValidationId.fieldTypeChange,
-                                                   "Document type 'd1': " + FIELD_TYPE_CHANGE_MSG, FOO_SERVICE, "d1")));
+                ValidationId.fieldTypeChange,
+                "Document type 'd1': " + FIELD_TYPE_CHANGE_MSG, FOO_SERVICE, "d1")));
     }
 
 }