diff options
Diffstat (limited to 'bundle-plugin/src/test/java')
8 files changed, 99 insertions, 103 deletions
diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/bundle/AnalyzeBundleTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/bundle/AnalyzeBundleTest.java index 62ecd780d7e..97c2bf02d9b 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/bundle/AnalyzeBundleTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/bundle/AnalyzeBundleTest.java @@ -3,17 +3,17 @@ package com.yahoo.container.plugin.bundle; import com.yahoo.container.plugin.osgi.ExportPackages; import com.yahoo.container.plugin.osgi.ExportPackages.Export; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Tony Vaagenes @@ -37,29 +37,29 @@ public class AnalyzeBundleTest { } @Test - public void require_that_non_osgi_bundles_are_ignored() { + void require_that_non_osgi_bundles_are_ignored() { assertFalse(exportsByPackageName.containsKey("com.yahoo.sample.exported.package.ignored")); } @Test - public void require_that_exports_are_retrieved_from_manifest_in_jars() { + void require_that_exports_are_retrieved_from_manifest_in_jars() { assertEquals(1, exportsByPackageName.keySet().size()); assertTrue(exportsByPackageName.containsKey("com.yahoo.sample.exported.package")); } @Test - public void exported_class_names_can_be_retrieved() { + void exported_class_names_can_be_retrieved() { assertEquals(ExportPackages.packageNames(exports), exports.get(0).getPackageNames().stream().collect(Collectors.toSet())); } @Test - public void require_that_invalid_exports_throws_exception() { + void require_that_invalid_exports_throws_exception() { try { AnalyzeBundle.exportedPackages(jarFile("errorExport.jar")); fail(); } catch (RuntimeException e) { assertTrue(e.getMessage().contains("Invalid manifest in bundle 'src/test/resources/jar/errorExport.jar'")); - assertTrue(e.getCause().getMessage(), e.getCause().getMessage().startsWith("Failed parsing Export-Package")); + assertTrue(e.getCause().getMessage().startsWith("Failed parsing Export-Package"), e.getCause().getMessage()); } } } diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java index f9f56a31b20..8f78363dab5 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.java @@ -17,7 +17,7 @@ import com.yahoo.container.plugin.classanalysis.sampleclasses.MethodAnnotation; import com.yahoo.container.plugin.classanalysis.sampleclasses.MethodInvocation; import com.yahoo.osgi.annotation.ExportPackage; import com.yahoo.osgi.annotation.Version; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.security.auth.login.LoginException; import java.awt.Image; @@ -29,10 +29,10 @@ import java.util.Optional; import static com.yahoo.container.plugin.classanalysis.TestUtilities.analyzeClass; import static com.yahoo.container.plugin.classanalysis.TestUtilities.classFile; import static com.yahoo.container.plugin.classanalysis.TestUtilities.name; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests that analysis of class files works. @@ -43,23 +43,23 @@ import static org.junit.Assert.fail; public class AnalyzeClassTest { @Test - public void full_class_name_is_returned() { + void full_class_name_is_returned() { assertEquals(name(Base.class), analyzeClass(Base.class).getName()); } @Test - public void base_class_is_included() { + void base_class_is_included() { assertTrue(analyzeClass(Derived.class).getReferencedClasses().contains(name(Base.class))); } @Test - public void implemented_interfaces_are_included() { + void implemented_interfaces_are_included() { assertTrue(analyzeClass(Base.class).getReferencedClasses().containsAll( List.of(name(Interface1.class), name(Interface2.class)))); } @Test - public void interface_can_be_analyzed() { + void interface_can_be_analyzed() { ClassFileMetaData classMetaData = analyzeClass(Interface1.class); assertEquals(name(Interface1.class), classMetaData.getName()); @@ -67,77 +67,77 @@ public class AnalyzeClassTest { } @Test - public void return_type_is_included() { + void return_type_is_included() { assertTrue(analyzeClass(Interface1.class).getReferencedClasses().contains(name(Image.class))); } @Test - public void parameters_are_included() { + void parameters_are_included() { assertTrue(analyzeClass(Interface1.class).getReferencedClasses().contains(name(Kernel.class))); } @Test - public void exceptions_are_included() { + void exceptions_are_included() { assertTrue(analyzeClass(Interface1.class).getReferencedClasses().contains(name(ImagingOpException.class))); } @Test - public void basic_types_ignored() { + void basic_types_ignored() { List.of("int", "float").forEach(type -> assertFalse(analyzeClass(Interface1.class).getReferencedClasses().contains(type))); } @Test - public void arrays_of_basic_types_ignored() { + void arrays_of_basic_types_ignored() { List.of("int[]", "int[][]").forEach(type -> assertFalse(analyzeClass(Interface1.class).getReferencedClasses().contains(type))); } @Test - public void instance_field_types_are_included() { + void instance_field_types_are_included() { assertTrue(analyzeClass(Fields.class).getReferencedClasses().contains(name(String.class))); } @Test - public void static_field_types_are_included() { + void static_field_types_are_included() { assertTrue(analyzeClass(Fields.class).getReferencedClasses().contains(name(java.util.List.class))); } @Test - public void field_annotation_is_included() { + void field_annotation_is_included() { assertTrue(analyzeClass(Fields.class).getReferencedClasses().contains(name(DummyAnnotation.class))); } @Test - public void class_annotation_is_included() { + void class_annotation_is_included() { assertTrue(analyzeClass(ClassAnnotation.class).getReferencedClasses().contains(name(DummyAnnotation.class))); } @Test - public void invisible_annotation_not_included() { + void invisible_annotation_not_included() { assertFalse(analyzeClass(InvisibleAnnotation.class).getReferencedClasses().contains(name(InvisibleDummyAnnotation.class))); } @Test - public void method_annotation_is_included() { + void method_annotation_is_included() { assertTrue(analyzeClass(MethodAnnotation.class).getReferencedClasses().contains(name(DummyAnnotation.class))); } @Test - public void export_package_annotations_are_ignored() { + void export_package_annotations_are_ignored() { List.of(ExportPackage.class, Version.class).forEach(type -> assertFalse(Analyze.analyzeClass(classFile("com.yahoo.container.plugin.classanalysis.sampleclasses.package-info")) .getReferencedClasses().contains(type))); } @Test - public void export_annotations_are_processed() { + void export_annotations_are_processed() { assertEquals(Optional.of(new ExportPackageAnnotation(3, 1, 4, "TEST_QUALIFIER-2")), Analyze.analyzeClass(classFile("com.yahoo.container.plugin.classanalysis.sampleclasses.package-info")).getExportPackage()); } @Test - public void export_annotations_are_validated() { + void export_annotations_are_validated() { try { Analyze.analyzeClass(classFile("com.yahoo.container.plugin.classanalysis.sampleclasses.invalid.package-info")); @@ -150,38 +150,38 @@ public class AnalyzeClassTest { } @Test - public void catch_clauses_are_included() { + void catch_clauses_are_included() { assertTrue(Analyze.analyzeClass(classFile("com.yahoo.container.plugin.classanalysis.sampleclasses.CatchException")) .getReferencedClasses().contains(name(LoginException.class))); } @Test - public void class_references_are_included() { + void class_references_are_included() { assertTrue(Analyze.analyzeClass(classFile("com.yahoo.container.plugin.classanalysis.sampleclasses.ClassReference")) .getReferencedClasses().contains(name(Interface1.class))); } @Test - public void return_type_of_method_invocations_are_included() { + void return_type_of_method_invocations_are_included() { assertTrue(analyzeClass(MethodInvocation.class).getReferencedClasses().contains(name(Image.class))); } @Test - public void attributes_are_included() { + void attributes_are_included() { //Uses com/coremedia/iso/Utf8.class from com.googlecode.mp4parser:isoparser:1.0-RC-1 assertTrue(Analyze.analyzeClass(classFile("class/Utf8")).getReferencedClasses() .contains("org.aspectj.weaver.MethodDeclarationLineNumber")); } @Test - public void switch_statements_are_analyzed() { + void switch_statements_are_analyzed() { var referencedClasses = analyzeClass(SwitchStatement.class).getReferencedClasses(); assertTrue(referencedClasses.contains(name(ImmutableList.class))); assertTrue(referencedClasses.contains(name(IllegalArgumentException.class))); } @Test - public void records_are_analyzed() { + void records_are_analyzed() { var referencedClasses = analyzeClass(RecordWithOverride.class).getReferencedClasses(); assertTrue(referencedClasses.containsAll(List.of( name(java.util.List.class), diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodBodyTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodBodyTest.java index 0076869eaa5..2b2e83fb024 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodBodyTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/AnalyzeMethodBodyTest.java @@ -9,15 +9,15 @@ import com.yahoo.container.plugin.classanalysis.sampleclasses.Fields; import com.yahoo.container.plugin.classanalysis.sampleclasses.Interface1; import com.yahoo.container.plugin.classanalysis.sampleclasses.Interface3; import com.yahoo.container.plugin.classanalysis.sampleclasses.Methods; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.PrintStream; import java.util.List; import static com.yahoo.container.plugin.classanalysis.TestUtilities.analyzeClass; import static com.yahoo.container.plugin.classanalysis.TestUtilities.name; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests that classes used in method bodies are included in the imports list. @@ -27,52 +27,52 @@ import static org.junit.Assert.assertTrue; public class AnalyzeMethodBodyTest { @Test - public void class_of_locals_are_included() { + void class_of_locals_are_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(Base.class))); } @Test - public void class_of_locals_in_static_method_are_included() { + void class_of_locals_in_static_method_are_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(Derived.class))); } @Test - public void field_references_are_included() { + void field_references_are_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().containsAll(List.of(name(java.util.List.class), name(Fields.class)))); } @Test - public void class_owning_field_is_included() { + void class_owning_field_is_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(System.class))); } @Test - public void class_containing_method_is_included() { + void class_containing_method_is_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(PrintStream.class))); } @Test - public void element_of_new_multidimensional_array_is_included() { + void element_of_new_multidimensional_array_is_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(Interface1.class))); } @Test - public void basic_arrays_are_not_included() { + void basic_arrays_are_not_included() { assertFalse(analyzeClass(Methods.class).getReferencedClasses().contains("int[]")); } @Test - public void container_generic_parameters_are_included() { + void container_generic_parameters_are_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(Dummy.class))); } @Test - public void functional_interface_usage_is_included() { + void functional_interface_usage_is_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(Interface3.class))); } @Test - public void class_owning_method_handler_is_included() { + void class_owning_method_handler_is_included() { assertTrue(analyzeClass(Methods.class).getReferencedClasses().contains(name(ClassWithMethod.class))); } } diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/PackageTallyTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/PackageTallyTest.java index 31abe785cbe..002959959ec 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/PackageTallyTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis/PackageTallyTest.java @@ -1,12 +1,12 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.plugin.classanalysis; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Set; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author gjoranv @@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals; public class PackageTallyTest { @Test - public void referenced_packages_missing_from_available_packages_are_detected() { + void referenced_packages_missing_from_available_packages_are_detected() { PackageTally tally = new PackageTally(Map.of(), Set.of("p1", "java.util", "com.yahoo.api.annotations", "missing")); Set<String> missingPackages = tally.referencedPackagesMissingFrom(Set.of("p1")); assertEquals(Set.of("missing"), missingPackages); diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java index 3b75d9dcb7d..4edc9c3712d 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/mojo/GenerateSourcesMojoTest.java @@ -2,10 +2,10 @@ package com.yahoo.container.plugin.mojo; import org.apache.maven.plugin.MojoExecutionException; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assume.assumeNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; /** * @author Simon Thoresen Hult @@ -13,10 +13,10 @@ import static org.junit.Assume.assumeNotNull; public class GenerateSourcesMojoTest { @Test - public void requireThatDefaultConfigGenVersionIsLoadedFromBuildProperties() throws MojoExecutionException { + void requireThatDefaultConfigGenVersionIsLoadedFromBuildProperties() throws MojoExecutionException { String expected = System.getProperty("expectedDefaultConfigGenVersion"); System.out.println("expectedDefaultConfigGenVersion = " + expected); - assumeNotNull(expected); + assumeTrue(expected != null); String actual = GenerateSourcesMojo.loadDefaultConfigGenVersion(); System.out.println("defaultConfigGenVersion = " + actual); 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()); } diff --git a/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java b/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java index ada2f8d208a..d20bbe0e073 100644 --- a/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java +++ b/bundle-plugin/src/test/java/com/yahoo/container/plugin/util/TestBundleDependencyScopeTranslatorTest.java @@ -5,7 +5,7 @@ package com.yahoo.container.plugin.util; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.handler.DefaultArtifactHandler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author bjorncs @@ -24,7 +24,7 @@ public class TestBundleDependencyScopeTranslatorTest { private static final String GROUP_ID = "com.test"; @Test - public void test_dependencies_are_translated_to_compile_scope_by_default() { + void test_dependencies_are_translated_to_compile_scope_by_default() { Set<Artifact> artifacts = new TreeSet<>(); Artifact a = createArtifact(artifacts, "a", "test", List.of()); Artifact aa = createArtifact(artifacts, "a-a", "test", List.of("a")); @@ -40,7 +40,7 @@ public class TestBundleDependencyScopeTranslatorTest { } @Test - public void non_test_scope_dependencies_keep_original_scope() { + void non_test_scope_dependencies_keep_original_scope() { Set<Artifact> artifacts = new TreeSet<>(); Artifact a = createArtifact(artifacts, "a", "provided", List.of()); Artifact aa = createArtifact(artifacts, "a-a", "provided", List.of("a")); @@ -61,14 +61,14 @@ public class TestBundleDependencyScopeTranslatorTest { } @Test - public void ordering_in_config_string_determines_translation() { + void ordering_in_config_string_determines_translation() { Set<Artifact> artifacts = new TreeSet<>(); Artifact a = createArtifact(artifacts, "a", "test", List.of()); Artifact aa = createArtifact(artifacts, "a-a", "test", List.of("a")); { String configString = "com.test:a-a:runtime," + - "com.test:a:test,"; + "com.test:a:test,"; TestBundleDependencyScopeTranslator translator = TestBundleDependencyScopeTranslator.from(artifacts, configString); assertScope(translator, a, "test"); assertScope(translator, aa, "runtime"); @@ -76,7 +76,7 @@ public class TestBundleDependencyScopeTranslatorTest { { String configString = "com.test:a:test," + - "com.test:a-a:runtime"; + "com.test:a-a:runtime"; TestBundleDependencyScopeTranslator translator = TestBundleDependencyScopeTranslator.from(artifacts, configString); assertScope(translator, a, "test"); assertScope(translator, aa, "test"); @@ -84,7 +84,7 @@ public class TestBundleDependencyScopeTranslatorTest { } @Test - public void transitive_non_test_dependencies_of_test_dependencies_keep_original_scope() { + void transitive_non_test_dependencies_of_test_dependencies_keep_original_scope() { Set<Artifact> artifacts = new TreeSet<>(); Artifact a = createArtifact(artifacts, "a", "test", List.of()); Artifact aa = createArtifact(artifacts, "a-a", "test", List.of("a")); @@ -108,7 +108,7 @@ public class TestBundleDependencyScopeTranslatorTest { } @Test - public void different_classifiers_are_handled_separately() { + void different_classifiers_are_handled_separately() { Set<Artifact> artifacts = new TreeSet<>(); Artifact a = createArtifact(artifacts, "a", "test", List.of()); Artifact ab = createArtifact(artifacts, "a-b", "provided", List.of("a")); |