1 files changed, 20 insertions, 20 deletions

diff --git a/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java b/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
index cd7ca1a89b9..4aa40ae902c 100644
--- a/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
+++ b/configgen/src/test/java/com/yahoo/config/codegen/DefParserPackageTest.java
@@ -1,16 +1,14 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.codegen;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
 import static com.yahoo.config.codegen.DefParserTest.assertLineFails;
 import static com.yahoo.config.codegen.DefParserTest.createDefTemplate;
 import static com.yahoo.config.codegen.DefParserTest.createParser;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * Tests setting explicit java package in the def file.
@@ -21,17 +19,17 @@ public class DefParserPackageTest {
     String PACKAGE = "com.github.myproject";
 
     @Test
-    public void package_is_set_on_root_node() {
+    void package_is_set_on_root_node() {
         DefParser parser = createParser("package=" + PACKAGE + "\n");
         CNode root = parser.getTree();
         assertEquals(PACKAGE, root.getPackage());
     }
 
     @Test
-    public void package_and_namespace_can_coexist() {
+    void package_and_namespace_can_coexist() {
         String namespace = "test.namespace";
         DefParser parser = createParser("package=" + PACKAGE +
-                                                "\nnamespace=" + namespace +"\n");
+                "\nnamespace=" + namespace + "\n");
         CNode root = parser.getTree();
         assertEquals(PACKAGE, root.getPackage());
         assertEquals(namespace, root.getNamespace());
@@ -39,37 +37,39 @@ public class DefParserPackageTest {
 
     // Required by JavaClassBuilder ctor.
     @Test
-    public void package_is_null_when_not_explicitly_given() {
+    void package_is_null_when_not_explicitly_given() {
         String namespace = "test.namespace";
         DefParser parser = createParser("namespace=" + namespace + "\n");
         CNode root = parser.getTree();
         assertNull(root.getPackage());
     }
 
-    @Test(expected = CodegenRuntimeException.class)
-    public void uppercase_chars_are_not_allowed() {
-        createParser("package=Foo.bar\n").getTree();
+    @Test
+    void uppercase_chars_are_not_allowed() {
+        assertThrows(CodegenRuntimeException.class, () -> {
+            createParser("package=Foo.bar\n").getTree();
+        });
     }
 
     @Test
-    public void spaces_are_allowed_around_equals_sign() {
+    void spaces_are_allowed_around_equals_sign() {
         DefParser parser = createParser("package =  " + PACKAGE + "\n");
         CNode root = parser.getTree();
         assertEquals(PACKAGE, root.getPackage());
     }
 
     @Test
-    public void empty_package_is_not_allowed() {
-       assertLineFails("package");
+    void empty_package_is_not_allowed() {
+        assertLineFails("package");
     }
 
     @Test
-    public void consecutive_dots_are_not_allowed() {
+    void consecutive_dots_are_not_allowed() {
         assertLineFails("package=a..b");
     }
 
     @Test
-    public void package_alters_def_md5() {
+    void package_alters_def_md5() {
         DefParser parser = createParser("a string\n");
         CNode root = parser.getTree();
 
@@ -81,7 +81,7 @@ public class DefParserPackageTest {
 
 
     @Test
-    public void number_is_allowed_as_non_leading_char() throws IOException, DefParser.DefParserException {
+    void number_is_allowed_as_non_leading_char() throws IOException, DefParser.DefParserException {
         StringBuilder sb = createDefTemplate();
         String line = "package=a.b.c2\n";
         sb.append(line);
@@ -89,17 +89,17 @@ public class DefParserPackageTest {
     }
 
     @Test
-    public void number_is_not_allowed_as_package_start_char() {
+    void number_is_not_allowed_as_package_start_char() {
         assertLineFails("package=2.a.b");
     }
 
     @Test
-    public void number_is_not_allowed_as_leading_char_in_package_token() {
+    void number_is_not_allowed_as_leading_char_in_package_token() {
         assertLineFails("package=a.b.2c");
     }
 
     @Test
-    public void underscore_in_package_is_allowed() throws IOException, DefParser.DefParserException {
+    void underscore_in_package_is_allowed() throws IOException, DefParser.DefParserException {
         StringBuilder sb = createDefTemplate();
         String line = "package=a_b.c\n";
         sb.append(line);