< prev index next >
test/tools/jar/multiRelease/RuntimeTest.java
Print this page
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2017, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
@@ -23,16 +23,11 @@
/*
* @test
* @summary Test Multi-Release jar usage in runtime
* @library /test/lib
- * @library /lib/testlibrary
* @modules jdk.compiler
- * @build jdk.test.lib.JDKToolFinder jdk.test.lib.JDKToolLauncher
- * jdk.test.lib.process.OutputAnalyzer
- * jdk.test.lib.process.ProcessTools
- * CompilerUtils RuntimeTest
* @run testng RuntimeTest
*/
import static org.testng.Assert.*;
@@ -49,50 +44,76 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.compiler.CompilerUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
public class RuntimeTest {
public static final int SUCCESS = 0;
- private final String src = System.getProperty("test.src", ".");
- private final String usr = System.getProperty("user.dir", ".");
+ private static final String src = System.getProperty("test.src", ".");
+ private static final String usr = System.getProperty("user.dir", ".");
+
+ private static final Path srcFileRoot = Paths.get(src, "data", "runtimetest");
+ private static final Path genFileRoot = Paths.get(usr, "data", "runtimetest");
+
+ private static final int OLD_RELEASE = 8;
+ private static final int CURRENT_RELEASE = Runtime.version().major();
+ private static final int FUTURE_RELEASE = CURRENT_RELEASE + 1;
+ private static final String MRJAR_BOTH_RELEASES = "MV_BOTH.jar";
+ private static final String MRJAR_CURRENT_RELEASE = "MV_ONLY_" + CURRENT_RELEASE + ".jar";
+ private static final String NON_MRJAR_OLD_RELEASE = "NON_MV.jar";
+
+ private static final int[] versions = {OLD_RELEASE, CURRENT_RELEASE, FUTURE_RELEASE};
+ private static final Map<String, String> templateSourceMap = new HashMap<>() {
+ {
+ put("helper.template", "Helper.java");
+ put("main.template", "Main.java");
+ put("resource.template", "versionResource");
+ }
+ };
@DataProvider(name = "jarFiles")
Object[][] jarFiles() {
- return new Object[][] { { "MV_BOTH.jar", 9, 9, 9 },
- { "MV_ONLY_9.jar", 9, 9, 9 },
- { "NON_MV.jar", 8, 8, 8 } };
+ return new Object[][]{
+ {MRJAR_BOTH_RELEASES, CURRENT_RELEASE, CURRENT_RELEASE, CURRENT_RELEASE},
+ {MRJAR_CURRENT_RELEASE, CURRENT_RELEASE, CURRENT_RELEASE, CURRENT_RELEASE},
+ {NON_MRJAR_OLD_RELEASE, OLD_RELEASE, OLD_RELEASE, OLD_RELEASE}
+ };
}
@BeforeClass
protected void setUpTest() throws Throwable {
+ createJarSourceFiles();
compile();
Path classes = Paths.get("classes");
- jar("cfm", "MV_BOTH.jar", "manifest.txt",
- "-C", classes.resolve("base").toString(), ".",
- "--release", "9", "-C", classes.resolve("v9").toString(), ".",
- "--release", "10", "-C", classes.resolve("v10").toString(), ".")
+ jar("cfm", MRJAR_BOTH_RELEASES, "manifest.txt",
+ "-C", classes.resolve("v" + OLD_RELEASE).toString(), ".",
+ "--release", "" + CURRENT_RELEASE, "-C", classes.resolve("v" + CURRENT_RELEASE).toString(), ".",
+ "--release", "" + FUTURE_RELEASE, "-C", classes.resolve("v" + FUTURE_RELEASE).toString(), ".")
.shouldHaveExitValue(0);
- jar("cfm", "MV_ONLY_9.jar", "manifest.txt",
- "-C", classes.resolve("base").toString(), ".",
- "--release", "9", "-C", classes.resolve("v9").toString(), ".")
+ jar("cfm", MRJAR_CURRENT_RELEASE, "manifest.txt",
+ "-C", classes.resolve("v" + OLD_RELEASE).toString(), ".",
+ "--release", "" + CURRENT_RELEASE, "-C", classes.resolve("v" + CURRENT_RELEASE).toString(), ".")
.shouldHaveExitValue(0);
- jar("cfm", "NON_MV.jar", "manifest.txt",
- "-C", classes.resolve("base").toString(), ".")
+ jar("cfm", NON_MRJAR_OLD_RELEASE, "manifest.txt",
+ "-C", classes.resolve("v" + OLD_RELEASE).toString(), ".")
.shouldHaveExitValue(0);
}
@Test(dataProvider = "jarFiles")
public void testClasspath(String jar, int mainVer, int helperVer,
@@ -201,28 +222,48 @@
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jar");
Stream.of(args).forEach(launcher::addToolArg);
return ProcessTools.executeCommand(launcher.getCommand());
}
+ private static String platformPath(String p) {
+ return p.replace("/", File.separator);
+ }
+
+ private static void createJarSourceFiles() throws IOException {
+ for (int ver : versions) {
+ for (Map.Entry<String, String> fileMap : templateSourceMap.entrySet()) {
+ String genFileName = fileMap.getValue();
+ Path template = srcFileRoot.resolve(fileMap.getKey());
+ Path out = genFileName.endsWith("java")
+ ? genFileRoot.resolve(platformPath("v" + ver + "/testpackage/" + genFileName))
+ : genFileRoot.resolve(platformPath("v" + ver + "/" + genFileName));
+ Files.createDirectories(out.getParent());
+ List<String> lines = Files.lines(template)
+ .map(s -> s.replaceAll("\\$version", String.valueOf(ver)))
+ .collect(Collectors.toList());
+ Files.write(out, lines);
+ }
+ }
+ }
+
private void compile() throws Throwable {
- String[] vers = { "base", "v9", "v10" };
- for (String ver : vers) {
- Path classes = Paths.get(usr, "classes", ver);
+ for (int ver : versions) {
+ Path classes = Paths.get(usr, "classes", "v" + ver);
Files.createDirectories(classes);
- Path source = Paths.get(src, "data", "runtimetest", ver);
+ Path source = genFileRoot.resolve("v" + ver);
assertTrue(CompilerUtils.compile(source, classes));
Files.copy(source.resolve("versionResource"),
classes.resolve("versionResource"),
StandardCopyOption.REPLACE_EXISTING);
}
Path classes = Paths.get(usr, "classes", "test");
Files.createDirectory(classes);
- Path source = Paths.get(src, "data", "runtimetest", "test");
+ Path source = srcFileRoot.resolve("test");
assertTrue(
- CompilerUtils.compile(source, classes, "-cp", "classes/base/"));
- Files.copy(Paths.get(src, "data", "runtimetest", "manifest.txt"),
+ CompilerUtils.compile(source, classes, "-cp", "classes/v" + OLD_RELEASE));
+ Files.copy(srcFileRoot.resolve("manifest.txt"),
Paths.get(usr, "manifest.txt"),
StandardCopyOption.REPLACE_EXISTING);
}
OutputAnalyzer java(String... args) throws Throwable {
< prev index next >