Skip to content

Commit c53ca79

Browse files
JonahssJonahss
committed
Merge pull request #98 from prattpratt/master
Update all tests to use constants from MobilePlatform and MobileBrowserType
2 parents 6e017c5 + f84cded commit c53ca79

File tree

11 files changed

+131
-118
lines changed

11 files changed

+131
-118
lines changed

‎src/main/java/io/appium/java_client/pagefactory/AppiumAnnotations.java‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.appium.java_client.pagefactory;
22

3+
import static io.appium.java_client.remote.MobilePlatform.*;
34
import io.appium.java_client.MobileBy;
45

56
import java.lang.annotation.Annotation;
@@ -28,9 +29,6 @@ class AppiumAnnotations extends Annotations{
2829
}
2930
};
3031
private final static Class<?>[] DEFAULT_ANNOTATION_METHOD_ARGUMENTS = new Class<?>[] {};
31-
private final static String ANDROID_PLATFORM = "Android";
32-
private final static String IOS_PLATFORM = "iOS";
33-
3432
private static List<String> getMethodNames(Method[] methods) {
3533
List<String> names = new ArrayList<String>();
3634
for (Method m : methods) {
@@ -168,9 +166,9 @@ private void assertValidAnnotations() {
168166
}
169167

170168
private static Method[] prepareAnnotationMethods(
171-
Class<? extends Annotation> annotation) {
169+
Class<? extends Annotation> annotation) {
172170
List<String> targeAnnotationMethodNamesList = getMethodNames(annotation.getDeclaredMethods());
173-
targeAnnotationMethodNamesList.removeAll(METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ);
171+
targeAnnotationMethodNamesList.removeAll(METHODS_TO_BE_EXCLUDED_WHEN_ANNOTATION_IS_READ);
174172
Method[] result = new Method[targeAnnotationMethodNamesList.size()];
175173
for (String methodName: targeAnnotationMethodNamesList){
176174
try {
@@ -180,7 +178,7 @@ private static Method[] prepareAnnotationMethods(
180178
} catch (SecurityException e) {
181179
throw new RuntimeException(e);
182180
}
183-
}
181+
}
184182
return result;
185183
}
186184

@@ -235,26 +233,26 @@ public By buildBy() {
235233

236234
AndroidFindBy androidBy = mobileField
237235
.getAnnotation(AndroidFindBy.class);
238-
if (androidBy != null && ANDROID_PLATFORM.toUpperCase().equals(platform)) {
236+
if (androidBy != null && ANDROID.toUpperCase().equals(platform)) {
239237
return getMobileBy(androidBy, getFilledValue(androidBy));
240238
}
241239

242240
AndroidFindBys androidBys = mobileField
243241
.getAnnotation(AndroidFindBys.class);
244-
if (androidBys != null && ANDROID_PLATFORM.toUpperCase().equals(platform)) {
242+
if (androidBys != null && ANDROID.toUpperCase().equals(platform)) {
245243
return getChainedMobileBy(androidBys.value());
246244
}
247245

248246
iOSFindBy iOSBy = mobileField.getAnnotation(iOSFindBy.class);
249-
if (iOSBy != null && IOS_PLATFORM.toUpperCase().equals(platform)) {
247+
if (iOSBy != null && IOS.toUpperCase().equals(platform)) {
250248
return getMobileBy(iOSBy, getFilledValue(iOSBy));
251249
}
252250

253251
iOSFindBys iOSBys = mobileField.getAnnotation(iOSFindBys.class);
254-
if (iOSBys != null && IOS_PLATFORM.toUpperCase().equals(platform)) {
252+
if (iOSBys != null && IOS.toUpperCase().equals(platform)) {
255253
return getChainedMobileBy(iOSBys.value());
256254
}
257-
255+
258256
return super.buildBy();
259257
}
260258

‎src/test/java/io/appium/java_client/AccessibilityIdTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.junit.Assert.assertNotNull;
44
import static org.junit.Assert.assertTrue;
55
import io.appium.java_client.remote.MobileCapabilityType;
6+
import io.appium.java_client.remote.MobilePlatform;
67

78
import java.io.File;
89
import java.net.URL;
@@ -28,7 +29,7 @@ public void setup() throws Exception {
2829
DesiredCapabilities capabilities = new DesiredCapabilities();
2930
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
3031
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
31-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
32+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
3233
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
3334
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
3435
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);

‎src/test/java/io/appium/java_client/AndroidGestureTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package io.appium.java_client;
1919

2020
import io.appium.java_client.remote.MobileCapabilityType;
21+
import io.appium.java_client.remote.MobilePlatform;
22+
2123
import org.junit.After;
2224
import org.junit.Before;
2325
import org.junit.Test;
@@ -44,7 +46,7 @@ public void setup() throws Exception {
4446
DesiredCapabilities capabilities = new DesiredCapabilities();
4547
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
4648
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
47-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
49+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
4850
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
4951
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
5052
}

‎src/test/java/io/appium/java_client/AndroidUIAutomatorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import static org.junit.Assert.assertEquals;
44
import static org.junit.Assert.assertTrue;
55
import io.appium.java_client.remote.MobileCapabilityType;
6+
import io.appium.java_client.remote.MobilePlatform;
67

78
import java.io.File;
89
import java.net.URL;
@@ -28,7 +29,7 @@ public void setup() throws Exception {
2829
DesiredCapabilities capabilities = new DesiredCapabilities();
2930
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
3031
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
31-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
32+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
3233
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
3334
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);
3435
}

‎src/test/java/io/appium/java_client/ContextTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
import static org.junit.Assert.assertEquals;
2121
import io.appium.java_client.remote.MobileCapabilityType;
22+
import io.appium.java_client.remote.MobilePlatform;
2223

2324
import java.io.File;
2425
import java.net.URL;
@@ -42,7 +43,7 @@ public void setup() throws Exception {
4243
DesiredCapabilities capabilities = new DesiredCapabilities();
4344
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
4445
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
45-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
46+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
4647
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
4748
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
4849
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);

‎src/test/java/io/appium/java_client/IosUIAutomationTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.appium.java_client;
22

33
import io.appium.java_client.remote.MobileCapabilityType;
4+
import io.appium.java_client.remote.MobilePlatform;
5+
46
import org.junit.After;
57
import org.junit.Before;
68
import org.junit.Test;
@@ -27,7 +29,7 @@ public void setup() throws Exception {
2729
DesiredCapabilities capabilities = new DesiredCapabilities();
2830
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
2931
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
30-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
32+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
3133
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
3234
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
3335
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);

‎src/test/java/io/appium/java_client/MobileDriverAndroidTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package io.appium.java_client;
1919

2020
import io.appium.java_client.remote.MobileCapabilityType;
21+
import io.appium.java_client.remote.MobilePlatform;
22+
2123
import org.apache.commons.codec.binary.Base64;
2224
import org.junit.After;
2325
import org.junit.Before;
@@ -43,7 +45,7 @@ public void setup() throws Exception {
4345
DesiredCapabilities capabilities = new DesiredCapabilities();
4446
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
4547
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "Android Emulator");
46-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "Android");
48+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID);
4749
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
4850
capabilities.setCapability(MobileCapabilityType.NEW_COMMAND_TIMEOUT, 120);
4951
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);

‎src/test/java/io/appium/java_client/MobileDriverIOSTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
import io.appium.java_client.remote.HideKeyboardStrategy;
2121
import io.appium.java_client.remote.MobileCapabilityType;
22+
import io.appium.java_client.remote.MobilePlatform;
23+
2224
import org.junit.After;
2325
import org.junit.Before;
2426
import org.junit.Test;
@@ -45,7 +47,7 @@ public void setup() throws Exception {
4547
DesiredCapabilities capabilities = new DesiredCapabilities();
4648
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
4749
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
48-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
50+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
4951
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
5052
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
5153
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);

‎src/test/java/io/appium/java_client/iOSGestureTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package io.appium.java_client;
1919

2020
import io.appium.java_client.remote.MobileCapabilityType;
21+
import io.appium.java_client.remote.MobilePlatform;
2122

2223
import java.io.File;
2324
import java.net.URL;
@@ -45,7 +46,7 @@ public void setup() throws Exception {
4546
DesiredCapabilities capabilities = new DesiredCapabilities();
4647
capabilities.setCapability(MobileCapabilityType.BROWSER_NAME, "");
4748
capabilities.setCapability(MobileCapabilityType.PLATFORM_VERSION, "7.1");
48-
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, "iOS");
49+
capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.IOS);
4950
capabilities.setCapability(MobileCapabilityType.DEVICE_NAME, "iPhone Simulator");
5051
capabilities.setCapability(MobileCapabilityType.APP, app.getAbsolutePath());
5152
driver = new AppiumDriver(new URL("http://127.0.0.1:4723/wd/hub"), capabilities);

0 commit comments

Comments
 (0)