honeymoose/playwright-java
1
0
Fork 0
mirror of https://github.com/microsoft/playwright-java.git synced 2025-09-08 21:01:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: use enum for dialog type (#59)

Browse Source
This commit is contained in:
Yury Semikhatsky 2020-10-30 10:44:32 -07:00 committed by GitHub
parent ad51236002
commit 92ae6cae49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api-generator/src/main/java/com/microsoft/playwright/tools/ApiGenerator.java
View File

@ -713,6 +713,11 @@ class Interface extends TypeDefinition {
private void writeSharedTypes(List<String> output, String offset) {
switch (jsonName) {
case "Dialog": {
output.add(offset + "enum Type { ALERT, BEFOREUNLOAD, CONFIRM, PROMPT }");
output.add("");
break;
}
case "Mouse": {
output.add(offset + "enum Button { LEFT, MIDDLE, RIGHT }");
output.add("");

1
api-generator/src/main/java/com/microsoft/playwright/tools/Types.java
View File

@ -179,6 +179,7 @@ class Types {
add("Worker.evaluateHandle.pageFunction", "function|string", "String");
// Return structures
add("Dialog.type", "string", "Type", new Empty());
add("ConsoleMessage.location", "Object", "Location");
add("ElementHandle.boundingBox", "Promise<null|Object>", "BoundingBox", new Empty());

4
playwright/src/main/java/com/microsoft/playwright/Dialog.java
View File

@ -19,6 +19,8 @@ package com.microsoft.playwright;
import java.util.*;
public interface Dialog {
enum Type { ALERT, BEFOREUNLOAD, CONFIRM, PROMPT }
default void accept() {
accept(null);
}
@ -26,6 +28,6 @@ public interface Dialog {
String defaultValue();
void dismiss();
String message();
String type();
Type type();
}

12
playwright/src/main/java/com/microsoft/playwright/impl/DialogImpl.java
View File

@ -18,6 +18,7 @@ package com.microsoft.playwright.impl;
import com.google.gson.JsonObject;
import com.microsoft.playwright.Dialog;
import com.microsoft.playwright.PlaywrightException;
public class DialogImpl extends ChannelOwner implements Dialog {
private boolean handled;
@ -50,10 +51,15 @@ public class DialogImpl extends ChannelOwner implements Dialog {
return initializer.get("message").getAsString();
}
// public enum Type { Alert, BeforeUnload, Confirm, Prompt }
@Override
public String type() {
return initializer.get("type").getAsString();
public Type type() {
switch (initializer.get("type").getAsString()) {
case "alert": return Type.ALERT;
case "beforeunload": return Type.BEFOREUNLOAD;
case "confirm": return Type.CONFIRM;
case "prompt": return Type.PROMPT;
default: throw new PlaywrightException("Unexpected dialog type: " + initializer.get("type").getAsString());
}
}
boolean isHandled() {

6
playwright/src/test/java/com/microsoft/playwright/TestDialog.java
View File

@ -18,6 +18,8 @@ package com.microsoft.playwright;
import org.junit.jupiter.api.Test;
import static com.microsoft.playwright.Dialog.Type.ALERT;
import static com.microsoft.playwright.Dialog.Type.PROMPT;
import static com.microsoft.playwright.Page.EventType.DIALOG;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@ -28,7 +30,7 @@ public class TestDialog extends TestBase {
void shouldFire() {
page.addListener(DIALOG, event -> {
Dialog dialog = (Dialog) event.data();
assertEquals( "alert", dialog.type());
assertEquals(ALERT, dialog.type());
assertEquals( "", dialog.defaultValue());
assertEquals( "yo", dialog.message());
dialog.accept();
@ -40,7 +42,7 @@ public class TestDialog extends TestBase {
void shouldAllowAcceptingPrompts() {
page.addListener(DIALOG, event -> {
Dialog dialog = (Dialog) event.data();
assertEquals("prompt", dialog.type());
assertEquals(PROMPT, dialog.type());
assertEquals("yes.", dialog.defaultValue());
assertEquals("question?", dialog.message());
dialog.accept("answer!");

2
playwright/src/test/java/com/microsoft/playwright/TestPageBasic.java
View File

@ -62,7 +62,7 @@ public class TestPageBasic extends TestBase {
newPage.addListener(DIALOG, event -> {
didShowDialog[0] = true;
Dialog dialog = (Dialog) event.data();
assertEquals("beforeunload", dialog.type());
assertEquals(Dialog.Type.BEFOREUNLOAD, dialog.type());
assertEquals("", dialog.defaultValue());
if (isChromium) {
assertEquals("", dialog.message());

1
playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java
View File

@ -74,7 +74,6 @@ public class TestPageSetExtraHttpHeaders extends TestBase {
browser.newContext(new Browser.NewContextOptions().withExtraHTTPHeaders(mapOf("foo", null)));
fail("did not throw");
} catch (PlaywrightException e) {
System.out.println(e.getMessage());
assertTrue(e.getMessage().contains("expected string, got undefined"));
}
}