archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152897: refactor ToolBox to allow reduced documented dependencies

Browse source 
Reviewed-by: vromero
This commit is contained in:
Jonathan Gibbons 2016-03-31 15:20:50 -07:00
parent 208d93e110
commit 7812306bc0
212 changed files with 3955 additions and 3485 deletions
Download patch file Download diff file Expand all files Collapse all files

21
langtools/test/tools/javac/javazip/JavaZipTest.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2016, 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
@ -27,10 +27,8 @@
* @summary check that source files inside zip files on the class path are ignored
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build ToolBox
* @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask
* @run main JavaZipTest
*/
@ -38,6 +36,11 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Arrays;
import toolbox.JarTask;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.ToolBox;
// Original test: test/tools/javac/javazip/Test.sh
public class JavaZipTest {
@ -84,8 +87,8 @@ public class JavaZipTest {
public void test() throws Exception {
createOutputDirAndSourceFiles();
createZipsAndJars();
check(ToolBox.Expect.SUCCESS, successfulCompilationArgs);
check(ToolBox.Expect.FAIL, unsuccessfulCompilationArgs);
check(Task.Expect.SUCCESS, successfulCompilationArgs);
check(Task.Expect.FAIL, unsuccessfulCompilationArgs);
}
void createOutputDirAndSourceFiles() throws Exception {
@ -101,15 +104,15 @@ public class JavaZipTest {
void createZipsAndJars() throws Exception {
//jar and zip creation
for (String[] args: jarArgs) {
tb.new JarTask().run(args).writeAll();
new JarTask(tb).run(args).writeAll();
}
}
void check(ToolBox.Expect expectedStatus, String[][] theArgs) throws Exception {
void check(Task.Expect expectedStatus, String[][] theArgs) throws Exception {
for (String[] allArgs: theArgs) {
tb.new JavacTask()
new JavacTask(tb)
.options(opts(allArgs))
.files(files(allArgs))
.run(expectedStatus)