Skip to content

Commit 7d7e254

Browse files
Mark Selendroid AutomationName as deprecated (#1198)
1 parent ac67237 commit 7d7e254

File tree

5 files changed

+7
-11
lines changed

5 files changed

+7
-11
lines changed

src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.appium.java_client.pagefactory.bys.builder;
1818

1919
import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST;
20-
import static io.appium.java_client.remote.AutomationName.SELENDROID;
2120
import static io.appium.java_client.remote.MobilePlatform.ANDROID;
2221
import static io.appium.java_client.remote.MobilePlatform.IOS;
2322
import static io.appium.java_client.remote.MobilePlatform.WINDOWS;

src/main/java/io/appium/java_client/remote/AutomationName.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
public interface AutomationName {
2121
String APPIUM = "Appium";
22+
@Deprecated
2223
String SELENDROID = "Selendroid";
2324
String IOS_XCUI_TEST = "XCuiTest";
2425
String ANDROID_UIAUTOMATOR2 = "UIAutomator2";

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@
88
public class AndroidApp implements ExtendedApp {
99

1010
public static String ANDROID_DEFAULT_WIDGET_LOCATOR = "SOME_ANDROID_DEFAULT_LOCATOR";
11-
public static String ANDROID_SELENDROID_WIDGET_LOCATOR = "SOME_SELENDROID_DEFAULT_LOCATOR";
1211

1312
public static String ANDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_ANDROID_EXTERNALLY_DEFINED_LOCATOR";
14-
public static String SELENDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_SELENDROID_EXTERNALLY_DEFINED_LOCATOR";
1513

1614
@AndroidFindBy(uiAutomator = "SOME_ANDROID_DEFAULT_LOCATOR")
1715
private DefaultAndroidWidget singleAndroidWidget;
@@ -20,35 +18,35 @@ public class AndroidApp implements ExtendedApp {
2018
private List<DefaultAndroidWidget> multipleAndroidWidgets;
2119

2220
/**
23-
* This class is annotated by {@link AndroidFindBy} and @{@link SelendroidFindBy}.
21+
* This class is annotated by {@link AndroidFindBy}
2422
* This field was added to check that locator is created correctly according to current platform
2523
* and current automation.
2624
*/
2725
private AnnotatedAndroidWidget singleAnnotatedAndroidWidget;
2826

2927
/**
30-
* This class is annotated by {@link AndroidFindBy} and @{@link SelendroidFindBy}.
28+
* This class is annotated by {@link AndroidFindBy}
3129
* This field was added to check that locator is created correctly according to current platform
3230
* and current automation.
3331
*/
3432
private List<AnnotatedAndroidWidget> multipleAnnotatedAndroidWidgets;
3533

3634
/**
37-
* This class is not annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}.
35+
* This class is not annotated by {@link AndroidFindBy}
3836
* But the superclass is annotated by these annotations. This field was added to check that locator is
3937
* created correctly according to current platform and current automation.
4038
*/
4139
private ExtendedAndroidWidget singleExtendedAndroidWidget;
4240

4341
/**
44-
* This class is not annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}.
42+
* This class is not annotated by {@link AndroidFindBy}
4543
* But the superclass is annotated by these annotations. This field was added to check that locator is
4644
* created correctly according to current platform and current automation.
4745
*/
4846
private List<ExtendedAndroidWidget> multipleExtendedAndroidWidgets;
4947

5048
/**
51-
* The superclass is annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}.
49+
* The superclass is annotated by {@link AndroidFindBy}
5250
* However there is the field which is annotated by this annotations.
5351
* This field was added to check that locator is
5452
* created correctly according to current platform and current automation and
@@ -58,7 +56,7 @@ public class AndroidApp implements ExtendedApp {
5856
private ExtendedAndroidWidget singleOverriddenAndroidWidget;
5957

6058
/**
61-
* The superclass is annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}.
59+
* The superclass is annotated by {@link AndroidFindBy}
6260
* However there is the field which is annotated by this annotations.
6361
* This field was added to check that locator is
6462
* created correctly according to current platform and current automation and

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
@AndroidFindBy(uiAutomator = "SOME_ROOT_LOCATOR")
77
public class AnnotatedAndroidWidget extends DefaultAndroidWidget {
88
public static String ANDROID_ROOT_WIDGET_LOCATOR = "SOME_ROOT_LOCATOR";
9-
public static String SELENDROID_ROOT_WIDGET_LOCATOR = "SELENDROID_SOME_ROOT_LOCATOR";
109

1110
protected AnnotatedAndroidWidget(WebElement element) {
1211
super(element);

src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
public class DefaultAndroidWidget extends DefaultStubWidget {
1010

1111
public static String ANDROID_SUB_WIDGET_LOCATOR = "SOME_SUB_LOCATOR";
12-
public static String SELENDROID_SUB_WIDGET_LOCATOR = "SELENDROID_SOME_SUB_LOCATOR";
1312

1413
@AndroidFindBy(uiAutomator = "SOME_SUB_LOCATOR")
1514
private DefaultAndroidWidget singleWidget;

0 commit comments

Comments
 (0)