1 files changed, 30 insertions, 32 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java
index 107ee8aef72..8ca973dc59f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/application/validation/AccessControlValidatorTestBase.java
@@ -8,7 +8,7 @@ import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.config.model.test.MockApplicationPackage;
 import com.yahoo.config.provision.Zone;
 import com.yahoo.vespa.model.VespaModel;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
@@ -19,9 +19,7 @@ import java.time.format.DateTimeFormatter;
 
 import static com.yahoo.config.model.test.TestUtil.joinLines;
 import static com.yahoo.config.provision.Environment.prod;
-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.*;
 
 /**
  * @author gjoranv
@@ -50,7 +48,7 @@ public abstract class AccessControlValidatorTestBase {
                       "    </handler>");
 
     @Test
-    public void cluster_with_protection_passes_validation() throws IOException, SAXException {
+    void cluster_with_protection_passes_validation() throws IOException, SAXException {
         DeployState deployState = deployState(servicesXml(true, true));
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -58,7 +56,7 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void cluster_with_no_handlers_passes_validation_without_protection() throws IOException, SAXException{
+    void cluster_with_no_handlers_passes_validation_without_protection() throws IOException, SAXException {
         DeployState deployState = deployState(servicesXml(false, false));
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -66,10 +64,10 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void cluster_without_custom_components_passes_validation_without_protection() throws IOException, SAXException{
+    void cluster_without_custom_components_passes_validation_without_protection() throws IOException, SAXException {
         String servicesXml = joinLines("<services version='1.0'>",
-                                       "  <container id='default' version='1.0' />",
-                                       "</services>");
+                "  <container id='default' version='1.0' />",
+                "</services>");
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -77,7 +75,7 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void cluster_with_handler_fails_validation_without_protection() throws IOException, SAXException{
+    void cluster_with_handler_fails_validation_without_protection() throws IOException, SAXException {
         DeployState deployState = deployState(servicesXml(true, false));
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -91,12 +89,12 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void no_http_element_has_same_effect_as_no_write_protection() throws IOException, SAXException{
+    void no_http_element_has_same_effect_as_no_write_protection() throws IOException, SAXException {
         String servicesXml = joinLines("<services version='1.0'>",
-                                       "  <container id='default' version='1.0'>",
-                                       httpHandlerXml,
-                                       "  </container>",
-                                       "</services>");
+                "  <container id='default' version='1.0'>",
+                httpHandlerXml,
+                "  </container>",
+                "</services>");
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -110,14 +108,14 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void cluster_with_mbus_handler_passes_validation_without_write_protection() throws IOException, SAXException{
+    void cluster_with_mbus_handler_passes_validation_without_write_protection() throws IOException, SAXException {
         String servicesXml = joinLines("<services version='1.0'>",
-                                       "  <container id='default' version='1.0'>",
-                                       "    <handler id='foo'>",
-                                       "      <binding>mbus://*/foo</binding>",
-                                       "    </handler>",
-                                       "  </container>",
-                                       "</services>");
+                "  <container id='default' version='1.0'>",
+                "    <handler id='foo'>",
+                "      <binding>mbus://*/foo</binding>",
+                "    </handler>",
+                "  </container>",
+                "</services>");
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -125,12 +123,12 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void write_protection_is_not_required_for_non_default_application_type() throws IOException, SAXException{
+    void write_protection_is_not_required_for_non_default_application_type() throws IOException, SAXException {
         String servicesXml = joinLines("<services version='1.0' application-type='hosted-infrastructure'>",
-                                       "  <container id='default' version='1.0'>",
-                                       httpHandlerXml,
-                                       "  </container>",
-                                       "</services>");
+                "  <container id='default' version='1.0'>",
+                httpHandlerXml,
+                "  </container>",
+                "</services>");
         DeployState deployState = deployState(servicesXml);
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
@@ -138,10 +136,10 @@ public abstract class AccessControlValidatorTestBase {
     }
 
     @Test
-    public void write_protection_is_not_required_with_validation_override() throws IOException, SAXException{
+    void write_protection_is_not_required_with_validation_override() throws IOException, SAXException {
         DeployState deployState = deployState(servicesXml(true, false),
-                                              "<validation-overrides><allow until='2000-01-30'>access-control</allow></validation-overrides>",
-                                              LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant());
+                "<validation-overrides><allow until='2000-01-30'>access-control</allow></validation-overrides>",
+                LocalDate.parse("2000-01-01", DateTimeFormatter.ISO_DATE).atStartOfDay().atZone(ZoneOffset.UTC).toInstant());
         VespaModel model = new VespaModel(new NullConfigModelRegistry(), deployState);
 
         validator.validate(model, deployState);
@@ -164,8 +162,8 @@ public abstract class AccessControlValidatorTestBase {
                 .now(now);
         final DeployState deployState = builder.build();
 
-        assertTrue("Test must emulate a hosted deployment.", deployState.isHosted());
-        assertEquals("Test must emulate a prod environment.", prod, deployState.zone().environment());
+        assertTrue(deployState.isHosted(), "Test must emulate a hosted deployment.");
+        assertEquals(prod, deployState.zone().environment(), "Test must emulate a prod environment.");
 
         return deployState;
     }