From 6f1815fdf7312360ad3b5cfd9c86ce8f89c13286 Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Fri, 4 Nov 2022 15:40:41 -0700
Subject: [PATCH] test: cleanup user-data-dir after tests in
 TestDefaultBrowserContext2

---
 .../TestDefaultBrowserContext2.java           | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
index 193c80f5d..b1fd8e8ff 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
+import org.junit.jupiter.api.io.TempDir;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -22,6 +23,7 @@ public class TestDefaultBrowserContext2 extends TestBase {
 
 
   private BrowserContext persistentContext;
+  @TempDir Path tempDir;
 
   @AfterEach
   private void closePersistentContext() {
@@ -36,12 +38,7 @@ private Page launchPersistent() {
   }
 
   private Page launchPersistent(BrowserType.LaunchPersistentContextOptions options) {
-    Path userDataDir = null;
-    try {
-      userDataDir = Files.createTempDirectory("user-data-dir-");
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+    Path userDataDir = tempDir.resolve("user-data-dir");
     assertNull(persistentContext);
     persistentContext = browserType.launchPersistentContext(userDataDir, options);
     return persistentContext.pages().get(0);
@@ -118,7 +115,7 @@ void shouldSupportExtraHTTPHeadersOption() throws ExecutionException, Interrupte
   @Test
   void shouldAcceptUserDataDir() throws IOException {
 // TODO:   test.flaky(browserName === "chromium");
-    Path userDataDir = Files.createTempDirectory("user-data-dir-");
+    Path userDataDir = tempDir.resolve("user-data-dir");
     BrowserContext context = browserType.launchPersistentContext(userDataDir);
     assertTrue(userDataDir.toFile().listFiles().length > 0);
     context.close();
@@ -128,7 +125,7 @@ void shouldAcceptUserDataDir() throws IOException {
   @Test
   void shouldRestoreStateFromUserDataDir() throws IOException {
 //  TODO:  test.slow();
-    Path userDataDir = Files.createTempDirectory("user-data-dir-");
+    Path userDataDir = tempDir.resolve("user-data-dir");
     BrowserType.LaunchPersistentContextOptions browserOptions = null;
     BrowserContext browserContext = browserType.launchPersistentContext(userDataDir, browserOptions);
     Page page = browserContext.newPage();
@@ -142,7 +139,7 @@ void shouldRestoreStateFromUserDataDir() throws IOException {
     assertEquals("hello", page2.evaluate("localStorage.hey"));
     browserContext2.close();
 
-    Path userDataDir2 = Files.createTempDirectory("user-data-dir-");
+    Path userDataDir2 = tempDir.resolve("user-data-dir-2");
     BrowserContext browserContext3 = browserType.launchPersistentContext(userDataDir2, browserOptions);
     Page page3 = browserContext3.newPage();
     page3.navigate(server.EMPTY_PAGE);
@@ -153,7 +150,7 @@ void shouldRestoreStateFromUserDataDir() throws IOException {
   @Test
   void shouldRestoreCookiesFromUserDataDir() throws IOException {
 // TODO:   test.flaky(browserName === "chromium");
-    Path userDataDir = Files.createTempDirectory("user-data-dir-");
+    Path userDataDir = tempDir.resolve("user-data-dir");
     BrowserType.LaunchPersistentContextOptions browserOptions = null;
     BrowserContext browserContext = browserType.launchPersistentContext(userDataDir, browserOptions);
     Page page = browserContext.newPage();
@@ -171,7 +168,7 @@ void shouldRestoreCookiesFromUserDataDir() throws IOException {
     assertEquals("doSomethingOnlyOnce=true", page2.evaluate("() => document.cookie"));
     browserContext2.close();
 
-    Path userDataDir2 = Files.createTempDirectory("user-data-dir-");
+    Path userDataDir2 = tempDir.resolve("user-data-dir-2");
     BrowserContext browserContext3 = browserType.launchPersistentContext(userDataDir2, browserOptions);
     Page page3 = browserContext3.newPage();
     page3.navigate(server.EMPTY_PAGE);
@@ -191,7 +188,7 @@ void shouldHaveDefaultURLWhenLaunchingBrowser() {
   void shouldThrowIfPageArgumentIsPassed() throws IOException {
     BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
       .setArgs(asList(server.EMPTY_PAGE));
-    Path userDataDir = Files.createTempDirectory("user-data-dir-");
+    Path userDataDir = tempDir.resolve("user-data-dir");
     PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
       browserType.launchPersistentContext(userDataDir, options);
     });