1 files changed, 103 insertions, 64 deletions
diff --git a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
index 0dcb800ca04..902d260c86d 100644
--- a/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
+++ b/controller-api/src/test/java/com/yahoo/vespa/hosted/controller/api/identifiers/IdentifierTest.java
@@ -2,129 +2,168 @@
 package com.yahoo.vespa.hosted.controller.api.identifiers;
 
 import com.yahoo.config.provision.zone.ZoneId;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
  * @author smorgrav
  */
 public class IdentifierTest {
 
-    @Test(expected = IllegalArgumentException.class)
-    public void existing_tenant_id_not_empty() {
-        new TenantId("");
+    @Test
+    void existing_tenant_id_not_empty() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new TenantId("");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void existing_tenant_id_must_check_pattern() {
-        new TenantId("`");
+    @Test
+    void existing_tenant_id_must_check_pattern() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new TenantId("`");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void default_not_allowed_for_tenants() {
-        new TenantId("default");
+    @Test
+    void default_not_allowed_for_tenants() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new TenantId("default");
+        });
     }
 
     @Test
-    public void existing_tenant_id_must_accept_valid_id() {
+    void existing_tenant_id_must_accept_valid_id() {
         new TenantId("msbe");
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void existing_tenant_id_cannot_be_uppercase() {
-        new TenantId("MixedCaseTenant");
+    @Test
+    void existing_tenant_id_cannot_be_uppercase() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new TenantId("MixedCaseTenant");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void existing_tenant_id_cannot_contain_dots() {
-        new TenantId("tenant.with.dots");
+    @Test
+    void existing_tenant_id_cannot_contain_dots() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new TenantId("tenant.with.dots");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_tenant_id_cannot_contain_underscore() {
-        TenantId.validate("underscore_tenant");
+    @Test
+    void new_tenant_id_cannot_contain_underscore() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            TenantId.validate("underscore_tenant");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_tenant_id_cannot_contain_dot() {
-        TenantId.validate("tenant.with.dots");
+    @Test
+    void new_tenant_id_cannot_contain_dot() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            TenantId.validate("tenant.with.dots");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_tenant_id_cannot_contain_uppercase() {
-        TenantId.validate("UppercaseTenant");
+    @Test
+    void new_tenant_id_cannot_contain_uppercase() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            TenantId.validate("UppercaseTenant");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_tenant_id_cannot_start_with_dash() {
-        TenantId.validate("-tenant");
+    @Test
+    void new_tenant_id_cannot_start_with_dash() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            TenantId.validate("-tenant");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_tenant_id_cannot_end_with_dash() {
-        TenantId.validate("tenant-");
+    @Test
+    void new_tenant_id_cannot_end_with_dash() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            TenantId.validate("tenant-");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void existing_application_id_cannot_be_uppercase() {
-        new ApplicationId("MixedCaseApplication");
+    @Test
+    void existing_application_id_cannot_be_uppercase() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new ApplicationId("MixedCaseApplication");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void existing_application_id_cannot_contain_dots() {
-        new ApplicationId("application.with.dots");
+    @Test
+    void existing_application_id_cannot_contain_dots() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new ApplicationId("application.with.dots");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_application_id_cannot_contain_underscore() {
-        ApplicationId.validate("underscore_application");
+    @Test
+    void new_application_id_cannot_contain_underscore() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ApplicationId.validate("underscore_application");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_application_id_cannot_contain_dot() {
-        ApplicationId.validate("application.with.dots");
+    @Test
+    void new_application_id_cannot_contain_dot() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ApplicationId.validate("application.with.dots");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_application_id_cannot_contain_uppercase() {
-        ApplicationId.validate("UppercaseApplication");
+    @Test
+    void new_application_id_cannot_contain_uppercase() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ApplicationId.validate("UppercaseApplication");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_application_id_cannot_start_with_dash() {
-        ApplicationId.validate("-application");
+    @Test
+    void new_application_id_cannot_start_with_dash() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ApplicationId.validate("-application");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void new_application_id_cannot_end_with_dash() {
-        ApplicationId.validate("application-");
+    @Test
+    void new_application_id_cannot_end_with_dash() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            ApplicationId.validate("application-");
+        });
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void instance_id_cannot_be_uppercase() {
-        new InstanceId("MixedCaseInstance");
+    @Test
+    void instance_id_cannot_be_uppercase() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new InstanceId("MixedCaseInstance");
+        });
     }
 
     @Test
-    public void dns_names_has_no_underscore() {
+    void dns_names_has_no_underscore() {
         assertEquals("a-b-c", new ApplicationId("a_b_c").toDns());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void identifiers_cannot_be_named_api() {
-        new ApplicationId("api");
+    @Test
+    void identifiers_cannot_be_named_api() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new ApplicationId("api");
+        });
     }
 
     @Test
-    public void application_instance_id_dotted_string_is_subindentifers_concatinated_with_dots() {
+    void application_instance_id_dotted_string_is_subindentifers_concatinated_with_dots() {
         DeploymentId id = new DeploymentId(com.yahoo.config.provision.ApplicationId.from("tenant", "application", "instance"),
-                                           ZoneId.from("prod", "region"));
+                ZoneId.from("prod", "region"));
         assertEquals("tenant.application.prod.region.instance", id.dottedString());
     }
 
     @Test
-    public void revision_id_can_contain_application_version_number() {
+    void revision_id_can_contain_application_version_number() {
         new RevisionId("1.0.1078-24825d1f6");
     }
 }