1 files changed, 41 insertions, 41 deletions

diff --git a/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java
index dc10004a631..b5b075ae260 100644
--- a/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/derived/ExportingTestCase.java
@@ -4,11 +4,11 @@ package com.yahoo.schema.derived;
 import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.schema.ApplicationBuilder;
 import com.yahoo.schema.parser.ParseException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 /**
  * Tests exporting
@@ -18,144 +18,144 @@ import static org.junit.Assert.assertEquals;
 public class ExportingTestCase extends AbstractExportingTestCase {
 
     @Test
-    public void testIndexInfoLowerCase() throws IOException, ParseException {
+    void testIndexInfoLowerCase() throws IOException, ParseException {
         assertCorrectDeriving("indexinfo_lowercase");
     }
 
     @Test
-    public void testPositionArray() throws IOException, ParseException {
+    void testPositionArray() throws IOException, ParseException {
         assertCorrectDeriving("position_array",
-                              new TestProperties().setUseV8GeoPositions(true));
+                new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
-    public void testPositionAttribute() throws IOException, ParseException {
+    void testPositionAttribute() throws IOException, ParseException {
         assertCorrectDeriving("position_attribute",
-                              new TestProperties().setUseV8GeoPositions(true));
+                new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
-    public void testPositionExtra() throws IOException, ParseException {
+    void testPositionExtra() throws IOException, ParseException {
         assertCorrectDeriving("position_extra",
-                              new TestProperties().setUseV8GeoPositions(true));
+                new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
-    public void testPositionNoSummary() throws IOException, ParseException {
+    void testPositionNoSummary() throws IOException, ParseException {
         assertCorrectDeriving("position_nosummary",
-                              new TestProperties().setUseV8GeoPositions(true));
+                new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
-    public void testPositionSummary() throws IOException, ParseException {
+    void testPositionSummary() throws IOException, ParseException {
         assertCorrectDeriving("position_summary",
-                              new TestProperties().setUseV8GeoPositions(true));
+                new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
-    public void testUriArray() throws IOException, ParseException {
+    void testUriArray() throws IOException, ParseException {
         assertCorrectDeriving("uri_array");
     }
 
     @Test
-    public void testUriWSet() throws IOException, ParseException {
+    void testUriWSet() throws IOException, ParseException {
         assertCorrectDeriving("uri_wset");
     }
 
     @Test
-    public void testMusic() throws IOException, ParseException {
+    void testMusic() throws IOException, ParseException {
         assertCorrectDeriving("music");
     }
 
     @Test
-    public void testComplexPhysicalExporting() throws IOException, ParseException {
+    void testComplexPhysicalExporting() throws IOException, ParseException {
         assertCorrectDeriving("complex");
     }
 
     @Test
-    public void testAttributePrefetch() throws IOException, ParseException {
+    void testAttributePrefetch() throws IOException, ParseException {
         assertCorrectDeriving("attributeprefetch");
     }
 
     @Test
-    public void testAdvancedIL() throws IOException, ParseException {
+    void testAdvancedIL() throws IOException, ParseException {
         assertCorrectDeriving("advanced");
     }
 
     @Test
-    public void testEmptyDefaultIndex() throws IOException, ParseException {
+    void testEmptyDefaultIndex() throws IOException, ParseException {
         assertCorrectDeriving("emptydefault");
     }
 
     @Test
-    public void testIndexSwitches() throws IOException, ParseException {
+    void testIndexSwitches() throws IOException, ParseException {
         assertCorrectDeriving("indexswitches");
     }
 
     @Test
-    public void testRankTypes() throws IOException, ParseException {
+    void testRankTypes() throws IOException, ParseException {
         assertCorrectDeriving("ranktypes");
     }
 
     @Test
-    public void testAttributeRank() throws IOException, ParseException {
+    void testAttributeRank() throws IOException, ParseException {
         assertCorrectDeriving("attributerank");
     }
 
     @Test
-    public void testNewRank() throws IOException, ParseException {
+    void testNewRank() throws IOException, ParseException {
         assertCorrectDeriving("newrank");
     }
 
     @Test
-    public void testRankingExpression() throws IOException, ParseException {
+    void testRankingExpression() throws IOException, ParseException {
         assertCorrectDeriving("rankingexpression");
     }
 
     @Test
-    public void testAvoidRenamingRankingExpression() throws IOException, ParseException {
+    void testAvoidRenamingRankingExpression() throws IOException, ParseException {
         assertCorrectDeriving("renamedfeatures", "foo",
-                              new TestProperties(),
-                              new TestableDeployLogger());
+                new TestProperties(),
+                new TestableDeployLogger());
     }
 
     @Test
-    public void testMlr() throws IOException, ParseException {
+    void testMlr() throws IOException, ParseException {
         assertCorrectDeriving("mlr");
     }
 
     @Test
-    public void testMusic3() throws IOException, ParseException {
+    void testMusic3() throws IOException, ParseException {
         assertCorrectDeriving("music3");
     }
 
     @Test
-    public void testIndexSchema() throws IOException, ParseException {
+    void testIndexSchema() throws IOException, ParseException {
         assertCorrectDeriving("indexschema");
     }
 
     @Test
-    public void testIndexinfoFieldsets() throws IOException, ParseException {
+    void testIndexinfoFieldsets() throws IOException, ParseException {
         assertCorrectDeriving("indexinfo_fieldsets");
     }
 
     @Test
-    public void testStreamingJuniper() throws IOException, ParseException {
+    void testStreamingJuniper() throws IOException, ParseException {
         assertCorrectDeriving("streamingjuniper");
     }
 
     @Test
-    public void testPredicateAttribute() throws IOException, ParseException {
+    void testPredicateAttribute() throws IOException, ParseException {
         assertCorrectDeriving("predicate_attribute");
     }
 
     @Test
-    public void testTensor() throws IOException, ParseException {
+    void testTensor() throws IOException, ParseException {
         assertCorrectDeriving("tensor");
     }
 
     @Test
-    public void testTensor2() throws IOException, ParseException {
+    void testTensor2() throws IOException, ParseException {
         String dir = "src/test/derived/tensor2/";
         ApplicationBuilder builder = new ApplicationBuilder();
         builder.addSchemaFile(dir + "first.sd");
@@ -166,29 +166,29 @@ public class ExportingTestCase extends AbstractExportingTestCase {
     }
 
     @Test
-    public void testHnswIndex() throws IOException, ParseException {
+    void testHnswIndex() throws IOException, ParseException {
         assertCorrectDeriving("hnsw_index");
     }
 
     @Test
-    public void testRankProfileInheritance() throws IOException, ParseException {
+    void testRankProfileInheritance() throws IOException, ParseException {
         assertCorrectDeriving("rankprofileinheritance", "child", new TestableDeployLogger());
     }
 
     @Test
-    public void testLanguage() throws IOException, ParseException {
+    void testLanguage() throws IOException, ParseException {
         TestableDeployLogger logger = new TestableDeployLogger();
         assertCorrectDeriving("language", logger);
         assertEquals(0, logger.warnings.size());
     }
 
     @Test
-    public void testRankProfileModularity() throws IOException, ParseException {
+    void testRankProfileModularity() throws IOException, ParseException {
         assertCorrectDeriving("rankprofilemodularity");
     }
 
     @Test
-    public void testStructAndFieldSet() throws IOException, ParseException {
+    void testStructAndFieldSet() throws IOException, ParseException {
         assertCorrectDeriving("structandfieldset");
     }