Skip to content

Commit 0329855

Browse files
committed
8343804: Show the default time zone with -XshowSettings option
Reviewed-by: iris, jpai
1 parent 44ec501 commit 0329855

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

src/java.base/share/classes/sun/launcher/LauncherHelper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
import java.util.Properties;
6464
import java.util.ResourceBundle;
6565
import java.util.Set;
66+
import java.util.TimeZone;
6667
import java.util.TreeSet;
6768
import java.util.function.Function;
6869
import java.util.jar.Attributes;
@@ -318,6 +319,8 @@ private static void printLocale(boolean verbose) {
318319
Locale.getDefault(Category.DISPLAY).getDisplayName());
319320
ostream.println(INDENT + "default format locale = " +
320321
Locale.getDefault(Category.FORMAT).getDisplayName());
322+
ostream.println(INDENT + "default timezone = " +
323+
TimeZone.getDefault().getID());
321324
ostream.println(INDENT + "tzdata version = " +
322325
ZoneInfoFile.getVersion());
323326
if (verbose) {

test/jdk/tools/launcher/Settings.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,7 +25,7 @@
2525

2626
/*
2727
* @test
28-
* @bug 6994753 7123582 8305950 8281658 8310201 8311653
28+
* @bug 6994753 7123582 8305950 8281658 8310201 8311653 8343804
2929
* @summary tests -XshowSettings options
3030
* @modules jdk.compiler
3131
* jdk.zipfs
@@ -80,6 +80,7 @@ static void checkNotContains(TestResult tr, String str) {
8080
private static final String SYSTEM_SETTINGS = "Operating System Metrics:";
8181
private static final String METRICS_NOT_AVAILABLE_MSG = "No metrics available for this platform";
8282
private static final String STACKSIZE_SETTINGS = "Stack Size:";
83+
private static final String TIMEZONE_SETTINGS = "default timezone";
8384
private static final String TZDATA_SETTINGS = "tzdata version";
8485
private static final String ERR_MSG = "Unrecognized showSettings option:";
8586

@@ -96,6 +97,7 @@ static void containsAllOptions(TestResult tr) {
9697
checkNotContains(tr, SEC_SUMMARY_PROPS_SETTINGS);
9798
checkContains(tr, SEC_PROVIDER_SETTINGS);
9899
checkContains(tr, SEC_TLS_SETTINGS);
100+
checkContains(tr, TIMEZONE_SETTINGS);
99101
checkContains(tr, TZDATA_SETTINGS);
100102
if (System.getProperty("os.name").contains("Linux")) {
101103
checkContains(tr, SYSTEM_SETTINGS);
@@ -119,6 +121,7 @@ static void containsDefaultOptions(TestResult tr) {
119121
checkContains(tr, SEC_SUMMARY_PROPS_SETTINGS);
120122
checkContains(tr, SEC_PROVIDER_SETTINGS);
121123
checkContains(tr, SEC_TLS_SETTINGS);
124+
checkContains(tr, TIMEZONE_SETTINGS);
122125
checkContains(tr, TZDATA_SETTINGS);
123126
if (System.getProperty("os.name").contains("Linux")) {
124127
checkContains(tr, SYSTEM_SETTINGS);
@@ -190,6 +193,7 @@ static void runTestOptionLocale() throws IOException {
190193
checkContains(tr, LOCALE_SETTINGS);
191194
checkContains(tr, AVAILABLE_LOCALES);
192195
checkNotContains(tr, LOCALE_SUMMARY_SETTINGS);
196+
checkContains(tr, TIMEZONE_SETTINGS);
193197
checkContains(tr, TZDATA_SETTINGS);
194198
}
195199

0 commit comments

Comments
 (0)