diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java index 9bb969126..9d4f42379 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/APIRequestContextImpl.java @@ -105,7 +105,11 @@ public void dispose(DisposeOptions options) { options = new DisposeOptions(); } disposeReason = options.reason; - channel.dispose(toProtocol(options, APIRequestContextDisposeParams.class), NO_TIMEOUT); + try { + channel.dispose(toProtocol(options, APIRequestContextDisposeParams.class), NO_TIMEOUT); + } catch (TargetClosedError e) { + return; + } tracing.resetStackCounter(); } @@ -279,7 +283,7 @@ public String storageState(StorageStateOptions options) { // that is compared with BrowserContext.storageState(). String storageState = sendMessage("storageState", connection.protocolGson().toJsonTree(params).getAsJsonObject(), NO_TIMEOUT).toString(); if (options.path != null) { - Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path); + Utils.writeToFile(Serialization.toPrettyJson(storageState).getBytes(StandardCharsets.UTF_8), options.path); } return storageState; } @@ -296,6 +300,9 @@ private static RequestOptionsImpl ensureOptions(RequestOptions options, String m } private static boolean isJsonParsable(String value) { + if (value.trim().isEmpty()) { + return false; + } try { JsonElement result = JsonParser.parseString(value); if (result != null && result.isJsonPrimitive()) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java index 854213eb5..35225faee 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java @@ -29,7 +29,6 @@ import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; import java.util.function.BooleanSupplier; import java.util.function.Consumer; @@ -84,14 +83,6 @@ public class BrowserContextImpl extends ChannelOwner implements BrowserContext { closePromise = new WaitableEvent<>(this, Events.BrowserContext.CLOSE); } - Path videosDir() { - JsonObject recordVideo = initializer.getAsJsonObject("options").getAsJsonObject("recordVideo"); - if (recordVideo == null) { - return null; - } - return Paths.get(recordVideo.get("dir").getAsString()); - } - URL baseUrl() { JsonElement url = initializer.getAsJsonObject("options").get("baseURL"); if (url != null) { @@ -632,7 +623,7 @@ public String storageState(StorageStateOptions options) { String storageState = json.toString(); if (options.path != null) { - Utils.writeToFile(storageState.getBytes(StandardCharsets.UTF_8), options.path); + Utils.writeToFile(Serialization.toPrettyJson(storageState).getBytes(StandardCharsets.UTF_8), options.path); } return storageState; } @@ -729,7 +720,7 @@ void handleRoute(RouteImpl route) { } } if (handled == Router.HandleResult.NoMatchingHandler || handled == Router.HandleResult.Fallback) { - route.resume(null, true); + route.continueAsFallback(); } } @@ -829,7 +820,7 @@ protected void handleEvent(String event, JsonObject params) { request.failure = params.get("failureText").getAsString(); } if (request.timing != null) { - request.timing.responseEnd = params.get("responseEndTiming").getAsDouble(); + request.setResponseEndTiming(params.get("responseEndTiming").getAsDouble()); } emit(Events.BrowserContext.REQUEST_FAILED, request); if (params.has("page")) { @@ -841,7 +832,7 @@ protected void handleEvent(String event, JsonObject params) { RequestImpl request = connection.getExistingObject(guid); request.didFailOrFinish = true; if (request.timing != null) { - request.timing.responseEnd = params.get("responseEndTiming").getAsDouble(); + request.setResponseEndTiming(params.get("responseEndTiming").getAsDouble()); } emit(Events.BrowserContext.REQUEST_FINISHED, request); if (params.has("page")) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java index 4f3ef5322..502d160ac 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/ElementHandleImpl.java @@ -294,6 +294,7 @@ public List selectOption(String[] values, SelectOptionOptions options) { } ElementHandleSelectOptionParams params = Utils.toProtocol(options, ElementHandleSelectOptionParams.class); if (values != null) { + Utils.assertNoNullItems(values); params.options = new ArrayList<>(); for (String value : values) { ElementHandleSelectOptionParams.ElementHandleSelectOptionParamsOptions option = new ElementHandleSelectOptionParams.ElementHandleSelectOptionParamsOptions(); @@ -318,6 +319,7 @@ public List selectOption(SelectOption[] values, SelectOptionOptions opti } ElementHandleSelectOptionParams params = Utils.toProtocol(options, ElementHandleSelectOptionParams.class); if (values != null) { + Utils.assertNoNullItems(values); params.options = new ArrayList<>(); for (SelectOption value : values) { ElementHandleSelectOptionParams.ElementHandleSelectOptionParamsOptions option = new ElementHandleSelectOptionParams.ElementHandleSelectOptionParamsOptions(); @@ -337,6 +339,7 @@ public List selectOption(ElementHandle[] values, SelectOptionOptions opt } ElementHandleSelectOptionParams params = Utils.toProtocol(options, ElementHandleSelectOptionParams.class); if (values != null) { + Utils.assertNoNullItems(values); params.elements = new ArrayList<>(); for (ElementHandle value : values) { params.elements.add((ElementHandleImpl) value); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java index c490036ef..38b3ac22b 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/FrameImpl.java @@ -627,6 +627,7 @@ List selectOptionImpl(String selector, SelectOption[] values, SelectOpti FrameSelectOptionParams params = toProtocol(options, FrameSelectOptionParams.class); params.selector = selector; if (values != null) { + Utils.assertNoNullItems(values); params.options = new ArrayList<>(); for (SelectOption value : values) { FrameSelectOptionParams.FrameSelectOptionParamsOptions option = new FrameSelectOptionParams.FrameSelectOptionParamsOptions(); @@ -646,6 +647,7 @@ List selectOptionImpl(String selector, String[] values, SelectOptionOpti FrameSelectOptionParams params = toProtocol(options, FrameSelectOptionParams.class); params.selector = selector; if (values != null) { + Utils.assertNoNullItems(values); params.options = new ArrayList<>(); for (String value : values) { FrameSelectOptionParams.FrameSelectOptionParamsOptions option = new FrameSelectOptionParams.FrameSelectOptionParamsOptions(); @@ -668,6 +670,7 @@ List selectOptionImpl(String selector, ElementHandle[] values, SelectOpt FrameSelectOptionParams params = toProtocol(options, FrameSelectOptionParams.class); params.selector = selector; if (values != null) { + Utils.assertNoNullItems(values); params.elements = new ArrayList<>(); for (ElementHandle handle : values) { params.elements.add((ElementHandleImpl) handle); 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 e02bdcd7b..ddee860e2 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/PageImpl.java @@ -1416,6 +1416,9 @@ public String url() { @Override public VideoImpl video() { + if (!browserContext.initializer.getAsJsonObject("options").has("recordVideo")) { + return null; + } return video; } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java b/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java index 835db2a2a..7a489ef9d 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java @@ -17,6 +17,7 @@ package com.microsoft.playwright.impl; import com.microsoft.playwright.impl.protocol.*; +import com.microsoft.playwright.options.PseudoElement; import java.util.List; class FrameExpectOptions { @@ -26,6 +27,7 @@ class FrameExpectOptions { Double expectedNumber; SerializedArgument expectedValue; Boolean useInnerText; + PseudoElement pseudo; boolean isNot; Double timeout; } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java index 4576d556d..ef97945dc 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/RequestImpl.java @@ -47,6 +47,7 @@ public class RequestImpl extends ChannelOwner implements Request { boolean didFailOrFinish; ResponseImpl existingResponse; private FallbackOverrides fallbackOverrides; + private final FrameImpl frame; static class FallbackOverrides { String url; @@ -60,6 +61,11 @@ static class FallbackOverrides { RequestImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) { super(parent, type, guid, initializer); + if (initializer.has("frame")) { + frame = connection.getExistingObject(initializer.getAsJsonObject("frame").get("guid").getAsString()); + } else { + frame = null; + } if (initializer.has("redirectedFrom")) { redirectedFrom = connection.getExistingObject(initializer.getAsJsonObject("redirectedFrom").get("guid").getAsString()); redirectedFrom.redirectedTo = this; @@ -87,9 +93,15 @@ public String failure() { return failure; } + PageImpl safePage() { + return frame == null ? null : frame.page; + } + @Override public FrameImpl frame() { - FrameImpl frame = connection.getExistingObject(initializer.getAsJsonObject("frame").get("guid").getAsString()); + if (frame == null) { + throw new PlaywrightException("Service Worker requests do not have an associated frame."); + } if (frame.page == null) { throw new PlaywrightException("Frame for this navigation request is not available, because the request\n" + "was issued before the frame is created. You can check whether the request\n" + @@ -218,6 +230,13 @@ private RawHeaders getRawHeaders() { return rawHeaders; } + void setResponseEndTiming(double responseEndTiming) { + timing.responseEnd = responseEndTiming; + if (timing.responseStart == -1) { + timing.responseStart = responseEndTiming; + } + } + void applyFallbackOverrides(FallbackOverrides overrides) { if (fallbackOverrides == null) { fallbackOverrides = new FallbackOverrides(); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java index ec554b2b5..559571cdf 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/ResponseImpl.java @@ -73,9 +73,11 @@ public String get() { return request.failure(); } }); - PageImpl page = request.frame().page; - waitables.add(page.createWaitForCloseHelper()); - waitables.add(page.createWaitableTimeout(null)); + PageImpl page = request.safePage(); + if (page != null) { + waitables.add(page.createWaitForCloseHelper()); + waitables.add(page.createWaitableTimeout(null)); + } runUntil(() -> {}, new WaitableRace<>(waitables)); return request.failure(); } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java index 38846d6e4..bb8f64171 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/RouteImpl.java @@ -17,6 +17,7 @@ package com.microsoft.playwright.impl; import com.microsoft.playwright.impl.protocol.*; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.microsoft.playwright.*; import com.microsoft.playwright.APIResponse; @@ -26,6 +27,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.ArrayList; +import java.util.Arrays; import java.util.Base64; import java.util.LinkedHashMap; import java.util.List; @@ -49,10 +51,11 @@ public RouteImpl(ChannelOwner parent, String type, String guid, JsonObject initi @Override public void abort(String errorCode) { - startHandling(); - RouteAbortParams params = new RouteAbortParams(); - params.errorCode = errorCode; - sendMessageAsync("abort", params); + handleRoute(() -> { + RouteAbortParams params = new RouteAbortParams(); + params.errorCode = errorCode; + raceWithTargetClose("abort", params); + }); } boolean isHandled() { @@ -61,13 +64,54 @@ boolean isHandled() { @Override public void resume(ResumeOptions options) { - resume(options, false); + handleRoute(() -> { + applyOverrides(convertType(options, FallbackOptions.class)); + raceWithTargetClose("continue", continueParams(false)); + }); } - void resume(ResumeOptions options, boolean isFallback) { - startHandling(); - applyOverrides(convertType(options, FallbackOptions.class)); - resumeImpl(request().fallbackOverridesForResume(), isFallback); + // java: upstream awaits _innerContinue(true) and ignores its error; nothing observes the reply here. + void continueAsFallback() { + checkNotHandled(); + handled = true; + sendMessageAsync("continue", continueParams(true)); + } + + private void handleRoute(Runnable callback) { + checkNotHandled(); + callback.run(); + handled = true; + } + + // java: pumps the connection until the reply arrives; when the page closes first the call returns + // without an error, as safeRace() of the target closed scope does upstream. + private void raceWithTargetClose(String method, Object params) { + WaitableResult result = sendMessageAsync(method, params); + PageImpl page = request.safePage(); + if (page == null) { + runUntil(() -> {}, result); + return; + } + if (page.isClosed()) { + return; + } + Waitable closed = page.createWaitForCloseHelper(); + runUntil(() -> {}, new WaitableRace<>(Arrays.asList(result, new Waitable() { + @Override + public boolean isDone() { + return closed.isDone(); + } + + @Override + public JsonElement get() { + return null; + } + + @Override + public void dispose() { + closed.dispose(); + } + }))); } @Override @@ -78,7 +122,7 @@ public void fallback(FallbackOptions options) { } applyOverrides(options); if (shouldResumeIfFallbackIsCalled) { - resume(null, true); + continueAsFallback(); } } @@ -121,18 +165,29 @@ private void applyOverrides(FallbackOptions options) { request().applyFallbackOverrides(overrides); } - private void resumeImpl(RequestImpl.FallbackOverrides options, boolean isFallback) { + private RouteContinueParams continueParams(boolean isFallback) { + RequestImpl.FallbackOverrides options = request().fallbackOverridesForResume(); RouteContinueParams params = new RouteContinueParams(); if (options != null) { params.url = options.url; params.method = options.method; if (options.headers != null) { - params.headers = toNameValues(options.headers); + params.headers = toNameValues(withoutNullValues(options.headers)); } params.postData = options.postData; } params.isFallback = isFallback; - sendMessageAsync("continue", params); + return params; + } + + private static Map withoutNullValues(Map map) { + Map result = new LinkedHashMap<>(); + for (Map.Entry e : map.entrySet()) { + if (e.getValue() != null) { + result.put(e.getKey(), e.getValue()); + } + } + return result; } private static List toNameValues(Map map) { @@ -161,8 +216,7 @@ private static byte[] getPostDataBytes(Object postData) { @Override public void fulfill(FulfillOptions options) { - startHandling(); - fulfillImpl(options); + handleRoute(() -> fulfillImpl(options)); } private void fulfillImpl(FulfillOptions options) { @@ -238,7 +292,7 @@ private void fulfillImpl(FulfillOptions options) { params.isBase64 = isBase64; params.body = body; params.fetchResponseUid = fetchResponseUid; - sendMessageAsync("fulfill", params); + raceWithTargetClose("fulfill", params); } @Override @@ -247,17 +301,17 @@ public RequestImpl request() { } void redirectNavigationRequest(String redirectURL) { - startHandling(); - RouteRedirectNavigationRequestParams params = new RouteRedirectNavigationRequestParams(); - params.url = redirectURL; - // TODO: _raceWithPageClose ? - sendMessageAsync("redirectNavigationRequest", params); + handleRoute(() -> { + RouteRedirectNavigationRequestParams params = new RouteRedirectNavigationRequestParams(); + params.url = redirectURL; + raceWithTargetClose("redirectNavigationRequest", params); + }); } - private void startHandling() { + private void checkNotHandled() { if (handled) { throw new PlaywrightException("Route is already handled!"); } - handled = true; } + } diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Router.java b/playwright/src/main/java/com/microsoft/playwright/impl/Router.java index 78d7e10fc..71d0a8383 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/Router.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/Router.java @@ -21,7 +21,6 @@ import com.microsoft.playwright.Route; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.function.Consumer; @@ -74,13 +73,15 @@ void removeAll() { enum HandleResult { NoMatchingHandler, Handled, Fallback, PendingHandler } HandleResult handle(RouteImpl route) { HandleResult result = HandleResult.NoMatchingHandler; - for (Iterator it = routes.iterator(); it.hasNext();) { - RouteInfo info = it.next(); + for (RouteInfo info : new ArrayList<>(routes)) { if (!info.matcher.test(route.request().url())) { continue; } + if (!routes.contains(info)) { + continue; + } if (info.decrementRemainingCallCount()) { - it.remove(); + routes.remove(info); } route.fallbackCalled = false; info.handle(route); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java b/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java index deffadc5a..c3cfb174b 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/Serialization.java @@ -32,6 +32,8 @@ import java.math.BigInteger; import java.net.MalformedURLException; import java.net.URL; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.text.DateFormat; @@ -66,6 +68,7 @@ class Serialization { .registerTypeAdapter(ScrollMode.class, new ToLowerCaseSerializer()) .registerTypeAdapter(ConsoleMessagesFilter.class, new ConsoleMessagesFilterSerializer()) .registerTypeAdapter(AriaSnapshotMode.class, new ToLowerCaseSerializer()) + .registerTypeAdapter(PseudoElement.class, new ToLowerCaseSerializer()) .registerTypeAdapter(LoadState.class, new ToLowerCaseSerializer()) .registerTypeAdapter(WaitUntilState.class, new ToLowerCaseSerializer()) .registerTypeAdapter(WaitForSelectorState.class, new ToLowerCaseSerializer()) @@ -89,6 +92,12 @@ static Gson gson() { .registerTypeAdapter(OffsetDateTime.class, new OffsetDateTimeSerializer()) .serializeNulls().create(); + private static final Gson prettyGson = new GsonBuilder().disableHtmlEscaping().serializeNulls().setPrettyPrinting().create(); + + static String toPrettyJson(String json) { + return prettyGson.toJson(JsonParser.parseString(json)); + } + static SerializedError serializeError(Throwable e) { SerializedError result = new SerializedError(); result.error = new SerializedError.SerializedErrorError(); @@ -264,6 +273,9 @@ private static T deserialize(SerializedValue value, Map idT if (value.e != null) { return (T)new Exception(value.e.s); } + if (value.ta != null) { + return (T) deserializeTypedArray(value.ta); + } if (value.v != null) { switch (value.v) { case "undefined": @@ -301,6 +313,46 @@ private static T deserialize(SerializedValue value, Map idT throw new PlaywrightException("Unexpected result: " + gson().toJson(value)); } + private static Object deserializeTypedArray(SerializedValue.SerializedValueTa typedArray) { + ByteBuffer buffer = ByteBuffer.wrap(typedArray.b).order(ByteOrder.LITTLE_ENDIAN); + switch (typedArray.k) { + case "i8": + case "ui8": + case "ui8c": + return typedArray.b; + case "i16": + case "ui16": { + short[] result = new short[typedArray.b.length / 2]; + buffer.asShortBuffer().get(result); + return result; + } + case "i32": + case "ui32": { + int[] result = new int[typedArray.b.length / 4]; + buffer.asIntBuffer().get(result); + return result; + } + case "f32": { + float[] result = new float[typedArray.b.length / 4]; + buffer.asFloatBuffer().get(result); + return result; + } + case "f64": { + double[] result = new double[typedArray.b.length / 8]; + buffer.asDoubleBuffer().get(result); + return result; + } + case "bi64": + case "bui64": { + long[] result = new long[typedArray.b.length / 8]; + buffer.asLongBuffer().get(result); + return result; + } + default: + throw new PlaywrightException("Unexpected typed array kind: " + typedArray.k); + } + } + private static class KeyboardModifiersSerializer implements JsonSerializer> { @Override public JsonArray serialize(List modifiers, Type typeOfSrc, JsonSerializationContext context) { diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/Utils.java b/playwright/src/main/java/com/microsoft/playwright/impl/Utils.java index fa4f92435..a6dc6a653 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/Utils.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/Utils.java @@ -373,9 +373,20 @@ static Map toHeadersMap(List headers) { return map; } + static void assertNoNullItems(Object[] values) { + for (int i = 0; i < values.length; i++) { + if (values[i] == null) { + throw new PlaywrightException("options[" + i + "]: expected object, got null"); + } + } + } + static List toHeadersList(Map headers) { List list = new ArrayList<>(); for (Map.Entry entry: headers.entrySet()) { + if (entry.getValue() == null) { + continue; + } HttpHeader header = new HttpHeader(); header.name = entry.getKey(); header.value = entry.getValue(); diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java index 3489ca21a..2b36e0734 100644 --- a/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java +++ b/playwright/src/main/java/com/microsoft/playwright/impl/WorkerImpl.java @@ -25,7 +25,9 @@ import com.microsoft.playwright.Worker; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.function.Consumer; import java.util.function.Predicate; @@ -38,6 +40,9 @@ public class WorkerImpl extends ChannelOwner implements Worker { WorkerImpl(ChannelOwner parent, String type, String guid, JsonObject initializer) { super(parent, type, guid, initializer); + Map mapping = new HashMap<>(); + mapping.put(Events.Worker.CONSOLE, "console"); + setEventToSubscriptionMapping(mapping); } @Override diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextRoute.java b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextRoute.java index d0f75aeaf..5870608cd 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextRoute.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextRoute.java @@ -295,7 +295,6 @@ void shouldSupportTheTimesParameterWithRouteMatching(BrowserContext context, Pag @PlaywrightTest @DisplayName("RO-174 should work if handler with times parameter was removed from another handler") - @Fixme("java: Router.handle() iterates the handlers it started with and does not skip one that unroute() removed meanwhile (upstream checks this._routes.indexOf(routeHandler)); the intercepted list is [second, first]") void shouldWorkIfHandlerWithTimesParameterWasRemovedFromAnotherHandler(BrowserContext context, Page page, TestServer server) { List intercepted = new ArrayList<>(); Consumer handler = route -> { diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextStorageState.java b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextStorageState.java index 14a541698..f0f01f256 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextStorageState.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestBrowsercontextStorageState.java @@ -231,7 +231,6 @@ private static void checkContextRoundTrip(BrowserContext context) { @PlaywrightTest @DisplayName("ST-004 should round-trip through the file") - @Fixme("java: BrowserContext.storageState(path) writes the compact JSON of the driver, JS writes JSON.stringify(state, undefined, 2)") void shouldRoundTripThroughTheFile(ContextFactory contextFactory, TestInfo testInfo) throws Exception { assumeFalse(Env.channel() != null && Env.channel().startsWith("msedge"), "fixme: Network.clearBrowserCache sometimes stalls"); diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetch.java b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetch.java index 205db544d..b2dbb62a7 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetch.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetch.java @@ -143,7 +143,6 @@ void methodShouldWork(Playwright playwright, TestServer server) { @PlaywrightTest @DisplayName("FE-002 should dispose global request") - @Fixme("java: dispose() of an already disposed APIRequestContext throws TargetClosedError: 'Target page, context or browser has been closed'") void shouldDisposeGlobalRequest(Playwright playwright, TestServer server) { APIRequestContext request = playwright.request().newContext(); APIResponse response = request.get(server.PREFIX + "/simple.json"); @@ -626,8 +625,8 @@ class Serialization { Object value; @PlaywrightTest - @Fixme(value = "java: an empty String data with a JSON content type is sent as is instead of JSON-stringified, and null data sends no body", - parameters = {"type=string (falsey)", "type=null,"}) + @Fixme(value = "java: null data sends no body, the Node.js client sends 'null'", + parameters = {"type=null,"}) @DisplayName("FE-033 should json stringify ${type} body when content-type is application/json") void shouldJsonStringifyBodyWhenContentTypeIsApplicationJson(Playwright playwright, TestServer server) throws Exception { String stringifiedValue = stringify(value); diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetchCookie.java b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetchCookie.java index fa2f731dd..e5f437e43 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetchCookie.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestGlobalFetchCookie.java @@ -775,7 +775,6 @@ void shouldSendCookiesFromStorageState(Playwright playwright, TestServer server, @PlaywrightTest @DisplayName("FE-086 storage state should round-trip through file") - @Fixme("java: storageState({ path }) writes the compact JSON of the state, the JavaScript client writes JSON.stringify(state, undefined, 2)") void storageStateShouldRoundTripThroughFile(Playwright playwright, TestServer server, TestInfo testInfo) throws IOException { Map storageState = mapOf( "cookies", Arrays.asList( diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestResourceTiming.java b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestResourceTiming.java index 14da0d8b8..b9d3e8bb9 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestResourceTiming.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestResourceTiming.java @@ -134,7 +134,6 @@ void shouldWorkForRedirect(ContextFactory contextFactory, BrowserName browserNam @PlaywrightTest @DisplayName("NE-135 should work when serving from memory cache") - @Fixme("java: Request.timing().responseStart stays -1 for a response served from the memory cache; the JavaScript client sets it to responseEnd when it is -1 (Request._setResponseEndTiming), the Java client only sets responseEnd") void shouldWorkWhenServingFromMemoryCache(ContextFactory contextFactory, TestServer server, BrowserName browserName) { // issue: https://github.com/microsoft/playwright-java/issues/1080 assumeFalse(browserName == BrowserName.FIREFOX && !Env.isBidi(), "fixme: Response event is not fired in Firefox"); diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestVideo.java b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestVideo.java index b9c171dca..0199353cc 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/library/TestVideo.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/library/TestVideo.java @@ -64,7 +64,6 @@ private static List findVideos(Path videoDir) throws IOException { @PlaywrightTest @DisplayName("VI-001 should not have video by default") - @Fixme("java: page.video() returns a Video also when the context does not record video (PageImpl creates a VideoImpl without an artifact): expected: but was: ") void shouldNotHaveVideoByDefault(Page page) { assertNull(page.video()); } diff --git a/playwright/src/test/java/com/microsoft/playwright/tests/page/TestExpectMisc.java b/playwright/src/test/java/com/microsoft/playwright/tests/page/TestExpectMisc.java index 573a6f5f4..bfafaabd2 100644 --- a/playwright/src/test/java/com/microsoft/playwright/tests/page/TestExpectMisc.java +++ b/playwright/src/test/java/com/microsoft/playwright/tests/page/TestExpectMisc.java @@ -577,7 +577,6 @@ void pass(Page page) { @PlaywrightTest @DisplayName("EX-230 should support pseudo element") - @Fixme("java: the pseudo option of hasCSS is not applied: 'Locator expected to have CSS property 'color'\nExpected: rgb(255, 0, 0)\nReceived: rgb(0, 0, 0)'") void shouldSupportPseudoElement(Page page) { page.setContent("\n" + "