Skip to content

Commit 071ca8b

Browse files
authored
test: cleanup user-data-dir after tests in TestDefaultBrowserContext2 (#1112)
1 parent 805fa3a commit 071ca8b

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import org.junit.jupiter.api.AfterEach;
55
import org.junit.jupiter.api.Test;
66
import org.junit.jupiter.api.condition.DisabledIf;
7+
import org.junit.jupiter.api.io.TempDir;
78

89
import java.io.IOException;
910
import java.nio.file.Files;
@@ -22,6 +23,7 @@ public class TestDefaultBrowserContext2 extends TestBase {
2223

2324

2425
private BrowserContext persistentContext;
26+
@TempDir Path tempDir;
2527

2628
@AfterEach
2729
private void closePersistentContext() {
@@ -36,12 +38,7 @@ private Page launchPersistent() {
3638
}
3739

3840
private Page launchPersistent(BrowserType.LaunchPersistentContextOptions options) {
39-
Path userDataDir = null;
40-
try {
41-
userDataDir = Files.createTempDirectory("user-data-dir-");
42-
} catch (IOException e) {
43-
throw new RuntimeException(e);
44-
}
41+
Path userDataDir = tempDir.resolve("user-data-dir");
4542
assertNull(persistentContext);
4643
persistentContext = browserType.launchPersistentContext(userDataDir, options);
4744
return persistentContext.pages().get(0);
@@ -118,7 +115,7 @@ void shouldSupportExtraHTTPHeadersOption() throws ExecutionException, Interrupte
118115
@Test
119116
void shouldAcceptUserDataDir() throws IOException {
120117
// TODO: test.flaky(browserName === "chromium");
121-
Path userDataDir = Files.createTempDirectory("user-data-dir-");
118+
Path userDataDir = tempDir.resolve("user-data-dir");
122119
BrowserContext context = browserType.launchPersistentContext(userDataDir);
123120
assertTrue(userDataDir.toFile().listFiles().length > 0);
124121
context.close();
@@ -128,7 +125,7 @@ void shouldAcceptUserDataDir() throws IOException {
128125
@Test
129126
void shouldRestoreStateFromUserDataDir() throws IOException {
130127
// TODO: test.slow();
131-
Path userDataDir = Files.createTempDirectory("user-data-dir-");
128+
Path userDataDir = tempDir.resolve("user-data-dir");
132129
BrowserType.LaunchPersistentContextOptions browserOptions = null;
133130
BrowserContext browserContext = browserType.launchPersistentContext(userDataDir, browserOptions);
134131
Page page = browserContext.newPage();
@@ -142,7 +139,7 @@ void shouldRestoreStateFromUserDataDir() throws IOException {
142139
assertEquals("hello", page2.evaluate("localStorage.hey"));
143140
browserContext2.close();
144141

145-
Path userDataDir2 = Files.createTempDirectory("user-data-dir-");
142+
Path userDataDir2 = tempDir.resolve("user-data-dir-2");
146143
BrowserContext browserContext3 = browserType.launchPersistentContext(userDataDir2, browserOptions);
147144
Page page3 = browserContext3.newPage();
148145
page3.navigate(server.EMPTY_PAGE);
@@ -153,7 +150,7 @@ void shouldRestoreStateFromUserDataDir() throws IOException {
153150
@Test
154151
void shouldRestoreCookiesFromUserDataDir() throws IOException {
155152
// TODO: test.flaky(browserName === "chromium");
156-
Path userDataDir = Files.createTempDirectory("user-data-dir-");
153+
Path userDataDir = tempDir.resolve("user-data-dir");
157154
BrowserType.LaunchPersistentContextOptions browserOptions = null;
158155
BrowserContext browserContext = browserType.launchPersistentContext(userDataDir, browserOptions);
159156
Page page = browserContext.newPage();
@@ -171,7 +168,7 @@ void shouldRestoreCookiesFromUserDataDir() throws IOException {
171168
assertEquals("doSomethingOnlyOnce=true", page2.evaluate("() => document.cookie"));
172169
browserContext2.close();
173170

174-
Path userDataDir2 = Files.createTempDirectory("user-data-dir-");
171+
Path userDataDir2 = tempDir.resolve("user-data-dir-2");
175172
BrowserContext browserContext3 = browserType.launchPersistentContext(userDataDir2, browserOptions);
176173
Page page3 = browserContext3.newPage();
177174
page3.navigate(server.EMPTY_PAGE);
@@ -191,7 +188,7 @@ void shouldHaveDefaultURLWhenLaunchingBrowser() {
191188
void shouldThrowIfPageArgumentIsPassed() throws IOException {
192189
BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
193190
.setArgs(asList(server.EMPTY_PAGE));
194-
Path userDataDir = Files.createTempDirectory("user-data-dir-");
191+
Path userDataDir = tempDir.resolve("user-data-dir");
195192
PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
196193
browserType.launchPersistentContext(userDataDir, options);
197194
});

0 commit comments

Comments
 (0)