< prev index next >
test/jdk/tools/jpackage/linux/PackageDepsTest.java
Print this page
*** 23,32 ****
--- 23,33 ----
import jdk.jpackage.test.TKit;
import jdk.jpackage.test.PackageTest;
import jdk.jpackage.test.PackageType;
import jdk.jpackage.test.LinuxHelper;
+ import jdk.jpackage.test.Annotations.Test;
/**
* Test --linux-package-deps parameter. Output of the test should be
* apackagedepstestprereq_1.0-1_amd64.deb and packagedepstest_1.0-1_amd64.deb or
*** 48,78 ****
* @library ../helpers
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
! * @run main/othervm/timeout=360 -Xmx512m PackageDepsTest
*/
public class PackageDepsTest {
! public static void main(String[] args) {
! // Pick the name of prerequisite package to be alphabetically
! // preceeding the main package name.
! // This is needed to make Bash script batch installing/uninstalling packages
! // produced by jtreg tests install/uninstall packages in the right order.
final String PREREQ_PACKAGE_NAME = "apackagedepstestprereq";
! TKit.run(args, () -> {
! new PackageTest()
.forTypes(PackageType.LINUX)
.configureHelloApp()
.addInitializer(cmd -> {
cmd.setArgumentValue("--name", PREREQ_PACKAGE_NAME);
! })
! .run();
! new PackageTest()
.forTypes(PackageType.LINUX)
.configureHelloApp()
.addInitializer(cmd -> {
cmd.addArguments("--linux-package-deps", PREREQ_PACKAGE_NAME);
})
--- 49,76 ----
* @library ../helpers
* @key jpackagePlatformPackage
* @build jdk.jpackage.test.*
* @requires (os.family == "linux")
* @modules jdk.incubator.jpackage/jdk.incubator.jpackage.internal
! * @compile PackageDepsTest.java
! * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
! * --jpt-run=PackageDepsTest
*/
public class PackageDepsTest {
! @Test
! public static void test() {
final String PREREQ_PACKAGE_NAME = "apackagedepstestprereq";
! PackageTest test1 = new PackageTest()
.forTypes(PackageType.LINUX)
.configureHelloApp()
.addInitializer(cmd -> {
cmd.setArgumentValue("--name", PREREQ_PACKAGE_NAME);
! });
! PackageTest test2 = new PackageTest()
.forTypes(PackageType.LINUX)
.configureHelloApp()
.addInitializer(cmd -> {
cmd.addArguments("--linux-package-deps", PREREQ_PACKAGE_NAME);
})
*** 81,90 ****
TKit.assertTrue(
LinuxHelper.getPrerequisitePackages(cmd).contains(
PREREQ_PACKAGE_NAME), String.format(
"Check package depends on [%s] package",
PREREQ_PACKAGE_NAME));
- })
- .run();
});
}
}
--- 79,88 ----
TKit.assertTrue(
LinuxHelper.getPrerequisitePackages(cmd).contains(
PREREQ_PACKAGE_NAME), String.format(
"Check package depends on [%s] package",
PREREQ_PACKAGE_NAME));
});
+
+ new PackageTest.Group(test1, test2).run();
}
}
< prev index next >