diff options
Diffstat (limited to 'bundle-plugin/src/test/java/com/yahoo/container/plugin/classanalysis')
3 files changed, 45 insertions, 45 deletions
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); |