fix sample tests for Windows, fix global setup.

rename ApplicationPlatform to PlatformName for consistency

Author: mialeska

src/main/java/aquality/appium/application/Application.java

@@ -35,10 +35,10 @@ public AppiumDriver getDriver() {
     }
 
     /**
-     * Returns platform of current application
+     * Returns name of current platform
      * @return name
      */
-    public final ApplicationPlatform geApplicationPlatform() {
-        return configuration.getApplicationProfile().getApplicationName();
+    public final PlatformName getPlatformName() {
+        return configuration.getApplicationProfile().getPlatformName();
     }
 }

src/main/java/aquality/appium/application/ApplicationPlatform.java renamed to src/main/java/aquality/appium/application/PlatformName.java

@@ -1,6 +1,7 @@
 package aquality.appium.application;
 
-public enum  ApplicationPlatform {
+public enum PlatformName {
     ANDROID,
-    IOS
+    IOS,
+    WINDOWS
 }

src/main/java/aquality/appium/configuration/IApplicationProfile.java

@@ -1,13 +1,13 @@
 package aquality.appium.configuration;
 
-import aquality.appium.application.ApplicationPlatform;
+import aquality.appium.application.PlatformName;
 import aquality.appium.configuration.driversettings.IDriverSettings;
 
 import java.net.URL;
 
 public interface IApplicationProfile {
 
-    ApplicationPlatform getApplicationName();
+    PlatformName getPlatformName();
 
     boolean isRemote();
 

src/main/java/aquality/appium/configuration/driversettings/IDriverSettings.java

@@ -1,6 +1,6 @@
 package aquality.appium.configuration.driversettings;
 
-import aquality.appium.application.ApplicationPlatform;
+import aquality.appium.application.PlatformName;
 import aquality.appium.utils.JsonFile;
 import org.openqa.selenium.Capabilities;
 
@@ -16,7 +16,7 @@ public interface IDriverSettings {
 
     String getDownloadDirCapabilityKey();
 
-    ApplicationPlatform getApplicationPlatform();
+    PlatformName getPlatformName();
 
     JsonFile getSettingsFile();
 

src/test/java/samples/BaseTest.java

@@ -4,27 +4,24 @@
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 
-import java.io.IOException;
-import java.net.MalformedURLException;
 import java.net.URL;
 
 public abstract class BaseTest {
     private static AppiumDriverLocalService service;
 
     @BeforeSuite
-    public void globalSetup () throws IOException {
-        /* todo: fix
+    public void globalSetup () {
         service = AppiumDriverLocalService.buildDefaultService();
-        service.start();*/
+        service.start();
     }
 
     @AfterSuite
     public void globalTearDown () {
-        //service.stop();
+        service.stop();
     }
 
-    public URL getServiceUrl () throws MalformedURLException {
-        return new URL(String.format("http://%1$s:%2$s/wd/hub", "0.0.0.0", "4723"));
-        //return service.getUrl();
+    public URL getServiceUrl () {
+        // todo: this is for remote run return new URL(String.format("http://%1$s:%2$s/wd/hub", "127.0.0.1", "4723"));
+        return service.getUrl();
     }
 }

src/test/java/samples/windows/WindowsDesktopAppTest.java

@@ -15,7 +15,7 @@ public class WindowsDesktopAppTest extends BaseTest {
     public static WindowsDriver<?> driver;
 
     @BeforeTest
-    public void setup() throws MalformedURLException {
+    public void setup() {
         DesiredCapabilities caps = new DesiredCapabilities();
         caps.setCapability("platformVersion", "10");
         caps.setCapability("platformName", "Windows");
@@ -32,10 +32,10 @@ public void tearDown() {
 
     @Test
     public void test() {
-        driver.findElementByName("One").click();
-        driver.findElementByName("Plus").click();
-        driver.findElementByName("Two").click();
-        driver.findElementByName("Equals").click();
-        Assert.assertEquals(driver.findElementByAccessibilityId("CalculatorResults").getText(), "Display is 3");
+        driver.findElementByXPath("//*[@AutomationId='num1Button']").click();
+        driver.findElementByAccessibilityId("plusButton").click();
+        driver.findElementByAccessibilityId("num2Button").click();
+        driver.findElementByAccessibilityId("equalButton").click();
+        Assert.assertTrue(driver.findElementByAccessibilityId("CalculatorResults").getText().endsWith("3"), "Display result is not match to expected");
     }
 }