Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2891)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java

Issue 572013002: Removing ContentViewCore dependencies from direct WebContents functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch and addressed review comments. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/Tab.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
index f6360ece962b07c123e61405fbc380902804913e..397ebfb826511efc0750b3ee5764614bb3dd0753 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerTest.java
@@ -16,6 +16,7 @@ import org.chromium.content.browser.ContentViewCore;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.DOMUtils;
+import org.chromium.content_public.browser.WebContents;
import java.util.concurrent.TimeoutException;
@@ -536,13 +537,13 @@ public class AutofillDialogControllerTest extends ChromeShellTestBase {
setUpAndRequestAutocomplete(url, requestFullBilling, requestShipping, requestPhoneNumbers);
- final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+ final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
assertEquals(actualId + " did not match",
- expected, DOMUtils.getNodeValue(viewCore, actualId));
+ expected, DOMUtils.getNodeValue(webContents, actualId));
if (requestCcInfo) {
assertEquals("cc-csc did not match",
- TEST_CC_CSC, DOMUtils.getNodeValue(viewCore, "id-opt-cc-csc"));
+ TEST_CC_CSC, DOMUtils.getNodeValue(webContents, "id-opt-cc-csc"));
}
}
@@ -553,90 +554,90 @@ public class AutofillDialogControllerTest extends ChromeShellTestBase {
generatePage(requestFullBilling, requestShipping, requestPhoneNumbers),
requestFullBilling, requestShipping, requestPhoneNumbers);
- final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+ final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
assertEquals("billing name did not match",
- TEST_NAME, DOMUtils.getNodeValue(viewCore, "id-billing-name"));
+ TEST_NAME, DOMUtils.getNodeValue(webContents, "id-billing-name"));
assertEquals("email did not match",
- TEST_EMAIL, DOMUtils.getNodeValue(viewCore, "id-email"));
+ TEST_EMAIL, DOMUtils.getNodeValue(webContents, "id-email"));
assertEquals("cc-name did not match",
- TEST_NAME, DOMUtils.getNodeValue(viewCore, "id-cc-name"));
+ TEST_NAME, DOMUtils.getNodeValue(webContents, "id-cc-name"));
assertEquals("cc-number did not match",
- TEST_CC_NUMBER, DOMUtils.getNodeValue(viewCore, "id-cc-number"));
+ TEST_CC_NUMBER, DOMUtils.getNodeValue(webContents, "id-cc-number"));
assertEquals("cc-csc did not match",
- TEST_CC_CSC, DOMUtils.getNodeValue(viewCore, "id-cc-csc"));
+ TEST_CC_CSC, DOMUtils.getNodeValue(webContents, "id-cc-csc"));
assertEquals("cc-exp did not match",
"" + TEST_CC_EXP_YEAR + "-" + TEST_CC_EXP_MONTH,
- DOMUtils.getNodeValue(viewCore, "id-cc-exp"));
+ DOMUtils.getNodeValue(webContents, "id-cc-exp"));
assertEquals("cc-exp-month did not match",
"" + TEST_CC_EXP_MONTH,
- DOMUtils.getNodeValue(viewCore, "id-cc-exp-month"));
+ DOMUtils.getNodeValue(webContents, "id-cc-exp-month"));
assertEquals("cc-exp-year did not match",
"" + TEST_CC_EXP_YEAR,
- DOMUtils.getNodeValue(viewCore, "id-cc-exp-year"));
+ DOMUtils.getNodeValue(webContents, "id-cc-exp-year"));
assertEquals("billing postal-code did not match",
- TEST_BILLING_ZIP, DOMUtils.getNodeValue(viewCore, "id-cc-zip"));
+ TEST_BILLING_ZIP, DOMUtils.getNodeValue(webContents, "id-cc-zip"));
if (requestFullBilling) {
assertEquals("billing address-line1 did not match",
- TEST_BILLING1, DOMUtils.getNodeValue(viewCore, "id-cc-1"));
+ TEST_BILLING1, DOMUtils.getNodeValue(webContents, "id-cc-1"));
assertEquals("billing address-line2 did not match",
- TEST_BILLING2, DOMUtils.getNodeValue(viewCore, "id-cc-2"));
+ TEST_BILLING2, DOMUtils.getNodeValue(webContents, "id-cc-2"));
assertEquals("billing street-address did not match",
- TEST_BILLING_STREET, DOMUtils.getNodeValue(viewCore, "id-cc-str"));
+ TEST_BILLING_STREET, DOMUtils.getNodeValue(webContents, "id-cc-str"));
assertEquals("billing locality did not match",
- TEST_BILLING_CITY, DOMUtils.getNodeValue(viewCore, "id-cc-city"));
+ TEST_BILLING_CITY, DOMUtils.getNodeValue(webContents, "id-cc-city"));
assertEquals("billing region did not match",
- TEST_BILLING_STATE, DOMUtils.getNodeValue(viewCore, "id-cc-state"));
+ TEST_BILLING_STATE, DOMUtils.getNodeValue(webContents, "id-cc-state"));
assertEquals("billing country did not match",
- TEST_BILLING_COUNTRY, DOMUtils.getNodeValue(viewCore, "id-cc-country"));
+ TEST_BILLING_COUNTRY, DOMUtils.getNodeValue(webContents, "id-cc-country"));
if (requestPhoneNumbers) {
assertEquals("billing tel did not match",
TEST_PHONE_UNFORMATTED,
- DOMUtils.getNodeValue(viewCore, "id-cc-tel"));
+ DOMUtils.getNodeValue(webContents, "id-cc-tel"));
}
}
if (requestShipping) {
assertEquals("shipping name did not match",
- TEST_SHIPPING_NAME, DOMUtils.getNodeValue(viewCore, "id-h-name"));
+ TEST_SHIPPING_NAME, DOMUtils.getNodeValue(webContents, "id-h-name"));
assertEquals("shipping postal-code did not match",
- TEST_SHIPPING_ZIP, DOMUtils.getNodeValue(viewCore, "id-h-zip"));
+ TEST_SHIPPING_ZIP, DOMUtils.getNodeValue(webContents, "id-h-zip"));
assertEquals("shipping address-line1 did not match",
- TEST_SHIPPING1, DOMUtils.getNodeValue(viewCore, "id-h-1"));
+ TEST_SHIPPING1, DOMUtils.getNodeValue(webContents, "id-h-1"));
assertEquals("shipping address-line2 did not match",
- TEST_SHIPPING2, DOMUtils.getNodeValue(viewCore, "id-h-2"));
+ TEST_SHIPPING2, DOMUtils.getNodeValue(webContents, "id-h-2"));
assertEquals("shipping street-address did not match",
- TEST_SHIPPING_STREET, DOMUtils.getNodeValue(viewCore, "id-h-str"));
+ TEST_SHIPPING_STREET, DOMUtils.getNodeValue(webContents, "id-h-str"));
assertEquals("shipping locality did not match",
- TEST_SHIPPING_CITY, DOMUtils.getNodeValue(viewCore, "id-h-city"));
+ TEST_SHIPPING_CITY, DOMUtils.getNodeValue(webContents, "id-h-city"));
assertEquals("shipping region did not match",
- TEST_SHIPPING_STATE, DOMUtils.getNodeValue(viewCore, "id-h-state"));
+ TEST_SHIPPING_STATE, DOMUtils.getNodeValue(webContents, "id-h-state"));
assertEquals("shipping country did not match",
TEST_SHIPPING_COUNTRY,
- DOMUtils.getNodeValue(viewCore, "id-h-country"));
+ DOMUtils.getNodeValue(webContents, "id-h-country"));
// It is currently unspecified whether autocomplete="name" gives a SHIPPING or
// a BILLING name. I'm assuming here that this is a shipping name.
assertEquals("name did not match",
- TEST_SHIPPING_NAME, DOMUtils.getNodeValue(viewCore, "id-name"));
+ TEST_SHIPPING_NAME, DOMUtils.getNodeValue(webContents, "id-name"));
if (requestPhoneNumbers) {
assertEquals("shipping tel did not match",
TEST_SHIPPING_PHONE_UNFORMATTED,
- DOMUtils.getNodeValue(viewCore, "id-h-tel"));
+ DOMUtils.getNodeValue(webContents, "id-h-tel"));
// It is currently unspecified whether autocomplete="name" gives a SHIPPING or
// a BILLING phone. I'm assuming here that this is a shipping phone.
assertEquals("tel did not match",
TEST_SHIPPING_PHONE_UNFORMATTED,
- DOMUtils.getNodeValue(viewCore, "id-tel"));
+ DOMUtils.getNodeValue(webContents, "id-tel"));
}
}
}
@@ -671,6 +672,7 @@ public class AutofillDialogControllerTest extends ChromeShellTestBase {
assertTrue(waitForActiveShellToBeDoneLoading());
final ContentViewCore viewCore = getActivity().getActiveContentViewCore();
+ final WebContents webContents = getActivity().getActiveContentViewCore().getWebContents();
AutofillDialogResult.ResultWallet result = new AutofillDialogResult.ResultWallet(
TEST_EMAIL, "Google Transaction ID",
@@ -696,20 +698,20 @@ public class AutofillDialogControllerTest extends ChromeShellTestBase {
requestFullBilling, requestShipping, requestPhoneNumbers);
DOMUtils.clickNode(this, viewCore, "id-button");
- waitForInputFieldFill(viewCore);
+ waitForInputFieldFill(webContents);
if (!expectFailure) {
assertEquals("requestAutocomplete failed",
"succeeded",
- DOMUtils.getNodeContents(viewCore, "was-autocompleted"));
+ DOMUtils.getNodeContents(webContents, "was-autocompleted"));
} else {
assertEquals("requestAutocomplete succeeded when it should be failing",
"failed",
- DOMUtils.getNodeContents(viewCore, "was-autocompleted"));
+ DOMUtils.getNodeContents(webContents, "was-autocompleted"));
}
}
- private void waitForInputFieldFill(final ContentViewCore viewCore) throws InterruptedException {
+ private void waitForInputFieldFill(final WebContents webContents) throws InterruptedException {
assertTrue("requestAutocomplete() never completed.",
CriteriaHelper.pollForCriteria(new Criteria() {
@Override
@@ -717,7 +719,7 @@ public class AutofillDialogControllerTest extends ChromeShellTestBase {
String wasAutocompleted;
try {
wasAutocompleted = DOMUtils.getNodeContents(
- viewCore, "was-autocompleted");
+ webContents, "was-autocompleted");
} catch (InterruptedException e) {
return false;
} catch (TimeoutException e) {
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/Tab.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillPopupTest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698