From bc7a59d85200ad977379f62acdc1aa634a19874e Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Fri, 10 Sep 2021 08:08:37 -0700
Subject: [PATCH] chore: more code reuse, enable 2 tests (#599)

---
 .../microsoft/playwright/impl/PageImpl.java   | 19 +++----------------
 .../playwright/TestBrowserContextBasic.java   |  6 ++----
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
index ee8c67d8..987ba1b8 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java
@@ -1318,11 +1318,7 @@ public class PageImpl extends ChannelOwner implements Page {
     if (options == null) {
       options = new WaitForRequestOptions();
     }
-    List<Waitable<Request>> waitables = new ArrayList<>();
-    waitables.add(new WaitableEvent<>(listeners, EventType.REQUEST, predicate));
-    waitables.add(createWaitForCloseHelper());
-    waitables.add(createWaitableTimeout(options.timeout));
-    return runUntil(code, new WaitableRace<>(waitables));
+    return waitForEventWithTimeout(EventType.REQUEST, code, predicate, options.timeout);
   }
 
   @Override
@@ -1334,12 +1330,7 @@ public class PageImpl extends ChannelOwner implements Page {
     if (options == null) {
       options = new WaitForRequestFinishedOptions();
     }
-    List<Waitable<Request>> waitables = new ArrayList<>();
-    Predicate<Request> predicate = options.predicate;
-    waitables.add(new WaitableEvent<>(listeners, EventType.REQUESTFINISHED, predicate));
-    waitables.add(createWaitForCloseHelper());
-    waitables.add(createWaitableTimeout(options.timeout));
-    return runUntil(code, new WaitableRace<>(waitables));
+    return waitForEventWithTimeout(EventType.REQUESTFINISHED, code, options.predicate, options.timeout);
   }
 
   @Override
@@ -1365,11 +1356,7 @@ public class PageImpl extends ChannelOwner implements Page {
     if (options == null) {
       options = new WaitForResponseOptions();
     }
-    List<Waitable<Response>> waitables = new ArrayList<>();
-    waitables.add(new WaitableEvent<>(listeners, EventType.RESPONSE, predicate));
-    waitables.add(createWaitForCloseHelper());
-    waitables.add(createWaitableTimeout(options.timeout));
-    return runUntil(code, new WaitableRace<>(waitables));
+    return waitForEventWithTimeout(EventType.RESPONSE, code, predicate, options.timeout);
   }
 
   @Override
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
index 016e9d6d..f212b527 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
@@ -115,10 +115,9 @@ public class TestBrowserContextBasic extends TestBase {
 
 
   @Test
-  @Disabled("TODO: supported null viewport option")
   void shouldNotAllowDeviceScaleFactorWithNullViewport() {
     try {
-      browser.newContext(new Browser.NewContextOptions().setDeviceScaleFactor(1.0));
+      browser.newContext(new Browser.NewContextOptions().setDeviceScaleFactor(1.0).setViewportSize(null));
       fail("did not throw");
     } catch (PlaywrightException e) {
       assertTrue(e.getMessage().contains("\"deviceScaleFactor\" option is not supported with null \"viewport\""));
@@ -126,10 +125,9 @@ public class TestBrowserContextBasic extends TestBase {
   }
 
   @Test
-  @Disabled("TODO: supported null viewport option")
   void shouldNotAllowIsMobileWithNullViewport() {
     try {
-      browser.newContext(new Browser.NewContextOptions().setIsMobile(true));
+      browser.newContext(new Browser.NewContextOptions().setIsMobile(true).setViewportSize(null));
       fail("did not throw");
     } catch (PlaywrightException e) {
       assertTrue(e.getMessage().contains("\"isMobile\" option is not supported with null \"viewport\""));