Skip to content

Commit 2c509a1

Browse files
author
Alexey Semenyuk
committedNov 15, 2024
8344326: Move jpackage tests from "jdk.jpackage.tests" package to the default package
Reviewed-by: almatvee
1 parent 41a2d49 commit 2c509a1

21 files changed

+37
-80
lines changed
 

‎test/jdk/tools/jpackage/helpers/jdk/jpackage/test/WindowsHelper.java

-16
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,6 @@ private static Path getInstallationSubDirectory(JPackageCommand cmd) {
6464
return Path.of(cmd.getArgumentValue("--install-dir", cmd::name));
6565
}
6666

67-
// Tests have problems on windows where path in the temp dir are too long
68-
// for the wix tools. We can't use a tempDir outside the TKit's WorkDir, so
69-
// we minimize both the tempRoot directory name (above) and the tempDir name
70-
// (below) to the extension part (which is necessary to differenciate between
71-
// the multiple PackageTypes that will be run for one JPackageCommand).
72-
// It might be beter if the whole work dir name was shortened from:
73-
// jtreg_open_test_jdk_tools_jpackage_share_jdk_jpackage_tests_BasicTest_java.
74-
public static Path getTempDirectory(JPackageCommand cmd, Path tempRoot) {
75-
String ext = cmd.outputBundle().getFileName().toString();
76-
int i = ext.lastIndexOf(".");
77-
if (i > 0 && i < (ext.length() - 1)) {
78-
ext = ext.substring(i+1);
79-
}
80-
return tempRoot.resolve(ext);
81-
}
82-
8367
private static void runMsiexecWithRetries(Executor misexec) {
8468
Executor.Result result = null;
8569
for (int attempt = 0; attempt < 8; ++attempt) {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/AppVersionTest.java ‎test/jdk/tools/jpackage/share/AppVersionTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.util.Collection;
@@ -46,7 +45,7 @@
4645
* @build jdk.jpackage.test.*
4746
* @compile AppVersionTest.java
4847
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
49-
* --jpt-run=jdk.jpackage.tests.AppVersionTest
48+
* --jpt-run=AppVersionTest
5049
*/
5150

5251
public final class AppVersionTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/BasicTest.java ‎test/jdk/tools/jpackage/share/BasicTest.java

+6-13
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Files;
@@ -45,16 +44,14 @@
4544
import jdk.jpackage.test.Functional.ThrowingConsumer;
4645
import static jdk.jpackage.test.RunnablePackageTest.Action.CREATE_AND_UNPACK;
4746

48-
import static jdk.jpackage.test.WindowsHelper.getTempDirectory;
49-
5047
/*
5148
* @test
5249
* @summary jpackage basic testing
5350
* @library /test/jdk/tools/jpackage/helpers
5451
* @build jdk.jpackage.test.*
5552
* @compile BasicTest.java
5653
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
57-
* --jpt-run=jdk.jpackage.tests.BasicTest
54+
* --jpt-run=BasicTest
5855
*/
5956

6057
public final class BasicTest {
@@ -345,7 +342,7 @@ public void testTemp(TestTempType type) throws IOException {
345342
// Force save of package bundle in test work directory.
346343
.addInitializer(JPackageCommand::setDefaultInputOutput)
347344
.addInitializer(cmd -> {
348-
Path tempDir = getTempDirectory(cmd, tempRoot);
345+
Path tempDir = tempRoot.resolve(cmd.packageType().name());
349346
switch (type) {
350347
case TEMPDIR_EMPTY -> Files.createDirectories(tempDir);
351348
case TEMPDIR_NOT_EXIST -> Files.createDirectories(tempDir.getParent());
@@ -362,20 +359,16 @@ public void testTemp(TestTempType type) throws IOException {
362359
if (TestTempType.TEMPDIR_NOT_EMPTY.equals(type)) {
363360
pkgTest.setExpectedExitCode(1).addBundleVerifier(cmd -> {
364361
// Check jpackage didn't use the supplied directory.
365-
Path tempDir = getTempDirectory(cmd, tempRoot);
366-
String[] tempDirContents = tempDir.toFile().list();
367-
TKit.assertStringListEquals(List.of("foo.txt"), List.of(
368-
tempDirContents), String.format(
369-
"Check the contents of the supplied temporary directory [%s]",
370-
tempDir));
362+
Path tempDir = Path.of(cmd.getArgumentValue("--temp"));
363+
TKit.assertDirectoryContent(tempDir).match(Path.of("foo.txt"));
371364
TKit.assertStringListEquals(List.of("Hello Duke!"),
372-
Files.readAllLines(tempDir.resolve(tempDirContents[0])),
365+
Files.readAllLines(tempDir.resolve("foo.txt")),
373366
"Check the contents of the file in the supplied temporary directory");
374367
});
375368
} else {
376369
pkgTest.addBundleVerifier(cmd -> {
377370
// Check jpackage used the supplied directory.
378-
Path tempDir = getTempDirectory(cmd, tempRoot);
371+
Path tempDir = Path.of(cmd.getArgumentValue("--temp"));
379372
TKit.assertDirectoryNotEmpty(tempDir);
380373
});
381374
}

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/CookedRuntimeTest.java ‎test/jdk/tools/jpackage/share/CookedRuntimeTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Files;
@@ -46,7 +45,7 @@
4645
* @build jdk.jpackage.test.*
4746
* @compile CookedRuntimeTest.java
4847
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
49-
* --jpt-run=jdk.jpackage.tests.CookedRuntimeTest
48+
* --jpt-run=CookedRuntimeTest
5049
*/
5150

5251
public final class CookedRuntimeTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/DotInNameTest.java ‎test/jdk/tools/jpackage/share/DotInNameTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import jdk.jpackage.test.JPackageCommand;
2726
import jdk.jpackage.test.HelloApp;
@@ -37,7 +36,7 @@
3736
* @build jdk.jpackage.test.*
3837
* @compile DotInNameTest.java
3938
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
40-
* --jpt-run=jdk.jpackage.tests.DotInNameTest
39+
* --jpt-run=DotInNameTest
4140
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
4241
*/
4342

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/ErrorTest.java ‎test/jdk/tools/jpackage/share/ErrorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.util.Collection;
2726
import java.util.List;
@@ -37,7 +36,7 @@
3736
* @build jdk.jpackage.test.*
3837
* @compile ErrorTest.java
3938
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
40-
* --jpt-run=jdk.jpackage.tests.ErrorTest
39+
* --jpt-run=ErrorTest
4140
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
4241
*/
4342

@@ -48,7 +47,7 @@
4847
* @build jdk.jpackage.test.*
4948
* @compile ErrorTest.java
5049
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
51-
* --jpt-run=jdk.jpackage.tests.ErrorTest
50+
* --jpt-run=ErrorTest
5251
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
5352
*/
5453

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/JLinkOptionsTest.java ‎test/jdk/tools/jpackage/share/JLinkOptionsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.util.Collection;
2726
import java.util.List;
@@ -37,7 +36,7 @@
3736
* @build jdk.jpackage.test.*
3837
* @compile JLinkOptionsTest.java
3938
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
40-
* --jpt-run=jdk.jpackage.tests.JLinkOptionsTest
39+
* --jpt-run=JLinkOptionsTest
4140
*/
4241

4342
public final class JLinkOptionsTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsEqualsTest.java ‎test/jdk/tools/jpackage/share/JavaOptionsEqualsTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.util.Collection;
2726
import java.util.List;
@@ -39,7 +38,7 @@
3938
* @build jdk.jpackage.test.*
4039
* @compile JavaOptionsEqualsTest.java
4140
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
42-
* --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest
41+
* --jpt-run=JavaOptionsEqualsTest
4342
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
4443
*/
4544

@@ -50,7 +49,7 @@
5049
* @build jdk.jpackage.test.*
5150
* @compile JavaOptionsEqualsTest.java
5251
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
53-
* --jpt-run=jdk.jpackage.tests.JavaOptionsEqualsTest
52+
* --jpt-run=JavaOptionsEqualsTest
5453
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
5554
*/
5655

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/JavaOptionsTest.java ‎test/jdk/tools/jpackage/share/JavaOptionsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.util.Collection;
2726
import java.util.List;
@@ -39,7 +38,7 @@
3938
* @build jdk.jpackage.test.*
4039
* @compile JavaOptionsTest.java
4140
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
42-
* --jpt-run=jdk.jpackage.tests.JavaOptionsTest
41+
* --jpt-run=JavaOptionsTest
4342
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
4443
*/
4544

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/MainClassTest.java ‎test/jdk/tools/jpackage/share/MainClassTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Files;
@@ -46,7 +45,7 @@
4645
import jdk.jpackage.test.Annotations.Test;
4746
import jdk.jpackage.test.CfgFile;
4847
import jdk.jpackage.test.Functional.ThrowingConsumer;
49-
import static jdk.jpackage.tests.MainClassTest.Script.MainClassType.*;
48+
5049

5150

5251
/*
@@ -56,7 +55,7 @@
5655
* @build jdk.jpackage.test.*
5756
* @compile MainClassTest.java
5857
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
59-
* --jpt-run=jdk.jpackage.tests.MainClassTest
58+
* --jpt-run=MainClassTest
6059
*/
6160

6261
public final class MainClassTest {
@@ -82,7 +81,7 @@ Script withMainClass(MainClassType v) {
8281
}
8382

8483
Script withJarMainClass(MainClassType v) {
85-
appDesc.setWithMainClass(v != NotSet);
84+
appDesc.setWithMainClass(v != MainClassType.NotSet);
8685
jarMainClass = v;
8786
return this;
8887
}
@@ -172,7 +171,8 @@ public MainClassTest(Script script) {
172171

173172
@Parameters
174173
public static Collection scripts() {
175-
final var withMainClass = Set.of(SetWrong, SetRight);
174+
final var withMainClass = Set.of(Script.MainClassType.SetWrong,
175+
Script.MainClassType.SetRight);
176176

177177
List<Script[]> scripts = new ArrayList<>();
178178
for (var withJLink : List.of(true, false)) {
@@ -205,7 +205,7 @@ public static Collection scripts() {
205205

206206
@Test
207207
public void test() throws IOException {
208-
if (script.jarMainClass == SetWrong) {
208+
if (script.jarMainClass == Script.MainClassType.SetWrong) {
209209
initJarWithWrongMainClass();
210210
}
211211

@@ -224,11 +224,11 @@ public void test() throws IOException {
224224
boolean appShouldSucceed = false;
225225

226226
// Should succeed if valid main class is set on the command line.
227-
appShouldSucceed |= (script.mainClass == SetRight);
227+
appShouldSucceed |= (script.mainClass == Script.MainClassType.SetRight);
228228

229229
// Should succeed if main class is not set on the command line but set
230230
// to valid value in the jar.
231-
appShouldSucceed |= (script.mainClass == NotSet && script.jarMainClass == SetRight);
231+
appShouldSucceed |= (script.mainClass == Script.MainClassType.NotSet && script.jarMainClass == Script.MainClassType.SetRight);
232232

233233
if (appShouldSucceed) {
234234
cmd.executeAndAssertHelloAppImageCreated();

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest.java ‎test/jdk/tools/jpackage/share/ModulePathTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.File;
2726
import java.io.IOException;
@@ -48,7 +47,7 @@
4847
* @build jdk.jpackage.test.*
4948
* @compile ModulePathTest.java
5049
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
51-
* --jpt-run=jdk.jpackage.tests.ModulePathTest
50+
* --jpt-run=ModulePathTest
5251
*/
5352

5453
public final class ModulePathTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest2.java ‎test/jdk/tools/jpackage/share/ModulePathTest2.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Path;
@@ -40,7 +39,7 @@
4039
* @build jdk.jpackage.test.*
4140
* @compile ModulePathTest2.java
4241
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
43-
* --jpt-run=jdk.jpackage.tests.ModulePathTest2
42+
* --jpt-run=ModulePathTest2
4443
*/
4544

4645
public final class ModulePathTest2 {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/ModulePathTest3.java ‎test/jdk/tools/jpackage/share/ModulePathTest3.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Files;
@@ -53,7 +52,7 @@
5352
* @build jdk.jpackage.test.*
5453
* @compile ModulePathTest3.java
5554
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
56-
* --jpt-run=jdk.jpackage.tests.ModulePathTest3
55+
* --jpt-run=ModulePathTest3
5756
*/
5857

5958
public final class ModulePathTest3 {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/MultipleJarAppTest.java ‎test/jdk/tools/jpackage/share/MultipleJarAppTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.nio.file.Path;
2726
import jdk.jpackage.test.Annotations.Test;
@@ -37,7 +36,7 @@
3736
* @build jdk.jpackage.test.*
3837
* @compile MultipleJarAppTest.java
3938
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
40-
* --jpt-run=jdk.jpackage.tests.MultipleJarAppTest
39+
* --jpt-run=MultipleJarAppTest
4140
*/
4241

4342
public final class MultipleJarAppTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/NoMPathRuntimeTest.java ‎test/jdk/tools/jpackage/share/NoMPathRuntimeTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Files;
@@ -47,7 +46,7 @@
4746
* @build jdk.jpackage.test.*
4847
* @compile NoMPathRuntimeTest.java
4948
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
50-
* --jpt-run=jdk.jpackage.tests.NoMPathRuntimeTest
49+
* --jpt-run=NoMPathRuntimeTest
5150
*/
5251

5352
public final class NoMPathRuntimeTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/NonExistentTest.java ‎test/jdk/tools/jpackage/share/NonExistentTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.util.Collection;
2726
import java.util.List;
@@ -37,7 +36,7 @@
3736
* @build jdk.jpackage.test.*
3837
* @compile NonExistentTest.java
3938
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
40-
* --jpt-run=jdk.jpackage.tests.NonExistentTest
39+
* --jpt-run=NonExistentTest
4140
*/
4241

4342
public final class NonExistentTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/PredefinedAppImageErrorTest.java ‎test/jdk/tools/jpackage/share/PredefinedAppImageErrorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.io.IOException;
2726
import java.nio.file.Path;
@@ -42,11 +41,11 @@
4241
* @compile PredefinedAppImageErrorTest.java
4342
*
4443
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
45-
* --jpt-run=jdk.jpackage.tests.PredefinedAppImageErrorTest
44+
* --jpt-run=PredefinedAppImageErrorTest
4645
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useExecutableByDefault
4746
*
4847
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
49-
* --jpt-run=jdk.jpackage.tests.PredefinedAppImageErrorTest
48+
* --jpt-run=PredefinedAppImageErrorTest
5049
* --jpt-before-run=jdk.jpackage.test.JPackageCommand.useToolProviderByDefault
5150
*/
5251

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/UnicodeArgsTest.java ‎test/jdk/tools/jpackage/share/UnicodeArgsTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import java.util.stream.Collectors;
2726
import jdk.jpackage.test.TKit;
@@ -38,7 +37,7 @@
3837
* @compile UnicodeArgsTest.java
3938
* @requires (os.family == "windows")
4039
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
41-
* --jpt-run=jdk.jpackage.tests.UnicodeArgsTest
40+
* --jpt-run=UnicodeArgsTest
4241
*/
4342

4443
public final class UnicodeArgsTest {

‎test/jdk/tools/jpackage/share/jdk/jpackage/tests/VendorTest.java ‎test/jdk/tools/jpackage/share/VendorTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
* questions.
2222
*/
2323

24-
package jdk.jpackage.tests;
2524

2625
import jdk.jpackage.test.PackageTest;
2726
import jdk.jpackage.test.PackageType;
@@ -61,7 +60,7 @@
6160
* @build jdk.jpackage.test.*
6261
* @compile VendorTest.java
6362
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
64-
* --jpt-run=jdk.jpackage.tests.VendorTest
63+
* --jpt-run=VendorTest
6564
*/
6665

6766
/*
@@ -74,7 +73,7 @@
7473
* @build jdk.jpackage.test.*
7574
* @compile VendorTest.java
7675
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
77-
* --jpt-run=jdk.jpackage.tests.VendorTest
76+
* --jpt-run=VendorTest
7877
*/
7978
public class VendorTest {
8079

‎test/jdk/tools/jpackage/windows/WinL10nTest.java

+3-7
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*/
2323

2424
import java.io.IOException;
25-
import java.nio.file.Files;
2625
import java.nio.file.Path;
2726
import jdk.jpackage.test.TKit;
2827
import jdk.jpackage.test.PackageTest;
@@ -37,8 +36,6 @@
3736
import java.util.stream.Stream;
3837
import jdk.jpackage.test.Executor;
3938

40-
import static jdk.jpackage.test.WindowsHelper.getTempDirectory;
41-
4239
/*
4340
* @test
4441
* @summary Custom l10n of msi installers in jpackage
@@ -182,9 +179,8 @@ public void test() throws IOException {
182179
}
183180

184181
// Preserve config dir to check the set of copied l10n files.
185-
Path tempDir = getTempDirectory(cmd, tempRoot);
186-
Files.createDirectories(tempDir.getParent());
187-
cmd.addArguments("--temp", tempDir.toString());
182+
Path tempDir = tempRoot.resolve(cmd.packageType().name());
183+
cmd.addArguments("--temp", tempDir);
188184
})
189185
.addBundleVerifier((cmd, result) -> {
190186
if (expectedCultures != null) {
@@ -213,7 +209,7 @@ public void test() throws IOException {
213209
v.createCmdOutputVerifier(wixSrcDir).apply(getBuildCommandLine(result));
214210
}
215211
}
216-
Path tempDir = getTempDirectory(cmd, tempRoot).toAbsolutePath();
212+
var tempDir = Path.of(cmd.getArgumentValue("--temp")).toAbsolutePath();
217213
for (var v : createDefaultL10nFilesLocVerifiers(tempDir)) {
218214
v.apply(getBuildCommandLine(result));
219215
}

0 commit comments

Comments
 (0)
Please sign in to comment.