RFR: 8356578: Test --mac-entitlements

[Alexey Semenyuk]

On Thu, 16 Oct 2025 02:32:41 GMT, Alexander Matveev <almatvee at openjdk.org> wrote:

> - Added test to cover `--mac-entitlements`.
> - Added verification for entitlements from `--resource-dir`.

Changes requested by asemenyuk (Reviewer).

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/LauncherVerifier.java line 353:

> 351:         } else {
> 352:             expected = DefaultEntitlements.STANDARD;
> 353:         }

How about changing the whole thing to this:

        var customFile = Optional.ofNullable(cmd.getArgumentValue("--mac-entitlements")).map(Path::of);
        if (customFile.isEmpty()) {
            // Try from the resource dir.
            var resourceDirFile = Optional.ofNullable(cmd.getArgumentValue("--resource-dir")).map(Path::of).map(resourceDir -> {
                return resourceDir.resolve(cmd.name() + ".entitlements");
            }).filter(Files::exists);
            if (resourceDirFile.isPresent()) {
                customFile = resourceDirFile; 
            }
        }

        Map<String, Object> expected;
        if (customFile.isPresent()) {
            expected = new PListReader(Files.readAllBytes(customFile.orElseThrow())).toMap(true);
        } else if (cmd.hasArgument("--mac-app-store")) {
            expected = DefaultEntitlements.APP_STORE;
        } else {
            expected = DefaultEntitlements.STANDARD;
        }

?

Less code duplication.

-------------

PR Review: https://git.openjdk.org/jdk/pull/27835#pullrequestreview-3350699816
PR Review Comment: https://git.openjdk.org/jdk/pull/27835#discussion_r2440279577