chore: more code reuse, enable 2 tests (#599)

Author: yury-s

playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java

@@ -1318,11 +1318,7 @@ private Request waitForRequestImpl(Predicate<Request> predicate, WaitForRequestO
     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 @@ private Request waitForRequestFinishedImpl(WaitForRequestFinishedOptions options
     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 @@ private Response waitForResponseImpl(Predicate<Response> predicate, WaitForRespo
     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

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

@@ -115,21 +115,19 @@ void shouldRespectDeviceScaleFactor() {
 
 
   @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\""));
     }
   }
 
   @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\""));