diff --git a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java index a401ac456..827a8ecbe 100644 --- a/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java +++ b/src/main/java/io/appium/java_client/pagefactory/bys/builder/AppiumByBuilder.java @@ -17,7 +17,6 @@ package io.appium.java_client.pagefactory.bys.builder; import static io.appium.java_client.remote.AutomationName.IOS_XCUI_TEST; -import static io.appium.java_client.remote.AutomationName.SELENDROID; import static io.appium.java_client.remote.MobilePlatform.ANDROID; import static io.appium.java_client.remote.MobilePlatform.IOS; import static io.appium.java_client.remote.MobilePlatform.WINDOWS; diff --git a/src/main/java/io/appium/java_client/remote/AutomationName.java b/src/main/java/io/appium/java_client/remote/AutomationName.java index 828ee9085..ce85512c1 100644 --- a/src/main/java/io/appium/java_client/remote/AutomationName.java +++ b/src/main/java/io/appium/java_client/remote/AutomationName.java @@ -19,6 +19,7 @@ public interface AutomationName { String APPIUM = "Appium"; + @Deprecated String SELENDROID = "Selendroid"; String IOS_XCUI_TEST = "XCuiTest"; String ANDROID_UIAUTOMATOR2 = "UIAutomator2"; diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java index bc9897e54..e33832265 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AndroidApp.java @@ -8,10 +8,8 @@ public class AndroidApp implements ExtendedApp { public static String ANDROID_DEFAULT_WIDGET_LOCATOR = "SOME_ANDROID_DEFAULT_LOCATOR"; - public static String ANDROID_SELENDROID_WIDGET_LOCATOR = "SOME_SELENDROID_DEFAULT_LOCATOR"; public static String ANDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_ANDROID_EXTERNALLY_DEFINED_LOCATOR"; - public static String SELENDROID_EXTERNALLY_DEFINED_WIDGET_LOCATOR = "SOME_SELENDROID_EXTERNALLY_DEFINED_LOCATOR"; @AndroidFindBy(uiAutomator = "SOME_ANDROID_DEFAULT_LOCATOR") private DefaultAndroidWidget singleAndroidWidget; @@ -20,35 +18,35 @@ public class AndroidApp implements ExtendedApp { private List multipleAndroidWidgets; /** - * This class is annotated by {@link AndroidFindBy} and @{@link SelendroidFindBy}. + * This class is annotated by {@link AndroidFindBy} * This field was added to check that locator is created correctly according to current platform * and current automation. */ private AnnotatedAndroidWidget singleAnnotatedAndroidWidget; /** - * This class is annotated by {@link AndroidFindBy} and @{@link SelendroidFindBy}. + * This class is annotated by {@link AndroidFindBy} * This field was added to check that locator is created correctly according to current platform * and current automation. */ private List multipleAnnotatedAndroidWidgets; /** - * This class is not annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}. + * This class is not annotated by {@link AndroidFindBy} * But the superclass is annotated by these annotations. This field was added to check that locator is * created correctly according to current platform and current automation. */ private ExtendedAndroidWidget singleExtendedAndroidWidget; /** - * This class is not annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}. + * This class is not annotated by {@link AndroidFindBy} * But the superclass is annotated by these annotations. This field was added to check that locator is * created correctly according to current platform and current automation. */ private List multipleExtendedAndroidWidgets; /** - * The superclass is annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}. + * The superclass is annotated by {@link AndroidFindBy} * However there is the field which is annotated by this annotations. * This field was added to check that locator is * created correctly according to current platform and current automation and @@ -58,7 +56,7 @@ public class AndroidApp implements ExtendedApp { private ExtendedAndroidWidget singleOverriddenAndroidWidget; /** - * The superclass is annotated by {@link AndroidFindBy} and {@link SelendroidFindBy}. + * The superclass is annotated by {@link AndroidFindBy} * However there is the field which is annotated by this annotations. * This field was added to check that locator is * created correctly according to current platform and current automation and diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java index e58e14a2b..b64b3361d 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/AnnotatedAndroidWidget.java @@ -6,7 +6,6 @@ @AndroidFindBy(uiAutomator = "SOME_ROOT_LOCATOR") public class AnnotatedAndroidWidget extends DefaultAndroidWidget { public static String ANDROID_ROOT_WIDGET_LOCATOR = "SOME_ROOT_LOCATOR"; - public static String SELENDROID_ROOT_WIDGET_LOCATOR = "SELENDROID_SOME_ROOT_LOCATOR"; protected AnnotatedAndroidWidget(WebElement element) { super(element); diff --git a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java index 59e9dc253..1fcd02771 100644 --- a/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java +++ b/src/test/java/io/appium/java_client/pagefactory_tests/widget/tests/android/DefaultAndroidWidget.java @@ -9,7 +9,6 @@ public class DefaultAndroidWidget extends DefaultStubWidget { public static String ANDROID_SUB_WIDGET_LOCATOR = "SOME_SUB_LOCATOR"; - public static String SELENDROID_SUB_WIDGET_LOCATOR = "SELENDROID_SOME_SUB_LOCATOR"; @AndroidFindBy(uiAutomator = "SOME_SUB_LOCATOR") private DefaultAndroidWidget singleWidget;