Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark Selendroid AutomationName as deprecated #1198

Merged
merged 1 commit into from
Aug 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

public interface AutomationName {
String APPIUM = "Appium";
@Deprecated
String SELENDROID = "Selendroid";
String IOS_XCUI_TEST = "XCuiTest";
String ANDROID_UIAUTOMATOR2 = "UIAutomator2";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -20,35 +18,35 @@ public class AndroidApp implements ExtendedApp {
private List<DefaultAndroidWidget> 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<AnnotatedAndroidWidget> 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<ExtendedAndroidWidget> 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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down