Merge pull request #98 from prattpratt/master

Update all tests to use constants from MobilePlatform and MobileBrowserType
appium · Sep 2, 2014 · c53ca79 · c53ca79
2 parents 6e017c5 + f84cded
commit c53ca79
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 118 deletions.
diff --git a/src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java b/src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java
@@ -1,5 +1,6 @@
 package io.appium.java_client.pagefactory;
 
+import static io.appium.java_client.remote.MobilePlatform.*;
 import io.appium.java_client.MobileBy;
 
 import java.lang.annotation.Annotation;
@@ -28,9 +29,6 @@ class AppiumAnnotations extends Annotations{
 		}
 	};
 	private final static Class<?>[] DEFAULT_ANNOTATION_METHOD_ARGUMENTS = new Class<?>[] {};
-	private final static String ANDROID_PLATFORM = "Android";
-	private final static String IOS_PLATFORM = "iOS";
-
 	private static List<String> getMethodNames(Method[] methods) {
 		List<String> names = new ArrayList<String>();
 		for (Method m : methods) {
@@ -168,9 +166,9 @@ private void assertValidAnnotations() {
 	}
 
 	private static Method[] prepareAnnotationMethods(
-			Class<? extends Annotation> annotation) {		
+			Class<? extends Annotation> annotation) {
 		List<String> targeAnnotationMethodNamesList = getMethodNames(annotation.getDeclaredMethods());
-		targeAnnotationMethodNamesList.removeAll(METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ);	
+		targeAnnotationMethodNamesList.removeAll(METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ);
 		Method[] result = new Method[targeAnnotationMethodNamesList.size()];
 		for (String methodName: targeAnnotationMethodNamesList){
 			try {
@@ -180,7 +178,7 @@ private static Method[] prepareAnnotationMethods(
 			} catch (SecurityException e) {
 				throw new RuntimeException(e);
 			}
-		}		
+		}
 		return result;
 	}
 
@@ -235,26 +233,26 @@ public By buildBy() {
 
 		AndroidFindBy androidBy = mobileField
 				.getAnnotation(AndroidFindBy.class);
-		if (androidBy != null && ANDROID_PLATFORM.toUpperCase().equals(platform)) {
+		if (androidBy != null && ANDROID.toUpperCase().equals(platform)) {
 			return getMobileBy(androidBy, getFilledValue(androidBy));
 		}
 
 		AndroidFindBys androidBys = mobileField
 				.getAnnotation(AndroidFindBys.class);
-		if (androidBys != null && ANDROID_PLATFORM.toUpperCase().equals(platform)) {
+		if (androidBys != null && ANDROID.toUpperCase().equals(platform)) {
 			return getChainedMobileBy(androidBys.value());
 		}
 
 		iOSFindBy iOSBy = mobileField.getAnnotation(iOSFindBy.class);
-		if (iOSBy != null && IOS_PLATFORM.toUpperCase().equals(platform)) {
+		if (iOSBy != null && IOS.toUpperCase().equals(platform)) {
 			return getMobileBy(iOSBy, getFilledValue(iOSBy));
 		}
 
 		iOSFindBys iOSBys = mobileField.getAnnotation(iOSFindBys.class);
-		if (iOSBys != null && IOS_PLATFORM.toUpperCase().equals(platform)) {
+		if (iOSBys != null && IOS.toUpperCase().equals(platform)) {
 			return getChainedMobileBy(iOSBys.value());
 		}
-		
+
 		return super.buildBy();
 	}
 

diff --git a/src/test/java/io/appium/java_client/AccessibilityIdTest.java b/src/test/java/io/appium/java_client/AccessibilityIdTest.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
 
 import java.io.File;
 import java.net.URL;
@@ -28,7 +29,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
     capabilities.setCapability(MobileCapabilityType.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/AndroidGestureTest.java b/src/test/java/io/appium/java_client/AndroidGestureTest.java
@@ -18,6 +18,8 @@
 package io.appium.java_client;
 
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,7 +46,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
     capabilities.setCapability(MobileCapabilityType.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
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
 
 import java.io.File;
 import java.net.URL;
@@ -28,7 +29,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
     capabilities.setCapability(MobileCapabilityType.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
@@ -19,6 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
 
 import java.io.File;
 import java.net.URL;
@@ -42,7 +43,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
     capabilities.setCapability(MobileCapabilityType.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
@@ -1,6 +1,8 @@
 package io.appium.java_client;
 
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -27,7 +29,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
     capabilities.setCapability(MobileCapabilityType.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
@@ -18,6 +18,8 @@
 package io.appium.java_client;
 
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
+
 import org.apache.commons.codec.binary.Base64;
 import org.junit.After;
 import org.junit.Before;
@@ -43,7 +45,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
     capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
     capabilities.setCapability(MobileCapabilityType.NEW_COMMAND_TIMEOUT, 120);
     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
@@ -19,6 +19,8 @@
 
 import io.appium.java_client.remote.HideKeyboardStrategy;
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +47,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
     capabilities.setCapability(MobileCapabilityType.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
@@ -18,6 +18,7 @@
 package io.appium.java_client;
 
 import io.appium.java_client.remote.MobileCapabilityType;
+import io.appium.java_client.remote.MobilePlatform;
 
 import java.io.File;
 import java.net.URL;
@@ -45,7 +46,7 @@ public void setup() throws Exception {
     DesiredCapabilities capabilities = new DesiredCapabilities();
     capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
     capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
-    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
+    capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
     capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
     capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
     driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);