diff options
Diffstat (limited to 'abi-check-plugin/src/test/java')
3 files changed, 20 insertions, 19 deletions
diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java index d592a2ce1e3..1631eac866f 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/AccessConversionTest.java @@ -5,17 +5,18 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import com.yahoo.abicheck.collector.Util; -import java.util.Arrays; import org.junit.jupiter.api.Test; import org.objectweb.asm.Opcodes; +import java.util.List; + public class AccessConversionTest { @Test public void testClassFlags() { // ACC_SUPER should be ignored assertEquals( - Arrays.asList("public", "abstract"), + List.of("public", "abstract"), Util.convertAccess( Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER | Opcodes.ACC_ABSTRACT, Util.classFlags)); @@ -25,7 +26,7 @@ public class AccessConversionTest { public void testMethodFlags() { // ACC_DEPRECATED should be ignored assertEquals( - Arrays.asList("protected", "varargs"), + List.of("protected", "varargs"), Util.convertAccess( Opcodes.ACC_PROTECTED | Opcodes.ACC_VARARGS | Opcodes.ACC_DEPRECATED, Util.methodFlags)); @@ -34,7 +35,7 @@ public class AccessConversionTest { @Test public void testFieldFlags() { assertEquals( - Arrays.asList("private", "volatile"), + List.of("private", "volatile"), Util.convertAccess( Opcodes.ACC_PRIVATE | Opcodes.ACC_VOLATILE, Util.fieldFlags)); diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java index 3f90ba01848..1667a6b87d0 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/ClassFileTreeTest.java @@ -12,8 +12,8 @@ import com.google.common.collect.Iterables; import com.yahoo.abicheck.classtree.ClassFileTree; import java.io.IOException; import java.io.InputStream; -import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.jar.JarEntry; import java.util.jar.JarFile; import org.junit.jupiter.api.Test; @@ -27,7 +27,7 @@ public class ClassFileTreeTest { JarEntry dirJarEntry = new JarEntry("com/yahoo/"); InputStream jarEntryStream = mock(InputStream.class); when(jarFile.entries()) - .thenReturn(Collections.enumeration(Arrays.asList(dirJarEntry, classJarEntry))); + .thenReturn(Collections.enumeration(List.of(dirJarEntry, classJarEntry))); when(jarFile.getInputStream(classJarEntry)).thenReturn(jarEntryStream); try (ClassFileTree cft = ClassFileTree.fromJar(jarFile)) { diff --git a/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java b/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java index 6821a03818e..9bc330ad130 100644 --- a/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java +++ b/abi-check-plugin/src/test/java/com/yahoo/abicheck/mojo/AbiCheckTest.java @@ -12,9 +12,9 @@ import com.yahoo.abicheck.Public; import com.yahoo.abicheck.classtree.ClassFileTree; import com.yahoo.abicheck.signature.JavaClassSignature; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; +import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.maven.plugin.logging.Log; import org.junit.jupiter.api.Test; import root.Root; @@ -30,9 +30,9 @@ public class AbiCheckTest { ClassFileTree.ClassFile rootPkgClass = mock(ClassFileTree.ClassFile.class); ClassFileTree.ClassFile subPkgClass = mock(ClassFileTree.ClassFile.class); - when(rootPkg.getSubPackages()).thenReturn(Collections.singleton(subPkg)); - when(rootPkg.getClassFiles()).thenReturn(Arrays.asList(rootPkgClass, rootPkgInfoClass)); - when(subPkg.getClassFiles()).thenReturn(Collections.singleton(subPkgClass)); + when(rootPkg.getSubPackages()).thenReturn(Set.of(subPkg)); + when(rootPkg.getClassFiles()).thenReturn(List.of(rootPkgClass, rootPkgInfoClass)); + when(subPkg.getClassFiles()).thenReturn(Set.of(subPkgClass)); when(rootPkgInfoClass.getName()).thenReturn("package-info.class"); when(rootPkgInfoClass.getInputStream()) @@ -68,16 +68,16 @@ public class AbiCheckTest { JavaClassSignature signatureA = new JavaClassSignature( "java.lang.Object", - Collections.emptySet(), - Collections.singletonList("public"), - Collections.singleton("public void foo()"), - Collections.singleton("public int bar")); + Set.of(), + List.of("public"), + Set.of("public void foo()"), + Set.of("public int bar")); JavaClassSignature signatureB = new JavaClassSignature( "java.lang.Exception", - Collections.singleton("java.lang.Runnable"), - Collections.singletonList("protected"), - Collections.singleton("public void foo(int)"), - Collections.singleton("public boolean bar")); + Set.of("java.lang.Runnable"), + List.of("protected"), + Set.of("public void foo(int)"), + Set.of("public boolean bar")); Map<String, JavaClassSignature> expected = ImmutableMap.<String, JavaClassSignature>builder() .put("test.Missing", signatureA) |