fix tests

Author: Skn0tt

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

@@ -20,14 +20,12 @@
 import com.google.gson.JsonObject;
 import com.microsoft.playwright.ConsoleMessage;
 import com.microsoft.playwright.JSHandle;
-import com.microsoft.playwright.Page;
+import com.microsoft.playwright.PlaywrightException;
 import com.microsoft.playwright.options.ConsoleMessageType;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.microsoft.playwright.impl.Serialization.gson;
-
 public class ConsoleMessageImpl implements ConsoleMessage {
   private final Connection connection;
   private PageImpl page;
@@ -45,7 +43,28 @@ public ConsoleMessageImpl(Connection connection, JsonObject initializer) {
   }
 
   public ConsoleMessageType type() {
-    return Utils.convertType(initializer.get("type").getAsString(), ConsoleMessageType.class);
+    String value = initializer.get("type").getAsString();
+    switch (value) {
+      case "log": return ConsoleMessageType.LOG;
+      case "debug": return ConsoleMessageType.DEBUG;
+      case "info": return ConsoleMessageType.INFO;
+      case "error": return ConsoleMessageType.ERROR;
+      case "warning": return ConsoleMessageType.WARNING;
+      case "dir": return ConsoleMessageType.DIR;
+      case "dirxml": return ConsoleMessageType.DIRXML;
+      case "table": return ConsoleMessageType.TABLE;
+      case "trace": return ConsoleMessageType.TRACE;
+      case "clear": return ConsoleMessageType.CLEAR;
+      case "startGroup": return ConsoleMessageType.STARTGROUP;
+      case "startGroupCollapsed": return ConsoleMessageType.STARTGROUPCOLLAPSED;
+      case "endGroup": return ConsoleMessageType.ENDGROUP;
+      case "assert": return ConsoleMessageType.ASSERT;
+      case "profile": return ConsoleMessageType.PROFILE;
+      case "profileEnd": return ConsoleMessageType.PROFILEEND;
+      case "count": return ConsoleMessageType.COUNT;
+      case "timeEnd": return ConsoleMessageType.TIMEEND;
+      default: throw new PlaywrightException("Unexpected console message type: " + value);
+    }
   }
 
   public String text() {

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

@@ -19,6 +19,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+import com.microsoft.playwright.options.ConsoleMessageType;
+
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
@@ -53,7 +55,7 @@ void consoleEventShouldWorkInPopup() {
   void consoleEventShouldWorkInPopup2() {
     Page[] popup = { null };
     ConsoleMessage message = context.waitForConsoleMessage(
-      new BrowserContext.WaitForConsoleMessageOptions().setPredicate(msg -> "log".equals(msg.type())),
+      new BrowserContext.WaitForConsoleMessageOptions().setPredicate(msg -> msg.type() == ConsoleMessageType.LOG),
       () -> {
         popup[0] = context.waitForPage(() -> {
           page.evaluate("async () => {\n" +

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

@@ -19,6 +19,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 
+import com.microsoft.playwright.options.ConsoleMessageType;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,7 +42,7 @@ void shouldWork() {
     } else {
       assertEquals("hello 5 {foo: bar}", message.text());
     }
-    assertEquals("log", message.type());
+    assertEquals(ConsoleMessageType.LOG, message.type());
     assertEquals("hello", message.args().get(0).jsonValue());
     assertEquals(5, message.args().get(1).jsonValue());
     assertEquals(mapOf("foo", "bar"), message.args().get(2).jsonValue());
@@ -70,7 +72,13 @@ void shouldWorkForDifferentConsoleAPICalls() {
       "    console.error('calling console.error');\n" +
       "    console.log(Promise.resolve('should not wait until resolved!'));\n" +
       "  }");
-    assertEquals(asList("timeEnd", "trace", "dir", "warning", "error", "log"),
+    assertEquals(asList(
+      ConsoleMessageType.TIMEEND,
+      ConsoleMessageType.TRACE,
+      ConsoleMessageType.DIR,
+      ConsoleMessageType.WARNING,
+      ConsoleMessageType.ERROR,
+      ConsoleMessageType.LOG),
       messages.stream().map(msg -> msg.type()).collect(toList()));
     assertTrue(messages.get(0).text().contains("calling console.time"));
 
@@ -104,7 +112,7 @@ void shouldTriggerCorrectLog() {
       page.evaluate("async url => fetch(url).catch(e => {})", server.EMPTY_PAGE);
     });
     assertTrue(message.text().contains("Access-Control-Allow-Origin"));
-    assertEquals("error", message.type());
+    assertEquals(ConsoleMessageType.ERROR, message.type());
   }
 
   @Test
@@ -113,7 +121,7 @@ void shouldHaveLocationForConsoleAPICalls() {
     ConsoleMessage message = page.waitForConsoleMessage(
       new Page.WaitForConsoleMessageOptions().setPredicate(m -> "yellow".equals(m.text())),
       () -> page.navigate(server.PREFIX + "/consolelog.html"));
-    assertEquals("log", message.type());
+    assertEquals(ConsoleMessageType.LOG, message.type());
     // Engines have different column notion.
     assertTrue(message.location().startsWith(server.PREFIX + "/consolelog.html:7:"), message.location());
   }
@@ -122,12 +130,12 @@ void shouldHaveLocationForConsoleAPICalls() {
   void shouldSupportPredicate() {
     page.navigate(server.EMPTY_PAGE);
     ConsoleMessage message = page.waitForConsoleMessage(
-      new Page.WaitForConsoleMessageOptions().setPredicate(m -> "info".equals(m.type())),
+      new Page.WaitForConsoleMessageOptions().setPredicate(m -> m.type() == ConsoleMessageType.INFO),
       () -> {
         page.evaluate("console.log(1)");
         page.evaluate("console.info(2)");
       });
     assertEquals("2", message.text());
-    assertEquals("info", message.type());
+    assertEquals(ConsoleMessageType.INFO, message.type());
   }
 }

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

@@ -139,7 +139,9 @@ void shouldHandleErrors() {
   @Test
   void shouldThrowAlreadyRegisteredErrorWhenRegistering() {
     // https://github.com/microsoft/playwright/issues/36467
-    browser.close();
+
+    // this test is about the exception *before* there's a context created
+    context.close();
 
     // Register the selector engine first
     playwright.selectors().register("alreadyRegistered", TAG_SELECTOR_SCRIPT);