Implement support for Mac platform

src/main/java/com/nordstrom/automation/selenium/examples/MacPage.java → src/main/java/com/nordstrom/automation/selenium/examples/MacDocumentPage.java

@@ -5,26 +5,22 @@
 
 import com.nordstrom.automation.selenium.model.Page;
 
-/**
- * This class is the model for the target view of the sample application used by the Appium Macintosh unit test.
- */
-public class MacPage extends Page {
+public class MacDocumentPage extends Page {
 
     /**
      * Constructor for main view context.
      * 
      * @param driver driver object
      */
-    public MacPage(WebDriver driver) {
-        super(driver);
-    }
-    
+	public MacDocumentPage(WebDriver driver) {
+		super(driver);
+	}
+
     /**
      * This enumeration defines element locator constants.
      */
     protected enum Using implements ByEnum {
-        /** text field */
-        EDIT_FIELD(By.className("XCUIElementTypeTextView"));
+        TEXT_VIEW(By.id("First Text View"));
 
         private final By locator;
 
@@ -44,7 +40,7 @@ public By locator() {
      * @param keys string to type into text field
      */
     public void modifyDocument(String keys) {
-        findElement(Using.EDIT_FIELD).sendKeys(keys);
+        findElement(Using.TEXT_VIEW).sendKeys(keys);
     }
 
     /**
@@ -53,7 +49,7 @@ public void modifyDocument(String keys) {
      * @return text field content
      */
     public String accessDocument() {
-        return findElement(Using.EDIT_FIELD).getText();
+        return findElement(Using.TEXT_VIEW).getText();
     }
 
 }

src/main/java/com/nordstrom/automation/selenium/examples/MacLaunchPage.java

@@ -0,0 +1,48 @@
+package com.nordstrom.automation.selenium.examples;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+
+import com.nordstrom.automation.selenium.model.Page;
+
+/**
+ * This class is the model for the target view of the sample application used by the Appium Macintosh unit test.
+ */
+public class MacLaunchPage extends Page {
+
+    /**
+     * Constructor for main view context.
+     * 
+     * @param driver driver object
+     */
+    public MacLaunchPage(WebDriver driver) {
+        super(driver);
+    }
+
+    /**
+     * This enumeration defines element locator constants.
+     */
+    protected enum Using implements ByEnum {
+        NEW_DOCUMENT(By.id("New Document"));
+
+        private final By locator;
+
+        Using(By locator) {
+            this.locator = locator;
+        }
+
+        @Override
+        public By locator() {
+            return locator;
+        }
+    }
+
+    public MacDocumentPage openNewDocument() {
+        findElement(Using.NEW_DOCUMENT).click();
+        setWindowState(WindowState.WILL_CLOSE);
+        MacDocumentPage newPage = new MacDocumentPage(driver);
+        newPage.setWindowState(WindowState.WILL_CLOSE);
+        return newPage;
+    }
+
+}

src/main/java/com/nordstrom/automation/selenium/model/ContainerMethodInterceptor.java

@@ -9,6 +9,7 @@
 import org.openqa.selenium.NoAlertPresentException;
 import org.openqa.selenium.SearchContext;
 import org.openqa.selenium.TimeoutException;
+import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
@@ -139,7 +140,7 @@ public Object intercept(@This final Object obj, @Origin final Method method, @Al
                     driver.switchTo().alert();
                     // alert is shown
                     hasDialog = true;
-                } catch (NoAlertPresentException eaten) {
+                } catch (NoAlertPresentException | UnsupportedCommandException eaten) {
                     try {
                         // get stale wait reference element by XPath
                         reference = driver.findElement(By.xpath("//*"));

src/test/java/com/nordstrom/automation/selenium/mac/MacTest.java

@@ -6,19 +6,21 @@
 import org.testng.annotations.Test;
 
 import com.nordstrom.automation.selenium.annotations.InitialPage;
-import com.nordstrom.automation.selenium.examples.MacPage;
+import com.nordstrom.automation.selenium.examples.MacDocumentPage;
+import com.nordstrom.automation.selenium.examples.MacLaunchPage;
 import com.nordstrom.automation.selenium.platform.TargetPlatform;
 import com.nordstrom.automation.selenium.support.TestNgTargetBase;
 
-@InitialPage(MacPage.class)
+@InitialPage(MacLaunchPage.class)
 public class MacTest extends TestNgTargetBase {
 
     @Test
     @TargetPlatform(MAC_APP_NAME)
     public void testEditing() {
-        MacPage page = getInitialPage();
-        page.modifyDocument("Hello world!");
-        assertEquals(page.accessDocument(), "Hello world!");
+        MacLaunchPage launchPage = getInitialPage();
+        MacDocumentPage documentPage = launchPage.openNewDocument();
+        documentPage.modifyDocument("Hello world!");
+        assertEquals(documentPage.accessDocument(), "Hello world!");
     }
 
 }