2 files changed, 30 insertions, 34 deletions

diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ExportPackageParserTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ExportPackageParserTest.java
index 2c9b32a325f..de5c0f2be9d 100644
--- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ExportPackageParserTest.java
+++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ExportPackageParserTest.java
@@ -3,13 +3,13 @@ package com.yahoo.container.plugin.osgi;
 
 import com.yahoo.container.plugin.osgi.ExportPackages.Export;
 import com.yahoo.container.plugin.osgi.ExportPackages.Parameter;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Tony Vaagenes
@@ -19,7 +19,7 @@ public class ExportPackageParserTest {
     private final Parameter versionParameter = new Parameter("version", "1.2.3.sample");
 
     @Test
-    public void require_that_package_is_parsed_correctly() {
+    void require_that_package_is_parsed_correctly() {
         List<Export> exports = ExportPackageParser.parseExports("sample.exported.package");
 
         assertEquals(1, exports.size());
@@ -28,7 +28,7 @@ public class ExportPackageParserTest {
     }
 
     @Test
-    public void require_that_version_is_parsed_correctly() {
+    void require_that_version_is_parsed_correctly() {
         List<Export> exports = ExportPackageParser.parseExports("com.yahoo.sample.exported.package;version=\"1.2.3.sample\"");
 
         assertEquals(1, exports.size());
@@ -38,7 +38,7 @@ public class ExportPackageParserTest {
     }
 
     @Test
-    public void require_that_multiple_packages_with_same_parameters_is_parsed_correctly() {
+    void require_that_multiple_packages_with_same_parameters_is_parsed_correctly() {
         List<Export> exports = ExportPackageParser.parseExports("exported.package1;exported.package2;version=\"1.2.3.sample\"");
 
         assertEquals(1, exports.size());
@@ -48,7 +48,7 @@ public class ExportPackageParserTest {
     }
 
     @Test
-    public void require_that_spaces_between_separators_are_allowed() {
+    void require_that_spaces_between_separators_are_allowed() {
         List<Export> exports = ExportPackageParser.parseExports("exported.package1  ,  exported.package2 ; version   = \"1.2.3.sample\"  ");
 
         assertEquals(2, exports.size());
@@ -61,7 +61,7 @@ public class ExportPackageParserTest {
 
     @SuppressWarnings("unchecked")
     @Test
-    public void require_that_multiple_parameters_for_a_package_is_parsed_correctly() {
+    void require_that_multiple_parameters_for_a_package_is_parsed_correctly() {
         List<Export> exports = ExportPackageParser.parseExports("exported.package;version=\"1.2.3.sample\";param2=true");
 
         assertEquals(1, exports.size());
@@ -70,7 +70,7 @@ public class ExportPackageParserTest {
     }
 
     @Test
-    public void require_that_multiple_exports_are_parsed_correctly() {
+    void require_that_multiple_exports_are_parsed_correctly() {
         List<Export> exports = ExportPackageParser.parseExports("exported.package1,exported.package2");
         assertEquals(2, exports.size());
         Export export = exports.get(0);
@@ -100,9 +100,9 @@ public class ExportPackageParserTest {
     }
 
     // TODO: MAVEN_OPTS are not propagated by the maven-surefire-plugin. Either try to fix the underlying problem or set -Xss in plugin config.
-    @Ignore  // Frequently causes StackOverflowError
+    @Disabled  // Frequently causes StackOverflowError
     @Test
-    public void require_that_long_string_literals_do_not_cause_stack_overflow_error() {
+    void require_that_long_string_literals_do_not_cause_stack_overflow_error() {
         //From jersey-server-1.13.jar
         String exportHeader = "com.sun.jersey.server.impl.wadl;uses:=\"com.sun.jersey.api.model,com.sun.resea"
                 + "rch.ws.wadl,com.sun.jersey.api.wadl.config,com.sun.jersey.server.wadl,com.sun."
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java
index 29f2be838a1..aa74746bfff 100644
--- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java
+++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/osgi/ImportPackageTest.java
@@ -4,9 +4,7 @@ package com.yahoo.container.plugin.osgi;
 import com.yahoo.container.plugin.osgi.ExportPackages.Export;
 import com.yahoo.container.plugin.osgi.ExportPackages.Parameter;
 import com.yahoo.container.plugin.osgi.ImportPackages.Import;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -15,8 +13,9 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
  * @author Tony Vaagenes
@@ -34,37 +33,37 @@ public class ImportPackageTest {
     }
 
     @Test
-    public void require_that_non_implemented_import_with_matching_export_is_included() {
+    void require_that_non_implemented_import_with_matching_export_is_included() {
         Set<Import> imports = calculateImports(referencedPackages, Set.of(), exports);
         assertEquals(1, imports.stream().filter(imp -> imp.packageName().equals(PACKAGE_NAME) && imp.version().isEmpty()).count());
     }
 
     @Test
-    public void require_that_non_implemented_import_without_matching_export_is_excluded() {
+    void require_that_non_implemented_import_without_matching_export_is_excluded() {
         Set<Import> imports = calculateImports(referencedPackages, Set.of(), Map.of());
         assertTrue(imports.isEmpty());
     }
 
     @Test
-    public void require_that_implemented_import_with_matching_export_is_excluded() {
+    void require_that_implemented_import_with_matching_export_is_excluded() {
         Set<Import> imports = calculateImports(referencedPackages, referencedPackages, exports);
         assertTrue(imports.isEmpty());
     }
 
     @Test
-    public void require_that_version_is_included() {
+    void require_that_version_is_included() {
         Set<Import> imports = calculateImports(referencedPackages, Set.of(), exportsWithVersion);
         assertEquals(1, imports.stream().filter(imp -> imp.packageName().equals(PACKAGE_NAME) && imp.version().equals("1.3")).count());
     }
 
     @Test
-    public void require_that_all_versions_up_to_the_next_major_version_is_in_range() {
+    void require_that_all_versions_up_to_the_next_major_version_is_in_range() {
         assertEquals("[1.2,2)", new Import("foo", Optional.of("1.2")).importVersionRange().get());
     }
 
     // TODO: Detecting guava packages should be based on bundle-symbolicName, not package name.
     @Test
-    public void require_that_for_guava_all_future_major_versions_are_in_range() {
+    void require_that_for_guava_all_future_major_versions_are_in_range() {
         Optional<String> rangeWithInfiniteUpperLimit = Optional.of("[18.1," + ImportPackages.INFINITE_VERSION + ")");
         assertEquals(rangeWithInfiniteUpperLimit, new Import("com.google.common", Optional.of("18.1")).importVersionRange());
         assertEquals(rangeWithInfiniteUpperLimit, new Import("com.google.common.foo", Optional.of("18.1")).importVersionRange());
@@ -72,32 +71,29 @@ public class ImportPackageTest {
     }
 
     @Test
-    public void require_that_none_version_gives_non_version_range() {
+    void require_that_none_version_gives_non_version_range() {
         assertTrue(new Import("foo", Optional.empty()).importVersionRange().isEmpty());
     }
 
-    @SuppressWarnings("deprecation")
-    @Rule
-    public ExpectedException expectedException = ExpectedException.none();
-
     @Test
-    public void require_that_exception_is_thrown_when_major_component_is_non_numeric() {
-        expectedException.expect(IllegalArgumentException.class);
-        new Import("foo", Optional.of("1notValid.2"));
+    void require_that_exception_is_thrown_when_major_component_is_non_numeric() {
+        assertThrows(IllegalArgumentException.class, () -> {
+            new Import("foo", Optional.of("1notValid.2"));
+        });
     }
 
     @Test
-    public void require_that_osgi_import_supports_missing_version() {
+    void require_that_osgi_import_supports_missing_version() {
         assertEquals("com.yahoo.exported", new Import("com.yahoo.exported", Optional.empty()).asOsgiImport());
     }
 
     @Test
-    public void require_that_osgi_import_version_range_includes_all_versions_from_the_current_up_to_the_next_major_version() {
+    void require_that_osgi_import_version_range_includes_all_versions_from_the_current_up_to_the_next_major_version() {
         assertEquals("com.yahoo.exported;version=\"[1.2,2)\"", new Import("com.yahoo.exported", Optional.of("1.2")).asOsgiImport());
     }
 
     @Test
-    public void require_that_osgi_import_version_range_ignores_qualifier() {
+    void require_that_osgi_import_version_range_ignores_qualifier() {
         assertEquals("com.yahoo.exported;version=\"[1.2.3,2)\"", new Import("com.yahoo.exported", Optional.of("1.2.3.qualifier")).asOsgiImport());
     }