jdk-sandbox: comparison langtools/test/tools/javac/classfiles/attributes/lib/TestBase.java

equal deleted inserted replaced

-:c425126bfadf
+:d5dd2ecd2353
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
-import java.util.stream.Stream;
+import java.util.stream.Collectors;
 import javax.tools.DiagnosticCollector;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.ToolProvider;
-import static java.lang.String.format;
+import com.sun.tools.classfile.ClassFile;
-import static java.lang.System.lineSeparator;
+import com.sun.tools.classfile.ConstantPoolException;
-import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
 /**
 * Base class for class file attribute tests.
 * Contains methods for compiling generated sources in memory,
 * for reading files from disk and a lot of assert* methods.
 */
 public class TestBase {
-public static final String LINE_SEPARATOR = lineSeparator();
+public static final String LINE_SEPARATOR = System.lineSeparator();
 private <S> InMemoryFileManager compile(
 List<String> options,
 Function<S, ? extends JavaFileObject> src2JavaFileObject,
 List<S> sources)
 throws IOException, CompilationException {
 JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
 List<? extends JavaFileObject> src = sources.stream()
 .map(src2JavaFileObject)
-.collect(toList());
+.collect(Collectors.toList());
 DiagnosticCollector<? super JavaFileObject> dc = new DiagnosticCollector<>();
 try (InMemoryFileManager fileManager
 = new InMemoryFileManager(compiler.getStandardFileManager(null, null, null))) {
 JavaCompiler.CompilationTask task = compiler.getTask(null, fileManager, dc, options, null, src);
 boolean success = task.call();
 if (!success) {
 String errorMessage = dc.getDiagnostics().stream()
 .map(Object::toString)
-.collect(joining("\n"));
+.collect(Collectors.joining("\n"));
 throw new CompilationException("Compilation Error\n\n" + errorMessage);
 }
 return fileManager;
 }
 }
 * @param sources to compile.
 * @return memory file manager which contains class files and class loader.
 */
 public InMemoryFileManager compile(String... sources)
 throws IOException, CompilationException {
-return compile(emptyList(), sources);
+return compile(Collections.emptyList(), sources);
 }
 /**
 * Compiles sources in memory.
 *
 * @param sources sources to compile.
 * @return map where key is className, value is corresponding ClassFile.
 */
 public InMemoryFileManager compile(List<String> options, String... sources)
 throws IOException, CompilationException {
-return compile(options, ToolBox.JavaSource::new, asList(sources));
+return compile(options, ToolBox.JavaSource::new, Arrays.asList(sources));
 }
 /**
 * Compiles sources in memory.
 *
 * @param sources sources[i][0] - name of file, sources[i][1] - sources.
 * @return map where key is className, value is corresponding ClassFile.
 */
 public InMemoryFileManager compile(String[]... sources) throws IOException,
 CompilationException {
-return compile(emptyList(), sources);
+return compile(Collections.emptyList(), sources);
 }
 /**
 * Compiles sources in memory.
 *
 * @param sources sources[i][0] - name of file, sources[i][1] - sources.
 * @return map where key is className, value is corresponding ClassFile.
 */
 public InMemoryFileManager compile(List<String> options, String[]... sources)
 throws IOException, CompilationException {
-return compile(options, src -> new ToolBox.JavaSource(src[0], src[1]), asList(sources));
+return compile(options, src -> new ToolBox.JavaSource(src[0], src[1]), Arrays.asList(sources));
+}
+/**
+* Returns class file that is read from {@code is}.
+*
+* @param is an input stream
+* @return class file that is read from {@code is}
+* @throws IOException if I/O error occurs
+* @throws ConstantPoolException if constant pool error occurs
+*/
+public ClassFile readClassFile(InputStream is) throws IOException, ConstantPoolException {
+return ClassFile.read(is);
+}
+/**
+* Returns class file that is read from {@code fileObject}.
+*
+* @param fileObject a file object
+* @return class file that is read from {@code fileObject}
+* @throws IOException if I/O error occurs
+* @throws ConstantPoolException if constant pool error occurs
+*/
+public ClassFile readClassFile(JavaFileObject fileObject) throws IOException, ConstantPoolException {
+return readClassFile(fileObject.openInputStream());
+}
+/**
+* Returns class file that corresponds to {@code clazz}.
+*
+* @param clazz a class
+* @return class file that is read from {@code clazz}
+* @throws IOException if I/O error occurs
+* @throws ConstantPoolException if constant pool error occurs
+*/
+public ClassFile readClassFile(Class<?> clazz) throws IOException, ConstantPoolException {
+return readClassFile(getClassFile(clazz));
+}
+/**
+* Returns class file that corresponds to {@code className}.
+*
+* @param className a class name
+* @return class file that is read from {@code className}
+* @throws IOException if I/O error occurs
+* @throws ConstantPoolException if constant pool error occurs
+*/
+public ClassFile readClassFile(String className) throws IOException, ConstantPoolException {
+return readClassFile(getClassFile(className + ".class"));
+}
+/**
+* Returns class file that is read from {@code file}.
+*
+* @param file a file
+* @return class file that is read from {@code file}
+* @throws IOException if I/O error occurs
+* @throws ConstantPoolException if constant pool error occurs
+*/
+public ClassFile readClassFile(File file) throws IOException, ConstantPoolException {
+return readClassFile(new FileInputStream(file));
 }
 public void assertEquals(Object actual, Object expected, String message) {
 if (!Objects.equals(actual, expected))
-throw new AssertionFailedException(format("%s%nGot: %s, Expected: %s", message, actual, expected));
+throw new AssertionFailedException(String.format("%s%nGot: %s, Expected: %s",
+message, actual, expected));
 }
 public void assertNull(Object actual, String message) {
 assertEquals(actual, null, message);
 }
 * Prints message to standard error. New lines are converted to system dependent NL.
 *
 * @param message string to print.
 */
 public void echo(String message) {
-System.err.println(message.replace("\n", LINE_SEPARATOR));
+printf(message + "\n");
 }
 /**
-* Substitutes args in template and prints result to standard error. New lines are converted to system dependent NL.
+* Substitutes args in template and prints result to standard error.
+* New lines are converted to system dependent NL.
 *
 * @param template template in standard String.format(...) format.
 * @param args arguments to substitute in template.
 */
 public void printf(String template, Object... args) {
-System.err.printf(template, Stream.of(args)
+System.err.printf(String.format(template, args).replace("\n", LINE_SEPARATOR));
-.map(Objects::toString)
-.map(m -> m.replace("\n", LINE_SEPARATOR))
-.collect(toList())
-.toArray());
 }
 public static class CompilationException extends Exception {
 public CompilationException(String message) {

changeset 26101	d5dd2ecd2353
parent 25845	14935053bb07
child 27552	8a4b2d3639c1