Skip to content

Commit 656de81

Browse files
GoeLinGoeLin
committed
Backport 2bb4b9398d65e3f37f34e45476c969ff0afb1540
1 parent ed63b71 commit 656de81

File tree

11 files changed

+136
-158
lines changed

11 files changed

+136
-158
lines changed

‎test/jdk/java/util/Calendar/SupplementalJapaneseEraTestRun.java‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 2023, 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
@@ -34,10 +34,15 @@
3434
import java.util.List;
3535
import java.util.Locale;
3636
import java.util.TimeZone;
37-
import static java.util.Calendar.*;
37+
import java.util.stream.Stream;
38+
39+
import static java.util.Calendar.DAY_OF_YEAR;
40+
import static java.util.Calendar.ERA;
41+
import static java.util.Calendar.FEBRUARY;
42+
import static java.util.Calendar.LONG;
43+
import static java.util.Calendar.YEAR;
3844

3945
import jdk.test.lib.process.ProcessTools;
40-
import jdk.test.lib.JDKToolLauncher;
4146
import jdk.test.lib.Utils;
4247

4348
import org.testng.annotations.DataProvider;
@@ -91,19 +96,18 @@ public void InvalidPropertyValuesTest(String prop)
9196
}
9297

9398
private static void testRun(String property, List<String> javaParam)
94-
throws Throwable{
95-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
96-
launcher.addToolArg("-ea")
97-
.addToolArg("-esa")
98-
.addToolArg("-cp")
99-
.addToolArg(Utils.TEST_CLASS_PATH)
100-
.addToolArg("-Djdk.calendar.japanese.supplemental.era=" + property)
101-
.addToolArg("SupplementalJapaneseEraTest");
102-
for (String para: javaParam) {
103-
launcher.addToolArg(para);
104-
}
105-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
106-
.getExitValue();
99+
throws Throwable {
100+
List<String> params = List.of(
101+
"-ea", "-esa",
102+
"-cp", Utils.TEST_CLASS_PATH,
103+
"-Djdk.calendar.japanese.supplemental.era=" + property,
104+
"SupplementalJapaneseEraTest");
105+
// Build process (with VM flags)
106+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
107+
Stream.concat(params.stream(), javaParam.stream()).toList());
108+
// Evaluate process status
109+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
110+
107111
System.out.println(property + ":pass");
108112
if (exitCode != 0) {
109113
System.out.println(property + ":fail");

‎test/jdk/java/util/Locale/LocaleProvidersRun.java‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2023, 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
@@ -39,7 +39,6 @@
3939

4040
import java.util.Locale;
4141

42-
import jdk.test.lib.JDKToolLauncher;
4342
import jdk.test.lib.process.ProcessTools;
4443
import jdk.test.lib.Utils;
4544

@@ -178,22 +177,18 @@ public static void main(String[] args) throws Throwable {
178177
}
179178

180179
private static void testRun(String prefList, String methodName,
181-
String param1, String param2, String param3) throws Throwable{
182-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
183-
launcher.addToolArg("-ea")
184-
.addToolArg("-esa")
185-
.addToolArg("-cp")
186-
.addToolArg(Utils.TEST_CLASS_PATH)
187-
.addToolArg("-Djava.util.logging.config.class=LocaleProviders$LogConfig")
188-
.addToolArg("-Djava.locale.providers=" + prefList)
189-
.addToolArg("--add-exports=java.base/sun.util.locale.provider=ALL-UNNAMED")
190-
.addToolArg("LocaleProviders")
191-
.addToolArg(methodName)
192-
.addToolArg(param1)
193-
.addToolArg(param2)
194-
.addToolArg(param3);
195-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
196-
.getExitValue();
180+
String param1, String param2, String param3) throws Throwable {
181+
182+
// Build process (with VM flags)
183+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
184+
"-ea", "-esa",
185+
"-cp", Utils.TEST_CLASS_PATH,
186+
"-Djava.util.logging.config.class=LocaleProviders$LogConfig",
187+
"-Djava.locale.providers=" + prefList,
188+
"--add-exports=java.base/sun.util.locale.provider=ALL-UNNAMED",
189+
"LocaleProviders", methodName, param1, param2, param3);
190+
// Evaluate process status
191+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
197192
if (exitCode != 0) {
198193
throw new RuntimeException("Unexpected exit code: " + exitCode);
199194
}

‎test/jdk/java/util/ResourceBundle/Control/MissingResourceCauseTestRun.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,13 @@ private static void runCmd() throws Throwable {
9090
// UnreadableRB.properties is in current directory
9191
String cp = Utils.TEST_CLASSES + File.pathSeparator + Utils.TEST_SRC
9292
+ File.pathSeparator + ".";
93-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
94-
launcher.addToolArg("-ea")
95-
.addToolArg("-esa")
96-
.addToolArg("-cp")
97-
.addToolArg(cp)
98-
.addToolArg("MissingResourceCauseTest");
99-
100-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
101-
.getExitValue();
93+
// Build process (with VM flags)
94+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
95+
"-ea", "-esa",
96+
"-cp", cp,
97+
"MissingResourceCauseTest");
98+
// Evaluate process status
99+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
102100
if (exitCode != 0) {
103101
throw new RuntimeException("Execution of the test failed. "
104102
+ "Unexpected exit code: " + exitCode);

‎test/jdk/java/util/ResourceBundle/modules/ModuleTestUtil.java‎

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2023, 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
@@ -29,6 +29,7 @@
2929
import java.util.stream.Stream;
3030

3131
import jdk.test.lib.JDKToolLauncher;
32+
import jdk.test.lib.Utils;
3233
import jdk.test.lib.compiler.CompilerUtils;
3334
import jdk.test.lib.process.ProcessTools;
3435

@@ -133,17 +134,15 @@ public static void copyResFiles(Path src, Path dest, String mn,
133134
*/
134135
public static void runModule(String mp, String mn, List<String> localeList)
135136
throws Throwable {
136-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
137-
launcher.addToolArg("-ea")
138-
.addToolArg("-esa")
139-
.addToolArg("-p")
140-
.addToolArg(mp)
141-
.addToolArg("-m")
142-
.addToolArg(mn);
143-
localeList.forEach(launcher::addToolArg);
144-
145-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
146-
.getExitValue();
137+
List<String> args = List.of(
138+
"-ea", "-esa",
139+
"-p", mp,
140+
"-m", mn);
141+
// Build process (with VM flags)
142+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
143+
Stream.concat(args.stream(), localeList.stream()).toList());
144+
// Evaluate process status
145+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
147146
if (exitCode != 0) {
148147
throw new RuntimeException("Execution of the test failed. "
149148
+ "Unexpected exit code: " + exitCode);
@@ -161,19 +160,17 @@ public static void runModule(String mp, String mn, List<String> localeList)
161160
*/
162161
public static void runModuleWithCp(String cp, String mp, String mn,
163162
List<String> localeList, boolean expected) throws Throwable {
164-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
165-
launcher.addToolArg("-ea")
166-
.addToolArg("-esa")
167-
.addToolArg("-cp")
168-
.addToolArg(cp)
169-
.addToolArg("-p")
170-
.addToolArg(mp)
171-
.addToolArg("-m")
172-
.addToolArg(mn);
173-
localeList.forEach(launcher::addToolArg);
163+
List<String> args = List.of(
164+
"-ea", "-esa",
165+
"-cp", cp,
166+
"-p", mp,
167+
"-m", mn);
168+
// Build process (with VM flags)
169+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
170+
Stream.concat(args.stream(), localeList.stream()).toList());
171+
// Evaluate process status
172+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
174173

175-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
176-
.getExitValue();
177174
if (expected) {
178175
if (exitCode != 0) {
179176
throw new RuntimeException("Execution of the test loads bundles "
@@ -198,18 +195,17 @@ public static void runModuleWithCp(String cp, String mp, String mn,
198195
*/
199196
public static void runModuleWithLegacyCode(String mp, String mn, List<String> localeList)
200197
throws Throwable {
201-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
202-
launcher.addToolArg("-ea")
203-
.addToolArg("-esa")
204-
.addToolArg("-Djava.locale.useOldISOCodes=true")
205-
.addToolArg("-p")
206-
.addToolArg(mp)
207-
.addToolArg("-m")
208-
.addToolArg(mn);
209-
localeList.forEach(launcher::addToolArg);
198+
List<String> args = List.of(
199+
"-ea", "-esa",
200+
"-Djava.locale.useOldISOCodes=true",
201+
"-p", mp,
202+
"-m", mn);
203+
// Build process (with VM flags)
204+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
205+
Stream.concat(args.stream(), localeList.stream()).toList());
206+
// Evaluate process status
207+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
210208

211-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
212-
.getExitValue();
213209
if (exitCode != 0) {
214210
throw new RuntimeException("Execution of the test failed. "
215211
+ "Unexpected exit code: " + exitCode);

‎test/jdk/java/util/ResourceBundle/modules/layer/LayerTest.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2023, 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
@@ -71,16 +71,13 @@ private static void compileCmd() throws Throwable {
7171
}
7272

7373
private static void runCmd() throws Throwable {
74-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
75-
launcher.addToolArg("-ea")
76-
.addToolArg("-esa")
77-
.addToolArg("-cp")
78-
.addToolArg(Utils.TEST_CLASSES)
79-
.addToolArg("Main")
80-
.addToolArg(Utils.TEST_CLASSES);
81-
82-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
83-
.getExitValue();
74+
// Build process (with VM flags)
75+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
76+
"-ea", "-esa",
77+
"-cp", Utils.TEST_CLASSES,
78+
"Main", Utils.TEST_CLASSES);
79+
// Evaluate process status
80+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
8481
if (exitCode != 0) {
8582
throw new RuntimeException("Execution of the test failed. "
8683
+ "Unexpected exit code: " + exitCode);

‎test/jdk/java/util/ResourceBundle/modules/unnamed/UnNamedTest.java‎

Lines changed: 23 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2016, 2023, 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
@@ -39,6 +39,7 @@
3939
import java.nio.file.Path;
4040
import java.nio.file.Paths;
4141
import java.util.List;
42+
import java.util.stream.Stream;
4243

4344
import jdk.test.lib.JDKToolLauncher;
4445
import jdk.test.lib.Utils;
@@ -73,42 +74,34 @@ private static void compileCmd() throws Throwable {
7374

7475
private static void runCmd() throws Throwable {
7576
// access resource bundles that are exported private unconditionally.
76-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
77-
launcher.addToolArg("-ea")
78-
.addToolArg("-esa")
79-
.addToolArg("-cp")
80-
.addToolArg(Utils.TEST_CLASSES)
81-
.addToolArg("--module-path")
82-
.addToolArg(MODS_DIR.toString())
83-
.addToolArg("--add-modules")
84-
.addToolArg("bundles")
85-
.addToolArg("Main");
86-
LOCALE_LIST.forEach(launcher::addToolArg);
87-
88-
int exitCode = ProcessTools.executeCommand(launcher.getCommand())
89-
.getExitValue();
77+
List<String> args = List.of(
78+
"-ea", "-esa",
79+
"-cp", Utils.TEST_CLASSES,
80+
"--module-path", MODS_DIR.toString(),
81+
"--add-modules", "bundles",
82+
"Main");
83+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
84+
Stream.concat(args.stream(), LOCALE_LIST.stream()).toList());
85+
// Evaluate process status
86+
int exitCode = ProcessTools.executeCommand(pb).getExitValue();
9087
if (exitCode != 0) {
9188
throw new RuntimeException("Execution of the test1 failed. "
9289
+ "Unexpected exit code: " + exitCode);
9390
}
9491

9592
// --add-exports can't open resources
96-
launcher = JDKToolLauncher.createUsingTestJDK("java");
97-
launcher.addToolArg("-ea")
98-
.addToolArg("-esa")
99-
.addToolArg("-cp")
100-
.addToolArg(Utils.TEST_CLASSES)
101-
.addToolArg("--module-path")
102-
.addToolArg(MODS_DIR.toString())
103-
.addToolArg("--add-modules")
104-
.addToolArg("bundles")
105-
.addToolArg("--add-opens")
106-
.addToolArg("bundles/jdk.test.internal.resources=ALL-UNNAMED")
107-
.addToolArg("Main");
108-
LOCALE_LIST.forEach(launcher::addToolArg);
93+
List<String> argsWithOpens = List.of(
94+
"-ea", "-esa",
95+
"-cp", Utils.TEST_CLASSES,
96+
"--module-path", MODS_DIR.toString(),
97+
"--add-modules", "bundles",
98+
"--add-opens", "bundles/jdk.test.internal.resources=ALL-UNNAMED",
99+
"Main");
100+
pb = ProcessTools.createTestJavaProcessBuilder(
101+
Stream.concat(argsWithOpens.stream(), LOCALE_LIST.stream()).toList());
109102

110-
exitCode = ProcessTools.executeCommand(launcher.getCommand())
111-
.getExitValue();
103+
// Evaluate process status
104+
exitCode = ProcessTools.executeCommand(pb).getExitValue();
112105
if (exitCode != 0) {
113106
throw new RuntimeException("Execution of the test2 failed. "
114107
+ "Unexpected exit code: " + exitCode);

‎test/jdk/java/util/ResourceBundle/modules/visibility/VisibilityTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2023, 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
@@ -39,10 +39,12 @@
3939
import java.nio.file.Path;
4040
import java.nio.file.Paths;
4141
import java.util.List;
42+
import java.util.stream.Stream;
4243

4344
import jdk.test.lib.JDKToolLauncher;
4445
import jdk.test.lib.Utils;
4546
import jdk.test.lib.process.ProcessTools;
47+
4648
import org.testng.annotations.BeforeTest;
4749
import org.testng.annotations.DataProvider;
4850
import org.testng.annotations.Test;
@@ -328,11 +330,10 @@ public void RunWithPkgRes(List<String> argsList) throws Throwable {
328330
}
329331

330332
private int runCmd(List<String> argsList) throws Throwable {
331-
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java");
332-
launcher.addToolArg("-ea")
333-
.addToolArg("-esa");
334-
argsList.forEach(launcher::addToolArg);
335-
336-
return ProcessTools.executeCommand(launcher.getCommand()).getExitValue();
333+
// Build process (with VM flags)
334+
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
335+
Stream.concat(Stream.of("-ea", "-esa"), argsList.stream()).toList());
336+
// Evaluate process status
337+
return ProcessTools.executeCommand(pb).getExitValue();
337338
}
338-
}
339+
}

0 commit comments

Comments
 (0)