cherry-pick(#978,#984): recent test fixes (#985)

Author: yury-s

.github/workflows/test.yml

@@ -31,18 +31,14 @@ jobs:
     - name: Build & Install
       run: mvn -B install -D skipTests --no-transfer-progress
     - name: Run tests
-      run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end
+      run: mvn test --no-transfer-progress --fail-at-end
       env:
         BROWSER: ${{ matrix.browser }}
     - name: Run tracing tests w/ sources
-      run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end -D test=*TestTracing*
+      run: mvn test --no-transfer-progress --fail-at-end -D test=*TestTracing*
       env:
         BROWSER: ${{ matrix.browser }}
         PLAYWRIGHT_JAVA_SRC: src/test/java
-    - name: Run driver throw tests
-      run: mvn test -Dgroups=driverThrowTest --no-transfer-progress --fail-at-end
-      env:
-        BROWSER: ${{ matrix.browser }}
     - name: Test Spring Boot Starter
       shell: bash
       env:
@@ -83,12 +79,7 @@ jobs:
       - name: Build & Install
         run: mvn -B install -D skipTests --no-transfer-progress
       - name: Run tests
-        run: mvn test -DexcludedGroups=isolated --no-transfer-progress --fail-at-end
-        env:
-          BROWSER: chromium
-          BROWSER_CHANNEL: ${{ matrix.browser-channel }}
-      - name: Run driver throw tests
-        run: mvn test -Dgroups=driverThrowTest --no-transfer-progress --fail-at-end
+        run: mvn test --no-transfer-progress --fail-at-end
         env:
           BROWSER: chromium
           BROWSER_CHANNEL: ${{ matrix.browser-channel }}

driver-bundle/src/test/java/com/microsoft/playwright/TestInstall.java

@@ -18,22 +18,41 @@
 
 import com.microsoft.playwright.impl.Driver;
 import com.microsoft.playwright.impl.DriverJar;
-import org.junit.jupiter.api.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.MalformedURLException;
+import java.net.ServerSocket;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class TestInstall {
+  private static boolean isPortAvailable(int port) {
+    try (ServerSocket ignored = new ServerSocket(port)) {
+      return true;
+    } catch (IOException ignored) {
+      return false;
+    }
+  }
+
+  private static int unusedPort() {
+    for (int i = 10000; i < 11000; i++) {
+      if (isPortAvailable(i)) {
+        return i;
+      }
+    }
+    throw new RuntimeException("Cannot find unused local port");
+  }
+
   @BeforeEach
   void clearSystemProperties() {
     // Clear system property to ensure that the driver is loaded from jar.
@@ -44,16 +63,29 @@ void clearSystemProperties() {
   }
 
   @Test
-  @Tags({@Tag("isolated"), @Tag("driverThrowTest")})
-  void shouldThrowWhenBrowserPathIsInvalid(@TempDir Path tmpDir) {
+  void shouldThrowWhenBrowserPathIsInvalid(@TempDir Path tmpDir) throws MalformedURLException, ClassNotFoundException, NoSuchMethodException, NoSuchFieldException, IllegalAccessException {
     Map<String,String> env = new HashMap<>();
-    env.put("PLAYWRIGHT_DOWNLOAD_HOST", "https://127.0.0.127");
+
+    // On macOS we can only use 127.0.0.1, so pick unused port instead.
+    // https://superuser.com/questions/458875/how-do-you-get-loopback-addresses-other-than-127-0-0-1-to-work-on-os-x
+    env.put("PLAYWRIGHT_DOWNLOAD_HOST", "https://127.0.0.1:" + unusedPort());
     // Make sure the browsers are not installed yet by pointing at an empty dir.
     env.put("PLAYWRIGHT_BROWSERS_PATH", tmpDir.toString());
     env.put("PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD", "false");
 
-    assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
-    assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+    // Reset instance field value to null for the test.
+    Field field = Driver.class.getDeclaredField("instance");
+    field.setAccessible(true);
+    Object value = field.get(Driver.class);
+    field.set(Driver.class, null);
+
+    for (int i = 0; i < 2; i++){
+      RuntimeException exception = assertThrows(RuntimeException.class, () -> Driver.ensureDriverInstalled(env, true));
+      String message = exception.getMessage();
+      assertTrue(message.contains("Failed to create driver"), message);
+    }
+
+    field.set(Driver.class, value);
   }
 
   @Test