java: Implementing partial alert support in Marionette

Author: barancev

Diff for: java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java

@@ -62,6 +62,10 @@ public class MarionetteConnection implements ExtensionConnection, NeedsLocalLogs
 
   private static Map<String, String> seleniumToMarionetteCommandMap = ImmutableMap.<String, String>builder()
       .put(DriverCommand.GET, "get")
+      .put(DriverCommand.GET_ALERT_TEXT, "getTextFromDialog")
+      .put(DriverCommand.ACCEPT_ALERT, "acceptDialog")
+      .put(DriverCommand.DISMISS_ALERT, "dismissDialog")
+      .put(DriverCommand.SET_ALERT_VALUE, "sendKeysToDialog")
       .put(DriverCommand.GET_CURRENT_WINDOW_HANDLE, "getWindow")
       .put(DriverCommand.GET_WINDOW_HANDLES, "getWindows")
       .put(DriverCommand.CLOSE, "closeWindow")
@@ -289,6 +293,9 @@ private String serializeCommand(Command command) {
       List<Object> actions = Lists.newArrayList();
       actions.add(action);
       params.put("chain", actions);
+
+    } else if (DriverCommand.SET_ALERT_VALUE.equals(commandName)) {
+      renameParameter(params, "text", "value");
     }
 
     if (seleniumToMarionetteCommandMap.containsKey(commandName)) {

Diff for: java/client/test/org/openqa/selenium/AlertsTest.java

@@ -51,7 +51,7 @@
 
 import java.util.Set;
 
-@Ignore({HTMLUNIT, PHANTOMJS, SAFARI, MARIONETTE})
+@Ignore({HTMLUNIT, PHANTOMJS, SAFARI})
 public class AlertsTest extends JUnit4TestBase {
 
   private WebDriverWait wait;
@@ -94,7 +94,7 @@ public void testShouldAllowUsersToAcceptAnAlertWithNoTextManually() {
     assertEquals("Testing Alerts", driver.getTitle());
   }
 
-  @Ignore(CHROME)
+  @Ignore({CHROME, MARIONETTE})
   @JavascriptEnabled
   @NeedsLocalEnvironment(reason = "Carefully timing based")
   @Test
@@ -149,6 +149,7 @@ public void testShouldAllowAUserToDismissAPrompt() {
     assertEquals("Testing Alerts", driver.getTitle());
   }
 
+  @Ignore(MARIONETTE)
   @JavascriptEnabled
   @Test
   public void testShouldAllowAUserToSetTheValueOfAPrompt() {
@@ -216,6 +217,7 @@ public void testAlertShouldNotAllowAdditionalCommandsIfDismissed() {
     fail("Expected NoAlertPresentException");
   }
 
+  @Ignore(MARIONETTE)
   @JavascriptEnabled
   @Test
   public void testShouldAllowUsersToAcceptAnAlertInAFrame() {
@@ -230,6 +232,7 @@ public void testShouldAllowUsersToAcceptAnAlertInAFrame() {
     assertEquals("Testing Alerts", driver.getTitle());
   }
 
+  @Ignore(MARIONETTE)
   @JavascriptEnabled
   @Test
   public void testShouldAllowUsersToAcceptAnAlertInANestedFrame() {
@@ -255,6 +258,7 @@ public void testSwitchingToMissingAlertThrows() throws Exception {
     }
   }
 
+  @Ignore(MARIONETTE)
   @JavascriptEnabled
   @Test
   public void testSwitchingToMissingAlertInAClosedWindowThrows() throws Exception {
@@ -305,6 +309,7 @@ public void testPromptShouldHaveNullValueIfDismissed() {
     wait.until(textInElementLocated(By.id("text"), "null"));
   }
 
+  @Ignore(MARIONETTE)
   @JavascriptEnabled
   @Test
   public void testHandlesTwoAlertsFromOneInteraction() {
@@ -350,7 +355,7 @@ public void testShouldHandleAlertOnPageLoadUsingGet() {
   }
 
   @JavascriptEnabled
-  @Ignore(value = {CHROME, FIREFOX, IE}, reason = "IE: fails in versions 6 and 7")
+  @Ignore(value = {CHROME, FIREFOX, IE, MARIONETTE}, reason = "IE: fails in versions 6 and 7")
   @Test
   public void testShouldNotHandleAlertInAnotherWindow() {
     String mainWindow = driver.getWindowHandle();
@@ -458,7 +463,7 @@ public void testShouldHandleAlertOnWindowClose() {
   }
 
   @JavascriptEnabled
-  @Ignore(value = {CHROME, HTMLUNIT})
+  @Ignore(value = {CHROME, HTMLUNIT, MARIONETTE})
   @Test
   public void testIncludesAlertTextInUnhandledAlertException() {
     driver.findElement(By.id("alert")).click();