Skip to content

8288013: jpackage: test utility Windows registry enhancement #9083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

8288013: jpackage: test utility Windows registry enhancement #9083

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,26 @@ private static String queryRegistryValue(String keyPath, String valueName) {
}

String value = status.assertExitCodeIsZero().getOutput().stream().skip(2).findFirst().orElseThrow();
// Extract the last field from the following line:
// Common Desktop REG_SZ C:\Users\Public\Desktop
value = value.split(" REG_SZ ")[1];
// Extract the last field from the following lines:
// (Default) REG_SZ test1
// string_val REG_SZ test2
// string_val_empty REG_SZ
// bin_val REG_BINARY 4242
// bin_val_empty REG_BINARY
// dword_val REG_DWORD 0x2a
// qword_val REG_QWORD 0x2a
// multi_string_val REG_MULTI_SZ test3\0test4
// multi_string_val_empty REG_MULTI_SZ
// expand_string_val REG_EXPAND_SZ test5
// expand_string_val_empty REG_EXPAND_SZ
String[] parts = value.split(" {4}REG_[A-Z_]+ {4}");
if (parts.length == 1) {
value = "";
} else if (parts.length == 2) {
value = parts[1];
} else {
throw new RuntimeException(String.format("Failed to extract registry value from string [%s]", value));
}

TKit.trace(String.format("Registry value [%s] at [%s] path is [%s]",
valueName, keyPath, value));
Expand Down