stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8278028: [test-library] Warnings cleanup of the test library

Browse Source 
Reviewed-by: dfuchs, mchung, naoto, lancea, lmesnik
This commit is contained in:
Roger Riggs 2021-12-14 19:54:54 +00:00
parent a1dfe57249
commit 03f647f4bb
14 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/lib-test/jdk/test/lib/AssertsTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -38,7 +38,7 @@ public class AssertsTest {
}
public int compareTo(Foo f) {
return new Integer(id).compareTo(new Integer(f.id));
return Integer.valueOf(id).compareTo(Integer.valueOf(f.id));
}
public String toString() {
return "Foo(" + Integer.toString(id) + ")";

1
test/lib-test/jdk/test/lib/TestPlatformIsTieredSupported.java
View File

@ -39,6 +39,7 @@ import sun.hotspot.WhiteBox;
*/
public class TestPlatformIsTieredSupported {
public static void main(String args[]) {
@SuppressWarnings("deprecation")
WhiteBox whiteBox = WhiteBox.getWhiteBox();
boolean tieredCompilation = whiteBox.getBooleanVMFlag(
"TieredCompilation");

5
test/lib-test/jdk/test/lib/format/ArrayDiffTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -274,6 +274,7 @@ public class ArrayDiffTest {
class StrObj {
private final String value;
public boolean equals(Object another) { return ((StrObj)another).value.equals(value); }
public int hashCode() { return value.hashCode(); }
public StrObj(String value) { this.value = value; }
public String toString() { return value; }
}
@ -363,7 +364,7 @@ public class ArrayDiffTest {
}
public void assertTwoWay() {
ArrayDiff diff;
ArrayDiff<?> diff;
// Direct
if (defaultParameters) {

1
test/lib-test/jdk/test/whitebox/OldWhiteBox.java
View File

@ -43,6 +43,7 @@ import sun.hotspot.WhiteBox;
public class OldWhiteBox {
public static void main(String[] args) {
@SuppressWarnings("deprecation")
WhiteBox wb = WhiteBox.getWhiteBox();
if (wb.getHeapOopSize() < 0) {
throw new Error("wb.getHeapOopSize() < 0");

4
test/lib-test/jdk/test/whitebox/vm_flags/VmFlagTest.java
View File

@ -72,9 +72,9 @@ public final class VmFlagTest<T> {
protected static <T> void runTest(String existentFlag, T[] tests,
T[] results, BiConsumer<String, T> set, Function<String, T> get) {
if (existentFlag != null) {
new VmFlagTest(existentFlag, set, get, true).test(tests, results);
new VmFlagTest<T>(existentFlag, set, get, true).test(tests, results);
}
new VmFlagTest(NONEXISTENT_FLAG, set, get, false).test(tests, results);
new VmFlagTest<T>(NONEXISTENT_FLAG, set, get, false).test(tests, results);
}
public final void test(T[] tests, T[] results) {

4
test/lib/RedefineClassHelper.java
View File

@ -47,7 +47,7 @@ public class RedefineClassHelper {
* @param clazz Class to redefine
* @param javacode String with the new java code for the class to be redefined
*/
public static void redefineClass(Class clazz, String javacode) throws Exception {
public static void redefineClass(Class<?> clazz, String javacode) throws Exception {
byte[] bytecode = InMemoryJavaCompiler.compile(clazz.getName(), javacode);
redefineClass(clazz, bytecode);
}
@ -58,7 +58,7 @@ public class RedefineClassHelper {
* @param clazz Class to redefine
* @param bytecode byte[] with the new class
*/
public static void redefineClass(Class clazz, byte[] bytecode) throws Exception {
public static void redefineClass(Class<?> clazz, byte[] bytecode) throws Exception {
instrumentation.redefineClasses(new ClassDefinition(clazz, bytecode));
}

1
test/lib/jdk/test/lib/NetworkConfiguration.java
View File

@ -451,6 +451,7 @@ public class NetworkConfiguration {
}
/** Prints all the system interface information to the give stream. */
@SuppressWarnings("removal")
public static void printSystemConfiguration(PrintStream out) {
PrivilegedAction<Void> pa = () -> {
try {

5
test/lib/jdk/test/lib/compiler/InMemoryJavaCompiler.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ import javax.tools.ForwardingJavaFileManager;
import javax.tools.FileObject;
import javax.tools.JavaCompiler;
import javax.tools.JavaCompiler.CompilationTask;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.SimpleJavaFileObject;
@ -106,7 +107,7 @@ public class InMemoryJavaCompiler {
}
}
private static class FileManagerWrapper extends ForwardingJavaFileManager {
private static class FileManagerWrapper extends ForwardingJavaFileManager<JavaFileManager> {
private static final Location PATCH_LOCATION = new Location() {
@Override
public String getName() {

4
test/lib/jdk/test/lib/format/ArrayCodec.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -141,7 +141,7 @@ public class ArrayCodec<E> {
* @throws IllegalArgumentException if {@code array}'s component type is not supported
* @return an ArrayCodec for the provided array
*/
public static ArrayCodec of(Object array) {
public static ArrayCodec<?> of(Object array) {
var type = array.getClass().getComponentType();
if (type == byte.class) {
return ArrayCodec.of((byte[])array);

8
test/lib/jdk/test/lib/format/ArrayDiff.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -93,7 +93,7 @@ public class ArrayDiff<E> implements Diff {
* @param second the second array
* @return an ArrayDiff instance for the two arrays
*/
public static ArrayDiff of(Object first, Object second) {
public static ArrayDiff<?> of(Object first, Object second) {
return ArrayDiff.of(first, second, Diff.Defaults.WIDTH, Diff.Defaults.CONTEXT_BEFORE);
}
@ -109,7 +109,8 @@ public class ArrayDiff<E> implements Diff {
* @throws NullPointerException if at least one of the arrays is null
* @return an ArrayDiff instance for the two arrays and formatting parameters provided
*/
public static ArrayDiff of(Object first, Object second, int width, int contextBefore) {
@SuppressWarnings("rawtypes")
public static ArrayDiff<?> of(Object first, Object second, int width, int contextBefore) {
Objects.requireNonNull(first);
Objects.requireNonNull(second);
@ -204,4 +205,3 @@ public class ArrayDiff<E> implements Diff {
}
}

1
test/lib/jdk/test/lib/hexdump/ASN1Formatter.java
View File

@ -626,6 +626,7 @@ public class ASN1Formatter implements HexPrinter.Formatter {
* @return the InputStream or the wrapped decoder of Base64Mime.
* @throws IOException if an I/O error occurs
*/
@SuppressWarnings("deprecation")
private static InputStream wrapIfBase64Mime(BufferedInputStream bis) throws IOException {
bis.mark(256);
DataInputStream dis = new DataInputStream(bis);

1
test/lib/jdk/test/lib/hexdump/StreamDump.java
View File

@ -165,6 +165,7 @@ public class StreamDump {
* @return an InputStream, unchanged unless it is Base64 Mime
* @throws IOException if an I/O Error occurs
*/
@SuppressWarnings("deprecation")
static InputStream decodeMaybe(InputStream is) throws IOException {
DataInputStream dis = new DataInputStream(is);
is.mark(1024);

4
test/lib/jdk/test/lib/process/Proc.java
View File

@ -113,8 +113,8 @@ public class Proc {
private List<String> args = new ArrayList<>();
private Map<String,String> env = new HashMap<>();
private Map<String,String> prop = new HashMap();
private Map<String,String> secprop = new HashMap();
private Map<String,String> prop = new HashMap<>();
private Map<String,String> secprop = new HashMap<>();
private boolean inheritIO = false;
private boolean noDump = false;

2
test/lib/jdk/test/lib/process/ProcessTools.java
View File

@ -432,6 +432,7 @@ public final class ProcessTools {
* the default charset.
* @return The {@linkplain OutputAnalyzer} instance wrapping the process.
*/
@SuppressWarnings("removal")
public static OutputAnalyzer executeProcess(ProcessBuilder pb, String input,
Charset cs) throws Exception {
OutputAnalyzer output = null;
@ -604,6 +605,7 @@ public final class ProcessTools {
return pb;
}
@SuppressWarnings("removal")
private static Process privilegedStart(ProcessBuilder pb) throws IOException {
try {
return AccessController.doPrivileged(