From 97e2d15634f3c7a37e468cdafcb697257340570c Mon Sep 17 00:00:00 2001 From: Norman Breau Date: Sat, 21 Nov 2020 09:10:07 -0400 Subject: [PATCH] test(java): remove duplicate code in BackButtonMultipageTest (#1129) * Removed duplicate code in test * test: Remove duplicate code in BackButtonMultipageTest Authored-by: leofernandesmo Co-authored-by: breautek --- .../unittests/BackButtonMultipageTest.java | 33 +++++++++++-------- .../unittests/BackButtonMultipageTest.java | 32 ++++++++++-------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/test/android/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java b/test/android/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java index c50c2213..e1c7f058 100644 --- a/test/android/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java +++ b/test/android/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java @@ -45,6 +45,8 @@ import static org.apache.cordova.unittests.R.id.cordovaWebView; 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; @@ -71,19 +73,19 @@ public class BackButtonMultipageTest { 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()); @@ -104,22 +106,22 @@ public class BackButtonMultipageTest { 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()); @@ -140,19 +142,24 @@ public class BackButtonMultipageTest { 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()); + } + } diff --git a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java index 5118c262..25576dbd 100644 --- a/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java +++ b/test/androidx/app/src/androidTest/java/org/apache/cordova/unittests/BackButtonMultipageTest.java @@ -45,6 +45,8 @@ import static org.apache.cordova.unittests.R.id.cordovaWebView; 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; @@ -71,19 +73,19 @@ public class BackButtonMultipageTest { 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()); @@ -104,22 +106,22 @@ public class BackButtonMultipageTest { 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()); @@ -140,19 +142,23 @@ public class BackButtonMultipageTest { 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()); + } }