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.

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

Jump to bottom

#320 fix #327

Merged
merged 1 commit into from
Mar 2, 2016
Merged

#320 fix #327

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
4 changes: 4 additions & 0 deletions src/main/java/io/appium/java_client/pagefactory/Widget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,8 @@ public WebDriver getWrappedDriver() {
public WebElement getWrappedElement() {
return (WebElement) element;
}

public Widget getSelfReference() {
return this;
}
}
5 changes: 5 additions & 0 deletions src/test/java/io/appium/java_client/pagefactory_tests/widgets/AndroidOverrideWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.pagefactory.AppiumFieldDecorator;
import io.appium.java_client.pagefactory.TimeOutDuration;
import io.appium.java_client.pagefactory_tests.widgets.android.annotated.AnnotatedAndroidMovie;
import io.appium.java_client.pagefactory_tests.widgets.android.simple.AndroidMovie;
import io.appium.java_client.remote.MobileCapabilityType;
import io.appium.java_client.service.local.AppiumDriverLocalService;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -68,6 +70,7 @@ public void checkACommonWidget() {
movie.goToReview();

rottenTomatoes.checkSimpleReview();
assertTrue(movie.getSelfReference().getClass().equals(AndroidMovie.class));
}

@Override
Expand All @@ -81,6 +84,7 @@ public void checkAnAnnotatedWidget() {
movie.goToReview();

rottenTomatoes.checkAnnotatedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedAndroidMovie.class));
}


Expand All @@ -95,6 +99,7 @@ public void checkAnExtendedWidget() {
movie.goToReview();

rottenTomatoes.checkExtendedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedAndroidMovie.class));
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/io/appium/java_client/pagefactory_tests/widgets/HtmlOverrideWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import io.appium.java_client.pagefactory.AppiumFieldDecorator;
import io.appium.java_client.pagefactory.TimeOutDuration;
import io.appium.java_client.pagefactory_tests.widgets.html.annotated.AnnotatedHtmlMovie;
import io.appium.java_client.pagefactory_tests.widgets.html.simple.HtmlMovie;
import org.apache.commons.lang3.StringUtils;
import org.junit.AfterClass;
import org.junit.Before;
Expand Down Expand Up @@ -45,7 +47,7 @@ public static void beforeClass() throws Exception {
@Before
public void setUp() throws Exception {
if (driver != null)
driver.get("file:///" + new File("src/test/java/io/appium/java_client/RottenTomatoesSnapshot.html").getAbsolutePath());
driver.get( new File("src/test/java/io/appium/java_client/RottenTomatoesSnapshot.html").toURI().toString());
}

@AfterClass
Expand All @@ -65,6 +67,7 @@ public void checkACommonWidget() {
movie.goToReview();

rottenTomatoes.checkSimpleReview();
assertTrue(movie.getSelfReference().getClass().equals(HtmlMovie.class));
}

@Override
Expand All @@ -78,6 +81,7 @@ public void checkAnAnnotatedWidget() {
movie.goToReview();

rottenTomatoes.checkAnnotatedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedHtmlMovie.class));
}


Expand All @@ -92,6 +96,7 @@ public void checkAnExtendedWidget() {
movie.goToReview();

rottenTomatoes.checkExtendedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedHtmlMovie.class));
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/io/appium/java_client/pagefactory_tests/widgets/IOSOverrideWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import io.appium.java_client.ios.IOSDriver;
import io.appium.java_client.pagefactory.AppiumFieldDecorator;
import io.appium.java_client.pagefactory.TimeOutDuration;
import io.appium.java_client.pagefactory_tests.widgets.ios.annotated.AnnotatedIOSMovie;
import io.appium.java_client.pagefactory_tests.widgets.ios.simple.IOSMovie;
import io.appium.java_client.remote.MobileCapabilityType;
import io.appium.java_client.service.local.AppiumDriverLocalService;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -68,6 +70,7 @@ public void checkACommonWidget() {
movie.goToReview();

rottenTomatoes.checkSimpleReview();
assertTrue(movie.getSelfReference().getClass().equals(IOSMovie.class));
}

@Override
Expand All @@ -81,6 +84,7 @@ public void checkAnAnnotatedWidget() {
movie.goToReview();

rottenTomatoes.checkAnnotatedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedIOSMovie.class));
}


Expand All @@ -95,6 +99,7 @@ public void checkAnExtendedWidget() {
movie.goToReview();

rottenTomatoes.checkExtendedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedIOSMovie.class));
}

@Override
Expand Down
5 changes: 5 additions & 0 deletions src/test/java/io/appium/java_client/pagefactory_tests/widgets/Movie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,9 @@ protected Movie(WebElement element) {
public abstract Object getPoster();

public abstract void goToReview();

@Override
public Movie getSelfReference() {
return (Movie) super.getSelfReference();
}
}
5 changes: 5 additions & 0 deletions src/test/java/io/appium/java_client/pagefactory_tests/widgets/Movies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,9 @@ protected Movies(WebElement element) {
public abstract int getMovieCount();

public abstract Movie getMovie(int index);

@Override
public Movies getSelfReference() {
return (Movies) super.getSelfReference();
}
}
5 changes: 5 additions & 0 deletions src/test/java/io/appium/java_client/pagefactory_tests/widgets/Review.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,9 @@ protected Review(WebElement element) {
public abstract String info();

public abstract Object getPoster();

@Override
public Review getSelfReference() {
return (Review) super.getSelfReference();
}
}
5 changes: 5 additions & 0 deletions ...st/java/io/appium/java_client/pagefactory_tests/widgets/SelendroidOverrideWidgetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import io.appium.java_client.android.AndroidDriver;
import io.appium.java_client.pagefactory.AppiumFieldDecorator;
import io.appium.java_client.pagefactory.TimeOutDuration;
import io.appium.java_client.pagefactory_tests.widgets.selendroid.annotated.AnnotatedSelendroidMovie;
import io.appium.java_client.pagefactory_tests.widgets.selendroid.simple.SelendroidMovie;
import io.appium.java_client.remote.AutomationName;
import io.appium.java_client.remote.MobileCapabilityType;
import io.appium.java_client.service.local.AppiumDriverLocalService;
Expand Down Expand Up @@ -72,6 +74,7 @@ public void checkACommonWidget() {
movie.goToReview();
driver.getPageSource(); //forcing the refreshing hierarchy
rottenTomatoes.checkSimpleReview();
assertTrue(movie.getSelfReference().getClass().equals(SelendroidMovie.class));
}

@Override
Expand All @@ -85,6 +88,7 @@ public void checkAnAnnotatedWidget() {
movie.goToReview();
driver.getPageSource(); //forcing the refreshing hierarchy
rottenTomatoes.checkAnnotatedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedSelendroidMovie.class));
}


Expand All @@ -99,6 +103,7 @@ public void checkAnExtendedWidget() {
movie.goToReview();
driver.getPageSource(); //forcing the refreshing hierarchy
rottenTomatoes.checkExtendedReview();
assertTrue(movie.getSelfReference().getClass().equals(AnnotatedSelendroidMovie.class));
}

@Override
Expand Down