Skip to content

Commit

Permalink
test(java): remove duplicate code in BackButtonMultipageTest (#1129)
Browse files Browse the repository at this point in the history 
* Removed duplicate code in test

* test: Remove duplicate code in BackButtonMultipageTest

Authored-by: leofernandesmo <leonardo.fernandes@ifal.edu.br>
Co-authored-by: breautek <norman@nbsolutions.ca>
  • Loading branch information
@breautek
breautek and breautek committed Nov 21, 2020
1 parent b245337 commit 97e2d15
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 26 deletions.
33 changes: 20 additions & 13 deletions ...ndroid/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one
public class BackButtonMultipageTest {

private static final String START_URL = "file:///android_asset/www/backbuttonmultipage/index.html";
private static final String SAMPLE3_URL = "file:///android_asset/www/backbuttonmultipage/sample3.html";
private static final String SAMPLE2_URL = "file:///android_asset/www/backbuttonmultipage/sample2.html";
//I have no idea why we picked 100, but we did.
private static final int WEBVIEW_ID = 100;
private TestActivity mActivity;
Expand All @@ -71,19 +73,19 @@ public void run() {
webInterface.sendJavascript("window.location = 'sample2.html';");
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.sendJavascript("window.location = 'sample3.html';");
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample3.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE3_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
Expand All @@ -104,22 +106,22 @@ public void testViaLoadUrl() throws Throwable {

mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
webInterface.loadUrl(SAMPLE2_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample3.html");
webInterface.loadUrl(SAMPLE3_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample3.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE3_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
Expand All @@ -140,19 +142,24 @@ public void testViaBackButtonOnView() throws Throwable {

mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
webInterface.loadUrl(SAMPLE2_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample3.html");
webInterface.loadUrl(SAMPLE3_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample3.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE3_URL);
onView(withId(WEBVIEW_ID)).perform(pressBack());
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
onView(withId(WEBVIEW_ID)).perform(pressBack());
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
}

private void assertPageSample(String url) {
assertEquals(url, mActivity.onPageFinishedUrl.take());
}

}
32 changes: 19 additions & 13 deletions ...droidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Licensed to the Apache Software Foundation (ASF) under one
public class BackButtonMultipageTest {

private static final String START_URL = "file:///android_asset/www/backbuttonmultipage/index.html";
private static final String SAMPLE3_URL = "file:///android_asset/www/backbuttonmultipage/sample3.html";
private static final String SAMPLE2_URL = "file:///android_asset/www/backbuttonmultipage/sample2.html";
//I have no idea why we picked 100, but we did.
private static final int WEBVIEW_ID = 100;
private TestActivity mActivity;
Expand All @@ -71,19 +73,19 @@ public void run() {
webInterface.sendJavascript("window.location = 'sample2.html';");
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.sendJavascript("window.location = 'sample3.html';");
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample3.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE3_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
Expand All @@ -104,22 +106,22 @@ public void testViaLoadUrl() throws Throwable {

mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
webInterface.loadUrl(SAMPLE2_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample3.html");
webInterface.loadUrl(SAMPLE3_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample3.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE3_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
assertTrue(webInterface.backHistory());
Expand All @@ -140,19 +142,23 @@ public void testViaBackButtonOnView() throws Throwable {

mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample2.html");
webInterface.loadUrl(SAMPLE2_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
mActivityRule.runOnUiThread(new Runnable() {
public void run() {
webInterface.loadUrl("file:///android_asset/www/backbuttonmultipage/sample3.html");
webInterface.loadUrl(SAMPLE3_URL);
}
});
assertEquals("file:///android_asset/www/backbuttonmultipage/sample3.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE3_URL);
onView(withId(WEBVIEW_ID)).perform(pressBack());
assertEquals("file:///android_asset/www/backbuttonmultipage/sample2.html", mActivity.onPageFinishedUrl.take());
assertPageSample(SAMPLE2_URL);
onView(withId(WEBVIEW_ID)).perform(pressBack());
assertEquals(START_URL, mActivity.onPageFinishedUrl.take());
}

private void assertPageSample(String url) {
assertEquals(url, mActivity.onPageFinishedUrl.take());
}
}

0 comments on commit 97e2d15

Please sign in to comment.