fixed tests to comply with updated appium desired capabilities

appium · Jun 16, 2014 · 7772a4c · 7772a4c
1 parent e25d427
commit 7772a4c
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 22 deletions.
diff --git a/src/test/java/io/appium/java_client/AccessibilityIdTest.java b/src/test/java/io/appium/java_client/AccessibilityIdTest.java
@@ -11,8 +11,8 @@
 import java.net.URL;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Test context-related features
@@ -27,9 +27,9 @@ public void setup() throws Exception {
     File app = new File(appDir, "UICatalog.app.zip");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability(CapabilityType.VERSION, "7.1");
-    capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-    capabilities.setCapability("device", "iPhone Simulator");
+    capabilities.setCapability("platformVersion", "7.1");
+    capabilities.setCapability("platformName", "iOS");
+    capabilities.setCapability("deviceName", "iPhone Simulator");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }
@@ -48,7 +48,7 @@ public void findElementTest() {
   @Test
   public void findElementsTest() {
     List<WebElement> elements = driver.findElementsByAccessibilityId("UICatalog");
-    assertEquals(1, elements.size());
+    assertTrue(elements.size() > 0);
   }
 
   @Test
@@ -60,6 +60,6 @@ public void MobileElementByTest() {
   @Test
   public void MobileElementsByTest() {
     List<WebElement> elements = driver.findElements(MobileBy.AccessibilityId("UICatalog"));
-    assertEquals(1, elements.size());
+    assertTrue(elements.size() > 0);
   }
 }
diff --git a/src/test/java/io/appium/java_client/AndroidGestureTest.java b/src/test/java/io/appium/java_client/AndroidGestureTest.java
@@ -38,7 +38,8 @@ public void setup() throws Exception {
     File app = new File(appDir, "ApiDemos-debug.apk");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability("device", "Android");
+    capabilities.setCapability("deviceName", "Android Emulator");
+    capabilities.setCapability("platformName", "Android");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }

diff --git a/src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java b/src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java
@@ -27,7 +27,8 @@ public void setup() throws Exception {
     File app = new File(appDir, "ApiDemos-debug.apk");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability("device", "Android");
+    capabilities.setCapability("deviceName", "Android Emulator");
+    capabilities.setCapability("platformName", "Android");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }

diff --git a/src/test/java/io/appium/java_client/ContextTest.java b/src/test/java/io/appium/java_client/ContextTest.java
@@ -41,9 +41,9 @@ public void setup() throws Exception {
     File app = new File(appDir, "WebViewApp.app.zip");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability(CapabilityType.VERSION, "7.1");
-    capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-    capabilities.setCapability("device", "iPhone Simulator");
+    capabilities.setCapability("platformVersion", "7.1");
+    capabilities.setCapability("platformName", "iOS");
+    capabilities.setCapability("deviceName", "iPhone Simulator");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }

diff --git a/src/test/java/io/appium/java_client/IosUIAutomationTest.java b/src/test/java/io/appium/java_client/IosUIAutomationTest.java
@@ -26,9 +26,9 @@ public void setup() throws Exception {
     File app = new File(appDir, "UICatalog.app.zip");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability(CapabilityType.VERSION, "7.1");
-    capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-    capabilities.setCapability("device", "iPhone Simulator");
+    capabilities.setCapability("platformVersion", "7.1");
+    capabilities.setCapability("platformName", "iOS");
+    capabilities.setCapability("deviceName", "iPhone Simulator");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }

diff --git a/src/test/java/io/appium/java_client/MobileDriverAndroidTest.java b/src/test/java/io/appium/java_client/MobileDriverAndroidTest.java
@@ -42,7 +42,8 @@ public void setup() throws Exception {
     File app = new File(appDir, "ApiDemos-debug.apk");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability("device", "Android");
+    capabilities.setCapability("deviceName", "Android Emulator");
+    capabilities.setCapability("platformName", "Android");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }

diff --git a/src/test/java/io/appium/java_client/MobileDriverIOSTest.java b/src/test/java/io/appium/java_client/MobileDriverIOSTest.java
@@ -20,7 +20,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import org.openqa.selenium.ScreenOrientation;
 import org.openqa.selenium.remote.CapabilityType;
 import org.openqa.selenium.remote.DesiredCapabilities;
@@ -44,9 +43,9 @@ public void setup() throws Exception {
     File app = new File(appDir, "UICatalog.app.zip");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability(CapabilityType.VERSION, "7.1");
-    capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-    capabilities.setCapability("device", "iPhone Simulator");
+    capabilities.setCapability("platformVersion", "7.1");
+    capabilities.setCapability("platformName", "iOS");
+    capabilities.setCapability("deviceName", "iPhone Simulator");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }

diff --git a/src/test/java/io/appium/java_client/iOSGestureTest.java b/src/test/java/io/appium/java_client/iOSGestureTest.java
@@ -43,9 +43,9 @@ public void setup() throws Exception {
     File app = new File(appDir, "TestApp.app.zip");
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(CapabilityType.BROWSER_NAME, "");
-    capabilities.setCapability(CapabilityType.VERSION, "7.1");
-    capabilities.setCapability(CapabilityType.PLATFORM, "Mac");
-    capabilities.setCapability("device", "iPhone Simulator");
+    capabilities.setCapability("platformVersion", "7.1");
+    capabilities.setCapability("platformName", "iOS");
+    capabilities.setCapability("deviceName", "iPhone Simulator");
     capabilities.setCapability("app", app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
   }