Thanks to visit codestin.com
Credit goes to github.com

Skip to content

#162 fix #167

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.

Sign up for GitHub

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

Merged
Jonahss merged 1 commit into from
Mar 23, 2015
Merged

#162 fix #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 39 additions & 3 deletions src/main/java/io/appium/java_client/AppiumDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,43 @@ protected static Capabilities substituteMobilePlatform(
return dc;
}

/**
public MobileElement findElement(By by){
return (MobileElement) super.findElement(by);
}

public MobileElement findElementById(String using){
return (MobileElement) super.findElementById(using);
}

public MobileElement findElementByClassName(String using){
return (MobileElement) super.findElementByClassName(using);
}

public MobileElement findElementByName(String using){
return (MobileElement) super.findElementByName(using);
}

public MobileElement findElementByTagName(String using){
return (MobileElement) super.findElementByTagName(using);
}

public MobileElement findElementByCssSelector(String using){
return (MobileElement) super.findElementByCssSelector(using);
}

public MobileElement findElementByLinkText(String using){
return (MobileElement) super.findElementByLinkText(using);
}

public MobileElement findElementByPartialLinkText(String using){
return (MobileElement) super.findElementByPartialLinkText(using);
}

public MobileElement findElementByXPath(String using){
return (MobileElement) super.findElementByXPath(using);
}

/**
* @param param
* is a parameter name
* @param value
Expand Down Expand Up @@ -572,8 +608,8 @@ public ScreenOrientation getOrientation() {
}

@Override
public WebElement findElementByAccessibilityId(String using) {
return findElement("accessibility id", using);
public MobileElement findElementByAccessibilityId(String using) {
return (MobileElement) findElement("accessibility id", using);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/appium/java_client/FindsByAccessibilityId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import java.util.List;

public interface FindsByAccessibilityId {
WebElement findElementByAccessibilityId(String using);
<T extends WebElement> T findElementByAccessibilityId(String using);

List<WebElement> findElementsByAccessibilityId(String using);
}
5 changes: 3 additions & 2 deletions src/main/java/io/appium/java_client/FindsByAndroidUIAutomator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import java.util.List;

public interface FindsByAndroidUIAutomator {
WebElement findElementByAndroidUIAutomator(String using);

List<WebElement> findElementsByAndroidUIAutomator(String using);
<T extends WebElement> T findElementByAndroidUIAutomator(String using);

List<WebElement> findElementsByAndroidUIAutomator(String using);
}
5 changes: 3 additions & 2 deletions src/main/java/io/appium/java_client/FindsByIosUIAutomation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
import java.util.List;

public interface FindsByIosUIAutomation {
WebElement findElementByIosUIAutomation(String using);

List<WebElement> findElementsByIosUIAutomation(String using);
<T extends WebElement> T findElementByIosUIAutomation(String using);

List<WebElement> findElementsByIosUIAutomation(String using);
}
40 changes: 36 additions & 4 deletions src/main/java/io/appium/java_client/MobileElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ public List<WebElement> findElements(By by) {
return by.findElements(this);
}

public WebElement findElement(By by) {
return by.findElement(this);
}

public WebElement findElementByAccessibilityId(String using) {
return findElement("accessibility id", using);
}
Expand Down Expand Up @@ -79,4 +75,40 @@ public void swipe(SwipeElementDirection direction, int offsetFromStartBorder,
direction.swipe((AppiumDriver) parent, this, offsetFromStartBorder,
offsetFromEndBorder, duration);
}

public MobileElement findElement(By by){
return (MobileElement) super.findElements(by);
}

public MobileElement findElementById(String using){
return (MobileElement) super.findElementById(using);
}

public MobileElement findElementByClassName(String using){
return (MobileElement) super.findElementByClassName(using);
}

public MobileElement findElementByName(String using){
return (MobileElement) super.findElementByName(using);
}

public MobileElement findElementByTagName(String using){
return (MobileElement) super.findElementByTagName(using);
}

public MobileElement findElementByCssSelector(String using){
return (MobileElement) super.findElementByCssSelector(using);
}

public MobileElement findElementByLinkText(String using){
return (MobileElement) super.findElementByLinkText(using);
}

public MobileElement findElementByPartialLinkText(String using){
return (MobileElement) super.findElementByPartialLinkText(using);
}

public MobileElement findElementByXPath(String using){
return (MobileElement) super.findElementByXPath(using);
}
}
4 changes: 2 additions & 2 deletions src/main/java/io/appium/java_client/android/AndroidDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ public void ignoreUnimportantViews(Boolean compress) {
}

@Override
public WebElement findElementByAndroidUIAutomator(String using) {
return findElement("-android uiautomator", using);
public AndroidElement findElementByAndroidUIAutomator(String using) {
return (AndroidElement) findElement("-android uiautomator", using);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/appium/java_client/android/AndroidElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public class AndroidElement extends MobileElement implements
FindsByAndroidUIAutomator {

@Override
public WebElement findElementByAndroidUIAutomator(String using) {
return findElement("-android uiautomator", using);
public AndroidElement findElementByAndroidUIAutomator(String using) {
return (AndroidElement) findElement("-android uiautomator", using);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/appium/java_client/ios/GetsNamedTextField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public interface GetsNamedTextField {
* accessiblity id of TextField
* @return The textfield with the given accessibility id
*/
public WebElement getNamedTextField(String name);
public <T extends IOSElement> T getNamedTextField(String name);

}
10 changes: 5 additions & 5 deletions src/main/java/io/appium/java_client/ios/IOSDriver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,17 @@ public void shake() {
* @see GetsNamedTextField#getNamedTextField(String)
*/
@Override
public WebElement getNamedTextField(String name) {
MobileElement element = (MobileElement) findElementByAccessibilityId(name);
public IOSElement getNamedTextField(String name) {
IOSElement element = (IOSElement) findElementByAccessibilityId(name);
if (element.getTagName() != "TextField") {
return element.findElementByAccessibilityId(name);
return (IOSElement) element.findElementByAccessibilityId(name);
}
return element;
}

@Override
public WebElement findElementByIosUIAutomation(String using) {
return findElement("-ios uiautomation", using);
public IOSElement findElementByIosUIAutomation(String using) {
return (IOSElement) findElement("-ios uiautomation", using);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/appium/java_client/ios/IOSElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
public class IOSElement extends MobileElement implements FindsByIosUIAutomation, ScrollsTo {

@Override
public WebElement findElementByIosUIAutomation(String using) {
return findElement("-ios uiautomation", using);
public IOSElement findElementByIosUIAutomation(String using) {
return (IOSElement) findElement("-ios uiautomation", using);
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/io/appium/java_client/android/AndroidAccessibilityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static org.junit.Assert.assertTrue;
import io.appium.java_client.AppiumDriver;
import io.appium.java_client.MobileBy;
import io.appium.java_client.MobileElement;
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.remote.MobileCapabilityType;

Expand Down Expand Up @@ -44,7 +45,8 @@ public void findElementsTest() {

@Test
public void findElementTest() {
WebElement element = driver.findElementByAccessibilityId("Accessibility");
//WebElement element =
MobileElement element = driver.findElementByAccessibilityId("Accessibility");
assertNotNull(element);
}

Expand Down
16 changes: 8 additions & 8 deletions src/test/java/io/appium/java_client/android/AndroidGestureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,37 +96,37 @@ public void TapSingleFingerTest() throws InterruptedException {
@Test
public void elementGestureTest(){
driver.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS);
MobileElement e = (MobileElement) driver.findElement(MobileBy.AccessibilityId("App"));
MobileElement e = driver.findElement(MobileBy.AccessibilityId("App"));
e.tap(1, 1500);
System.out.println("tap");
MobileElement e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
MobileElement e2 = driver.findElementByClassName("android.widget.TextView");
e2.zoom();
System.out.println("zoom");
e2.swipe(SwipeElementDirection.RIGHT,1000);
System.out.println("RIGHT");

e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
e2 = driver.findElementByClassName("android.widget.TextView");
e2.swipe(SwipeElementDirection.RIGHT, 10, 20, 1000);
System.out.println("RIGHT Left border + 10 Right border - 20");

e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
e2 = driver.findElementByClassName("android.widget.TextView");
e2.swipe(SwipeElementDirection.LEFT, 1000);
System.out.println("LEFT");

e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
e2 = driver.findElementByClassName("android.widget.TextView");
e2.swipe(SwipeElementDirection.LEFT, 10, 20, 1000);
System.out.println("LEFT Right border - 10 Left border + 20");

driver.sendKeyEvent(AndroidKeyCode.BACK);
e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
e2 = driver.findElementByClassName("android.widget.TextView");
e2.swipe(SwipeElementDirection.DOWN,1000);
System.out.println("DOWN");

e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
e2 = driver.findElementByClassName("android.widget.TextView");
e2.swipe(SwipeElementDirection.DOWN, 10, 20, 1000);
System.out.println("DOWN Top - 10 Bottom + 20");

e2 = (MobileElement) driver.findElementByClassName("android.widget.TextView");
e2 = driver.findElementByClassName("android.widget.TextView");
e2.swipe(SwipeElementDirection.UP,1000);
System.out.println("UP");

Expand Down
12 changes: 6 additions & 6 deletions src/test/java/io/appium/java_client/ios/IOSDriverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,25 @@ public void resetTest() {

@Test
public void namedTextFieldTest() {
MobileElement element = (MobileElement)driver.findElementByAccessibilityId("Text Fields, AAPLTextFieldViewController");
MobileElement element = driver.findElementByAccessibilityId("Text Fields, AAPLTextFieldViewController");
element.click();
element = (MobileElement)driver.getNamedTextField("DEFAULT");
element = driver.getNamedTextField("DEFAULT");
((IOSElement) element).setValue("Grace Hopper");
assertEquals("Grace Hopper", element.getText());
}

@Test
public void hideKeyboardWithParametersTest() {
MobileElement element = (MobileElement)driver.findElementByAccessibilityId("Text Fields, AAPLTextFieldViewController");
MobileElement element = driver.findElementByAccessibilityId("Text Fields, AAPLTextFieldViewController");
element.click();
element = (MobileElement)driver.findElementByAccessibilityId("DEFAULT");
element = driver.findElementByAccessibilityId("DEFAULT");
element.click();
driver.hideKeyboard(HideKeyboardStrategy.PRESS_KEY, "Done");
}

@Test
public void scrollToTest() {
MobileElement searchBar = (MobileElement) driver.findElementByName("Search Bars");
MobileElement searchBar = driver.findElementByName("Search Bars");
Point before = searchBar.getLocation();
driver.scrollTo("Search Ba");
Point after = searchBar.getLocation();
Expand All @@ -107,7 +107,7 @@ public void scrollToTest() {

@Test
public void scrollToExactTest() {
MobileElement searchBar = (MobileElement) driver.findElementByName("Search Bars");
MobileElement searchBar = driver.findElementByName("Search Bars");
Point before = searchBar.getLocation();
driver.scrollToExact("Search Bars");
Point after = searchBar.getLocation();
Expand Down