diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java
index 06d51a03..057202c7 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextAddCookies.java
@@ -248,27 +248,19 @@ public class TestBrowserContextAddCookies extends TestBase {
@Test
void shouldNotSetACookieWithBlankPageURL() {
- try {
- context.addCookies(asList(
- new Cookie("example-cookie", "best").setUrl(server.EMPTY_PAGE),
- new Cookie("example-cookie-blank", "best").setUrl("about:blank")
- ));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Blank page can not have cookie \"example-cookie-blank\""));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.addCookies(asList(
+ new Cookie("example-cookie", "best").setUrl(server.EMPTY_PAGE),
+ new Cookie("example-cookie-blank", "best").setUrl("about:blank")
+ )));
+ assertTrue(e.getMessage().contains("Blank page can not have cookie \"example-cookie-blank\""));
}
@Test
void shouldNotSetACookieOnADataURLPage() {
- try {
- context.addCookies(asList(
- new Cookie("example-cookie", "best").setUrl("data:,Hello%2C%20World!")
- ));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Data URL page can not have cookie \"example-cookie\""));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.addCookies(asList(
+ new Cookie("example-cookie", "best").setUrl("data:,Hello%2C%20World!")
+ )));
+ assertTrue(e.getMessage().contains("Data URL page can not have cookie \"example-cookie\""));
}
@Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
index f212b527..9e8bf496 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextBasic.java
@@ -116,22 +116,18 @@ public class TestBrowserContextBasic extends TestBase {
@Test
void shouldNotAllowDeviceScaleFactorWithNullViewport() {
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
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\""));
- }
+ });
+ assertTrue(e.getMessage().contains("\"deviceScaleFactor\" option is not supported with null \"viewport\""));
}
@Test
void shouldNotAllowIsMobileWithNullViewport() {
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
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\""));
- }
+ });
+ assertTrue(e.getMessage().contains("\"isMobile\" option is not supported with null \"viewport\""));
}
@Test
@@ -143,12 +139,10 @@ public class TestBrowserContextBasic extends TestBase {
@Test
void closeShouldAbortFutureEvent() {
BrowserContext context = browser.newContext();
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
context.waitForPage(() -> context.close());
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Context closed"));
- }
+ });
+ assertTrue(e.getMessage().contains("Context closed"));
}
@Test
@@ -211,15 +205,11 @@ public class TestBrowserContextBasic extends TestBase {
BrowserContext context = browser.newContext(new Browser.NewContextOptions().setJavaScriptEnabled(false));
Page page = context.newPage();
page.navigate("data:text/html, ");
- try {
- page.evaluate("something");
- fail("did not throw");
- } catch (PlaywrightException e) {
- if (isWebKit())
- assertTrue(e.getMessage().contains("Can\'t find variable: something"));
- else
- assertTrue(e.getMessage().contains("something is not defined"));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.evaluate("something"));
+ if (isWebKit())
+ assertTrue(e.getMessage().contains("Can\'t find variable: something"));
+ else
+ assertTrue(e.getMessage().contains("something is not defined"));
context.close();
}
@@ -244,11 +234,7 @@ public class TestBrowserContextBasic extends TestBase {
void shouldWorkWithOfflineOption() {
BrowserContext context = browser.newContext(new Browser.NewContextOptions().setOffline(true));
Page page = context.newPage();
- try {
- page.navigate(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
+ assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
context.setOffline(false);
Response response = page.navigate(server.EMPTY_PAGE);
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
index 33334e6c..3d522bc0 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextExposeFunction.java
@@ -58,28 +58,16 @@ public class TestBrowserContextExposeFunction extends TestBase {
void shouldThrowForDuplicateRegistrations() {
context.exposeFunction("foo", args -> null);
context.exposeFunction("bar", args -> null);
- try {
- context.exposeFunction("foo", args -> null);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Function \"foo\" has been already registered"));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.exposeFunction("foo", args -> null));
+ assertTrue(e.getMessage().contains("Function \"foo\" has been already registered"));
Page page = context.newPage();
- try {
- page.exposeFunction("foo", args -> null);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Function \"foo\" has been already registered in the browser context"));
- }
+ e = assertThrows(PlaywrightException.class, () -> page.exposeFunction("foo", args -> null));
+ assertTrue(e.getMessage().contains("Function \"foo\" has been already registered in the browser context"));
page.exposeFunction("baz", args -> null);
- try {
- context.exposeFunction("baz", args -> null);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Function \"baz\" has been already registered in one of the pages"));
- }
+ e = assertThrows(PlaywrightException.class, () -> context.exposeFunction("baz", args -> null));
+ assertTrue(e.getMessage().contains("Function \"baz\" has been already registered in one of the pages"));
}
@Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
index fe883389..5eac139a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextFetch.java
@@ -51,24 +51,16 @@ public class TestBrowserContextFetch extends TestBase {
@Test
void shouldThrowOnNetworkError() {
server.setRoute("/test", exchange -> exchange.getResponseBody().close());
- try {
- context.request().get(server.PREFIX + "/test");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/test"));
+ assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
}
@Test
void shouldThrowOnNetworkErrorAfterRedirect() {
server.setRedirect("/redirect", "/test");
server.setRoute("/test", exchange -> exchange.getResponseBody().close());
- try {
- context.request().get(server.PREFIX + "/redirect");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/redirect"));
+ assertTrue(e.getMessage().contains("socket hang up"), e.getMessage());
}
@Test
@@ -80,12 +72,8 @@ public class TestBrowserContextFetch extends TestBase {
writer.write("
A");
}
});
- try {
- context.request().get(server.PREFIX + "/test");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("aborted"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/test"));
+ assertTrue(e.getMessage().contains("aborted"), e.getMessage());
}
@Test
@@ -98,12 +86,8 @@ public class TestBrowserContextFetch extends TestBase {
writer.write("A");
}
});
- try {
- context.request().get(server.PREFIX + "/redirect");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("aborted"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/redirect"));
+ assertTrue(e.getMessage().contains("aborted"), e.getMessage());
}
@Test
@@ -134,12 +118,10 @@ public class TestBrowserContextFetch extends TestBase {
@Test
void getShouldSupportFailOnStatusCode() {
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
context.request().get(server.PREFIX + "/does-not-exist.html", RequestOptions.create().setFailOnStatusCode(true));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("404 Not Found"), e.getMessage());
- }
+ });
+ assertTrue(e.getMessage().contains("404 Not Found"), e.getMessage());
}
@Test
@@ -385,29 +367,20 @@ public class TestBrowserContextFetch extends TestBase {
@Test
void shouldThrowOnInvalidHeaderValue() {
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
context.request().get(server.EMPTY_PAGE, RequestOptions.create()
.setHeader("foo", "недопустимое значение"));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Invalid character in header content"), e.getMessage());
- }
+ });
+ assertTrue(e.getMessage().contains("Invalid character in header content"), e.getMessage());
}
@Test
void shouldThrowOnNonHttpSProtocol() {
- try {
- context.request().get("data:text/plain,test");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Protocol \"data:\" not supported"), e.getMessage());
- }
- try {
- context.request().get("file:///tmp/foo");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Protocol \"file:\" not supported"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get("data:text/plain,test"));
+ assertTrue(e.getMessage().contains("Protocol \"data:\" not supported"), e.getMessage());
+
+ e = assertThrows(PlaywrightException.class, () -> context.request().get("file:///tmp/foo"));
+ assertTrue(e.getMessage().contains("Protocol \"file:\" not supported"), e.getMessage());
}
@Test
@@ -417,12 +390,10 @@ public class TestBrowserContextFetch extends TestBase {
exchange.sendResponseHeaders(200, 4096);
});
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
context.request().get(server.PREFIX + "/slow", RequestOptions.create().setTimeout(100));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Request timed out after 100ms"), e.getMessage());
- }
+ });
+ assertTrue(e.getMessage().contains("Request timed out after 100ms"), e.getMessage());
}
@Test
@@ -453,12 +424,8 @@ public class TestBrowserContextFetch extends TestBase {
});
context.setDefaultTimeout(100);
- try {
- context.request().get(server.PREFIX + "/redirect");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Request timed out after 100ms"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.PREFIX + "/redirect"));
+ assertTrue(e.getMessage().contains("Request timed out after 100ms"), e.getMessage());
}
@Test
@@ -466,12 +433,8 @@ public class TestBrowserContextFetch extends TestBase {
APIResponse response = context.request().get(server.PREFIX + "/simple.json");
assertEquals("{\"foo\": \"bar\"}\n", response.text());
response.dispose();
- try {
- response.body();
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Response has been disposed"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> response.body());
+ assertTrue(e.getMessage().contains("Response has been disposed"), e.getMessage());
}
@Test
@@ -479,13 +442,9 @@ public class TestBrowserContextFetch extends TestBase {
APIResponse response = context.request().get(server.PREFIX + "/simple.json");
assertEquals("{\"foo\": \"bar\"}\n", response.text());
context.close();
- try {
- response.body();
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Response has been disposed") ||
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> response.body());
+ assertTrue(e.getMessage().contains("Response has been disposed") ||
e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
- }
}
@Test
void shouldOverrideRequestParameters() throws ExecutionException, InterruptedException {
@@ -615,16 +574,13 @@ public class TestBrowserContextFetch extends TestBase {
@Test
void shouldThrowWhenDataPassedForUnsupportedRequest() {
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
context.request().fetch(server.EMPTY_PAGE, RequestOptions.create()
.setMethod("GET").setData("bar"));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Method GET does not accept post data"), e.getMessage());
- }
+ });
+ assertTrue(e.getMessage().contains("Method GET does not accept post data"), e.getMessage());
}
-
@Test
void contextRequestShouldExportSameStorageStateAsContext() {
server.setRoute("/setcookie.html", exchange -> {
@@ -666,18 +622,10 @@ public class TestBrowserContextFetch extends TestBase {
return null;
});
page.evaluate("() => setTimeout(closeContext, 1000);");
- try {
- context.request().get(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Request context disposed"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> context.request().get(server.EMPTY_PAGE));
+ assertTrue(e.getMessage().contains("Request context disposed"), e.getMessage());
- try {
- context.request().post(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
- }
+ e = assertThrows(PlaywrightException.class, () -> context.request().post(server.EMPTY_PAGE));
+ assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
}
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
index 13212563..e5e15ab8 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextHar.java
@@ -79,11 +79,7 @@ public class TestBrowserContextHar extends TestBase {
Path path = Paths.get("src/test/resources/har-fulfill.har");
context.routeFromHAR(path);
Page page = context.newPage();
- try {
- page.navigate(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
+ assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
}
@Test
@@ -350,11 +346,7 @@ public class TestBrowserContextHar extends TestBase {
assertEquals("2", page2.evaluate(fetchFunction, "2"));
assertEquals("3", page2.evaluate(fetchFunction, "3"));
assertEquals("3", page2.evaluate(fetchFunction, "3"));
- try {
- page2.evaluate(fetchFunction, "4");
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
+ assertThrows(PlaywrightException.class, () -> page2.evaluate(fetchFunction, "4"));
}
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java
index 0252faba..ad9ac396 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextProxy.java
@@ -47,9 +47,9 @@ public class TestBrowserContextProxy extends TestBase {
@EnabledIf(value="isChromiumWindows", disabledReason="Platform-specific")
void shouldThrowForMissingGlobalProxyOnChromiumWindows() {
try (Browser browser = browserType.launch(createLaunchOptions())) {
- browser.newContext(new Browser.NewContextOptions().setProxy("localhost:" + server.PORT));
- fail("did not throw");
- } catch (PlaywrightException e) {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
+ browser.newContext(new Browser.NewContextOptions().setProxy("localhost:" + server.PORT));
+ });
assertTrue(e.getMessage().contains("Browser needs to be launched with the global proxy"));
}
}
@@ -179,23 +179,9 @@ public class TestBrowserContextProxy extends TestBase {
page.navigate("http://0.non.existent.domain.for.the.test/target.html");
assertEquals("Served by the proxy", page.title());
- try {
- page.navigate("http://1.non.existent.domain.for.the.test/target.html");
- fail("did not throw");
- } catch (PlaywrightException exception) {
- }
-
- try {
- page.navigate("http://2.non.existent.domain.for.the.test/target.html");
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
-
- try {
- page.navigate("http://foo.is.the.another.test/target.html");
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
+ assertThrows(PlaywrightException.class, () -> page.navigate("http://1.non.existent.domain.for.the.test/target.html"));
+ assertThrows(PlaywrightException.class, () -> page.navigate("http://2.non.existent.domain.for.the.test/target.html"));
+ assertThrows(PlaywrightException.class, () -> page.navigate("http://foo.is.the.another.test/target.html"));
page.navigate("http://3.non.existent.domain.for.the.test/target.html");
assertEquals("Served by the proxy", page.title());
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
index a1b11091..be4b2143 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextRoute.java
@@ -169,12 +169,8 @@ public class TestBrowserContextRoute extends TestBase {
throw new RuntimeException("My Exception");
});
- try {
- page.navigate(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (RuntimeException e) {
- assertTrue(e.getMessage().contains("My Exception"), e.getMessage());
- }
+ RuntimeException e = assertThrows(RuntimeException.class, () -> page.navigate(server.EMPTY_PAGE));
+ assertTrue(e.getMessage().contains("My Exception"), e.getMessage());
}
@Test
@@ -187,12 +183,8 @@ public class TestBrowserContextRoute extends TestBase {
// Fulfilling with dsiposed response will lead to a server-side exception.
route.fulfill(new Route.FulfillOptions().setResponse(response));
});
- try {
- page.navigate(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (RuntimeException e) {
- assertTrue(e.getMessage().contains("Fetch response has been disposed"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
+ assertTrue(e.getMessage().contains("Fetch response has been disposed"), e.getMessage());
}
@Test
@@ -201,12 +193,8 @@ public class TestBrowserContextRoute extends TestBase {
page.route("**/*", route -> {
route.resume(new Route.ResumeOptions().setUrl("file:///tmp"));
});
- try {
- page.navigate(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (RuntimeException e) {
- assertTrue(e.getMessage().contains("New URL must have same protocol as overridden URL"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
+ assertTrue(e.getMessage().contains("New URL must have same protocol as overridden URL"), e.getMessage());
}
@@ -260,12 +248,7 @@ public class TestBrowserContextRoute extends TestBase {
route.fallback();
});
- try {
- page.navigate(server.EMPTY_PAGE);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertNotNull(e);
- }
+ assertThrows(PlaywrightException.class, () -> page.navigate(server.EMPTY_PAGE));
assertFalse(failed[0]);
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java
index 814712c4..c107e242 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserContextStrict.java
@@ -38,12 +38,8 @@ public class TestBrowserContextStrict extends TestBase {
@Test
void shouldFailPageTextContentInStrictMode() {
page.setContent("span1target
");
- try {
- page.textContent("span");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("strict mode violation"));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.textContent("span"));
+ assertTrue(e.getMessage().contains("strict mode violation"));
}
@Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
index d54e5fb5..08522ffe 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeBasic.java
@@ -43,11 +43,7 @@ public class TestBrowserTypeBasic extends TestBase {
@Test
@DisabledIf(value="com.microsoft.playwright.TestBase#isChromium", disabledReason="Non-chromium behavior")
void shouldThrowWhenTryingToConnectWithNotChromium() {
- try {
- browserType.connectOverCDP("foo");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium."));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> browserType.connectOverCDP("foo"));
+ assertTrue(e.getMessage().contains("Connecting over CDP is only supported in Chromium."));
}
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
index fcf400e0..64fd564a 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestBrowserTypeConnect.java
@@ -192,12 +192,8 @@ public class TestBrowserTypeConnect extends TestBase {
remote.kill();
assertEquals(1, disconnected1[0]);
- try {
- // Tickle connection so that it gets a chance to dispatch disconnect event.
- page2.title();
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
+ // Tickle connection so that it gets a chance to dispatch disconnect event.
+ assertThrows(PlaywrightException.class, () -> page2.title());
assertEquals(1, disconnected2[0]);
}
@@ -262,12 +258,8 @@ public class TestBrowserTypeConnect extends TestBase {
}
}
assertFalse(browser.isConnected());
- try {
- page.waitForNavigation(() -> {});
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Page closed") || e.getMessage().contains("Browser has been closed"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.waitForNavigation(() -> {}));
+ assertTrue(e.getMessage().contains("Page closed") || e.getMessage().contains("Browser has been closed"), e.getMessage());
}
@Test
@@ -277,12 +269,10 @@ public class TestBrowserTypeConnect extends TestBase {
server.setRoute("/one-style.css", r -> {});
page.onRequest(r -> remote.close());
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
page.navigate(server.PREFIX + "/one-style.html", new Page.NavigateOptions().setTimeout(60000));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Browser has been closed"));
- }
+ });
+ assertTrue(e.getMessage().contains("Browser has been closed"));
}
@Test
@@ -408,12 +398,8 @@ public class TestBrowserTypeConnect extends TestBase {
Path savedAsPath = tempDir.resolve("my-video.webm");
page.video().saveAs(savedAsPath);
assertTrue(Files.exists(savedAsPath));
- try {
- page.video().path();
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Path is not available when using browserType.connect(). Use saveAs() to save a local copy."));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> page.video().path());
+ assertTrue(e.getMessage().contains("Path is not available when using browserType.connect(). Use saveAs() to save a local copy."));
}
@@ -435,12 +421,8 @@ public class TestBrowserTypeConnect extends TestBase {
download.saveAs(nestedPath);
assertTrue(Files.exists(nestedPath));
assertEquals("Hello world", new String(Files.readAllBytes(nestedPath), StandardCharsets.UTF_8));
- try {
- download.path();
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Path is not available when using browserType.connect(). Use download.saveAs() to save a local copy."));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> download.path());
+ assertTrue(e.getMessage().contains("Path is not available when using browserType.connect(). Use download.saveAs() to save a local copy."));
page.close();
}
@@ -459,12 +441,8 @@ public class TestBrowserTypeConnect extends TestBase {
Download download = page.waitForDownload(() -> page.click("a"));
Path userPath = tempDir.resolve("download.txt");
download.delete();
- try {
- download.saveAs(userPath);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Target page, context or browser has been closed"));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> download.saveAs(userPath));
+ assertTrue(e.getMessage().contains("Target page, context or browser has been closed"));
page.close();
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java b/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java
index bde1bc43..034d464c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestChromiumTracing.java
@@ -80,12 +80,10 @@ public class TestChromiumTracing extends TestBase {
browser.startTracing(page, new Browser.StartTracingOptions()
.setPath(outputTraceFile));
Page newPage = browser.newPage();
- try {
+ assertThrows(PlaywrightException.class, () -> {
browser.startTracing(newPage, new Browser.StartTracingOptions()
.setPath(outputTraceFile));
- fail("did not throw");
- } catch (PlaywrightException e) {
- }
+ });
newPage.close();
browser.stopTracing();
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestClick.java b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
index 8be6c150..b7179421 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestClick.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestClick.java
@@ -564,12 +564,10 @@ public class TestClick extends TestBase {
page.evaluate("addButton()");
ElementHandle handle = page.querySelector("button");
page.evaluate("stopButton(true)");
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
handle.click(new ElementHandle.ClickOptions().setForce(true));
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Element is not attached to the DOM"));
- }
+ });
+ assertTrue(e.getMessage().contains("Element is not attached to the DOM"));
assertEquals(null, page.evaluate("window.clicked"));
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
index 9a784d7f..193c80f5 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDefaultBrowserContext2.java
@@ -192,12 +192,10 @@ public class TestDefaultBrowserContext2 extends TestBase {
BrowserType.LaunchPersistentContextOptions options = new BrowserType.LaunchPersistentContextOptions()
.setArgs(asList(server.EMPTY_PAGE));
Path userDataDir = Files.createTempDirectory("user-data-dir-");
- try {
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> {
browserType.launchPersistentContext(userDataDir, options);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("can not specify page"));
- }
+ });
+ assertTrue(e.getMessage().contains("can not specify page"));
}
@Test
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestDownload.java b/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
index 256576e5..32c2965e 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestDownload.java
@@ -116,13 +116,9 @@ public class TestDownload extends TestBase {
Download download = page.waitForDownload(() -> page.click("a"));
assertEquals(server.PREFIX + "/downloadWithFilename", download.url());
assertEquals("file.txt", download.suggestedFilename());
- try {
- download.path();
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(download.failure().contains("acceptDownloads"));
- assertTrue(e.getMessage().contains("acceptDownloads: true"));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> download.path());
+ assertTrue(download.failure().contains("acceptDownloads"));
+ assertTrue(e.getMessage().contains("acceptDownloads: true"));
}
}
@Test
@@ -243,12 +239,8 @@ public class TestDownload extends TestBase {
Download download = page.waitForDownload(() -> page.click("a"));
Path userPath = Files.createTempFile("download-", ".txt");
- try {
- download.saveAs(userPath);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Pass { acceptDownloads: true } when you are creating your browser context"));
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> download.saveAs(userPath));
+ assertTrue(e.getMessage().contains("Pass { acceptDownloads: true } when you are creating your browser context"));
page.close();
}
@@ -260,12 +252,8 @@ public class TestDownload extends TestBase {
Path userPath = Files.createTempFile("download-", ".txt");
download.delete();
- try {
- download.saveAs(userPath);
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
- }
+ PlaywrightException e = assertThrows(PlaywrightException.class, () -> download.saveAs(userPath));
+ assertTrue(e.getMessage().contains("Target page, context or browser has been closed"), e.getMessage());
page.close();
}
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java
index d2fe8844..f446439c 100644
--- a/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java
+++ b/playwright/src/test/java/com/microsoft/playwright/TestElementHandleConvenience.java
@@ -57,19 +57,12 @@ public class TestElementHandleConvenience extends TestBase {
ElementHandle handle = page.querySelector("#input");
assertEquals("input value", handle.inputValue());
- try {
- page.inputValue("#inner");
- fail("did not throw");
- } catch (PlaywrightException e) {
- assertTrue(e.getMessage().contains("Node is not an ,