1 files changed, 33 insertions, 35 deletions

diff --git a/config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java b/config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java
index 9b4b6864309..8de95945a18 100644
--- a/config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/NameFieldCheckTestCase.java
@@ -1,11 +1,9 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests that "name" is not allowed as name for a field.
@@ -17,20 +15,20 @@ import static org.junit.Assert.fail;
 public class NameFieldCheckTestCase extends AbstractSchemaTestCase {
 
     @Test
-    public void testNameField() {
+    void testNameField() {
         try {
             ApplicationBuilder.createFromString(
                     "search simple {\n" +
-                    "  document name-check {\n" +
-                    "    field title type string {\n" +
-                    "      indexing: summary | index\n" +
-                    "    }\n" +
-                    "    # reserved name, should trigger error\n" +
-                    "    field sddocname type string {\n" +
-                    "      indexing: index\n" +
-                    "    }\n" +
-                    "  }\n" +
-                    "}");
+                            "  document name-check {\n" +
+                            "    field title type string {\n" +
+                            "      indexing: summary | index\n" +
+                            "    }\n" +
+                            "    # reserved name, should trigger error\n" +
+                            "    field sddocname type string {\n" +
+                            "      indexing: index\n" +
+                            "    }\n" +
+                            "  }\n" +
+                            "}");
             fail("Should throw exception.");
         } catch (Exception expected) {
             // Success
@@ -38,39 +36,39 @@ public class NameFieldCheckTestCase extends AbstractSchemaTestCase {
     }
 
     @Test
-    public void testDuplicateNamesInSearchDifferentType() {
+    void testDuplicateNamesInSearchDifferentType() {
         try {
             ApplicationBuilder.createFromString(
                     "search duplicatenamesinsearch {\n" +
-                    "  document {\n" +
-                    "    field grpphotoids64 type string { }\n" +
-                    "  }\n" +
-                    "  field grpphotoids64 type array<long> {\n" +
-                    "    indexing: input grpphotoids64 | split \" \" | for_each {\n" +
-                    "      base64decode } | attribute\n" +
-                    "  }\n" +
-                    "}");
+                            "  document {\n" +
+                            "    field grpphotoids64 type string { }\n" +
+                            "  }\n" +
+                            "  field grpphotoids64 type array<long> {\n" +
+                            "    indexing: input grpphotoids64 | split \" \" | for_each {\n" +
+                            "      base64decode } | attribute\n" +
+                            "  }\n" +
+                            "}");
             fail("Should throw exception.");
         } catch (Exception e) {
             assertEquals("For schema 'duplicatenamesinsearch', field 'grpphotoids64': " +
-                         "Incompatible types. Expected Array<long> for index field 'grpphotoids64', got string.", e.getMessage());
+                    "Incompatible types. Expected Array<long> for index field 'grpphotoids64', got string.", e.getMessage());
         }
     }
 
     @Test
-    public void testDuplicateNamesInDoc() {
+    void testDuplicateNamesInDoc() {
         try {
             ApplicationBuilder.createFromString(
                     "search duplicatenamesindoc {\n" +
-                    "  document {\n" +
-                    "    field foo type int {\n" +
-                    "      indexing: attribute\n" +
-                    "    }\n" +
-                    "    field fOo type string {\n" +
-                    "      indexing: index\n" +
-                    "    }\n" +
-                    "  }\n" +
-                    "}");
+                            "  document {\n" +
+                            "    field foo type int {\n" +
+                            "      indexing: attribute\n" +
+                            "    }\n" +
+                            "    field fOo type string {\n" +
+                            "      indexing: index\n" +
+                            "    }\n" +
+                            "  }\n" +
+                            "}");
             fail("Should throw exception.");
         } catch (Exception e) {
             assertTrue(e.getMessage().matches(".*Duplicate.*"));