2019-12-05 16:25:33 +00:00
|
|
|
/*
|
2020-06-10 15:12:33 +00:00
|
|
|
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
|
2019-12-05 16:25:33 +00:00
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
|
|
* accompanied this code).
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License version
|
|
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*
|
|
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
|
|
* questions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.nio.file.Files;
|
|
|
|
import java.nio.file.Path;
|
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.Optional;
|
|
|
|
import java.util.Set;
|
|
|
|
import java.util.stream.Collectors;
|
2020-06-24 00:31:38 +00:00
|
|
|
import jdk.jpackage.test.PackageType;
|
|
|
|
import jdk.jpackage.test.PackageTest;
|
|
|
|
import jdk.jpackage.test.JPackageCommand;
|
|
|
|
import jdk.jpackage.test.TKit;
|
2019-12-05 16:25:33 +00:00
|
|
|
import jdk.jpackage.test.Annotations.Test;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Test --runtime-image parameter.
|
|
|
|
* Output of the test should be RuntimePackageTest*.* installer.
|
|
|
|
* The installer should install Java Runtime without an application.
|
|
|
|
* Installation directory should not have "app" subfolder and should not have
|
|
|
|
* an application launcher.
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* Windows:
|
|
|
|
*
|
|
|
|
* Java runtime should be installed in %ProgramFiles%\RuntimePackageTest directory.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* @test
|
|
|
|
* @summary jpackage with --runtime-image
|
|
|
|
* @library ../helpers
|
|
|
|
* @key jpackagePlatformPackage
|
|
|
|
* @build jdk.jpackage.test.*
|
2020-06-10 15:12:33 +00:00
|
|
|
* @comment Temporary disable for OSX until functionality implemented
|
2019-12-05 16:25:33 +00:00
|
|
|
* @requires (os.family != "mac")
|
2020-06-10 15:12:33 +00:00
|
|
|
* @requires (jpackage.test.SQETest == null)
|
2020-11-04 20:27:11 +00:00
|
|
|
* @modules jdk.jpackage/jdk.jpackage.internal
|
2019-12-05 16:25:33 +00:00
|
|
|
* @compile RuntimePackageTest.java
|
2020-06-10 15:12:33 +00:00
|
|
|
* @run main/othervm/timeout=1400 -Xmx512m jdk.jpackage.test.Main
|
2019-12-05 16:25:33 +00:00
|
|
|
* --jpt-run=RuntimePackageTest
|
|
|
|
*/
|
2020-06-10 15:12:33 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* @test
|
|
|
|
* @summary jpackage with --runtime-image
|
|
|
|
* @library ../helpers
|
|
|
|
* @key jpackagePlatformPackage
|
|
|
|
* @build jdk.jpackage.test.*
|
|
|
|
* @comment Temporary disable for OSX until functionality implemented
|
|
|
|
* @requires (os.family != "mac")
|
|
|
|
* @requires (jpackage.test.SQETest != null)
|
2020-11-04 20:27:11 +00:00
|
|
|
* @modules jdk.jpackage/jdk.jpackage.internal
|
2020-06-10 15:12:33 +00:00
|
|
|
* @compile RuntimePackageTest.java
|
|
|
|
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
|
|
|
|
* --jpt-run=RuntimePackageTest.test
|
|
|
|
*/
|
2019-12-05 16:25:33 +00:00
|
|
|
public class RuntimePackageTest {
|
|
|
|
|
|
|
|
@Test
|
|
|
|
public static void test() {
|
2020-06-10 15:12:33 +00:00
|
|
|
init(PackageType.NATIVE).run();
|
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
public static void testUsrInstallDir() {
|
|
|
|
init(PackageType.LINUX)
|
|
|
|
.addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr"))
|
|
|
|
.run();
|
|
|
|
}
|
|
|
|
|
|
|
|
@Test
|
|
|
|
public static void testUsrInstallDir2() {
|
|
|
|
init(PackageType.LINUX)
|
|
|
|
.addInitializer(cmd -> cmd.addArguments("--install-dir", "/usr/lib/Java"))
|
|
|
|
.run();
|
|
|
|
}
|
|
|
|
|
|
|
|
private static PackageTest init(Set<PackageType> types) {
|
|
|
|
return new PackageTest()
|
|
|
|
.forTypes(types)
|
2019-12-05 16:25:33 +00:00
|
|
|
.addInitializer(cmd -> {
|
|
|
|
cmd.addArguments("--runtime-image", Optional.ofNullable(
|
|
|
|
JPackageCommand.DEFAULT_RUNTIME_IMAGE).orElse(Path.of(
|
|
|
|
System.getProperty("java.home"))));
|
|
|
|
// Remove --input parameter from jpackage command line as we don't
|
|
|
|
// create input directory in the test and jpackage fails
|
|
|
|
// if --input references non existant directory.
|
|
|
|
cmd.removeArgumentWithValue("--input");
|
|
|
|
})
|
|
|
|
.addInstallVerifier(cmd -> {
|
|
|
|
Set<Path> srcRuntime = listFiles(Path.of(cmd.getArgumentValue("--runtime-image")));
|
|
|
|
Set<Path> dstRuntime = listFiles(cmd.appRuntimeDirectory());
|
|
|
|
|
|
|
|
Set<Path> intersection = new HashSet<>(srcRuntime);
|
|
|
|
intersection.retainAll(dstRuntime);
|
|
|
|
|
|
|
|
srcRuntime.removeAll(intersection);
|
|
|
|
dstRuntime.removeAll(intersection);
|
|
|
|
|
|
|
|
assertFileListEmpty(srcRuntime, "Missing");
|
|
|
|
assertFileListEmpty(dstRuntime, "Unexpected");
|
2020-06-10 15:12:33 +00:00
|
|
|
});
|
2019-12-05 16:25:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
private static Set<Path> listFiles(Path root) throws IOException {
|
|
|
|
try (var files = Files.walk(root)) {
|
|
|
|
return files.map(root::relativize).collect(Collectors.toSet());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private static void assertFileListEmpty(Set<Path> paths, String msg) {
|
|
|
|
TKit.assertTrue(paths.isEmpty(), String.format(
|
|
|
|
"Check there are no %s files in installed image",
|
|
|
|
msg.toLowerCase()), () -> {
|
|
|
|
String msg2 = String.format("%s %d files", msg, paths.size());
|
|
|
|
TKit.trace(msg2 + ":");
|
|
|
|
paths.stream().map(Path::toString).sorted().forEachOrdered(
|
|
|
|
TKit::trace);
|
|
|
|
TKit.trace("Done");
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|