chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java - Issue 2838433002: [Payments] Cache payment manifests.

Unified Diff: chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java

Issue 2838433002: [Payments] Cache payment manifests. (Closed)

Patch Set: rebase Created 3 years, 8 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

« no previous file with comments | « chrome/android/junit/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java

diff --git a/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java b/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java

index a69cfc410960f5568b8acfd5dc9e91b35f6fd5d0..dbe7fe39c60409b6dfb8d0188f02b9594a08101f 100644

--- a/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java

+++ b/chrome/android/junit/src/org/chromium/chrome/browser/payments/PaymentManifestVerifierTest.java

@@ -35,6 +35,7 @@ public class PaymentManifestVerifierTest {

private final ResolveInfo mBobPay;

private final List<ResolveInfo> mMatchingApps;

private final PaymentManifestDownloader mDownloader;

+ private final PaymentManifestWebDataService mWebDataService;

private final PaymentManifestParser mParser;

private final PackageManagerDelegate mPackageManagerDelegate;

private final ManifestVerifyCallback mCallback;

@@ -66,6 +67,10 @@ public class PaymentManifestVerifierTest {

}

};

+ mWebDataService = Mockito.mock(PaymentManifestWebDataService.class);

+ Mockito.when(mWebDataService.getPaymentMethodManifest(Mockito.any(), Mockito.any()))

+ .thenReturn(false);

mParser = new PaymentManifestParser() {

@Override

public void parsePaymentMethodManifest(String content, ManifestParseCallback callback) {

@@ -117,7 +122,7 @@ public class PaymentManifestVerifierTest {

@Test

public void testUnableToDownloadPaymentMethodManifest() {

PaymentManifestVerifier verifier = new PaymentManifestVerifier(

- mMethodName, mMatchingApps, new PaymentManifestDownloader(null) {

+ mMethodName, mMatchingApps, mWebDataService, new PaymentManifestDownloader(null) {

@Override

public void downloadPaymentMethodManifest(

URI uri, ManifestDownloadCallback callback) {

@@ -133,7 +138,7 @@ public class PaymentManifestVerifierTest {

@Test

public void testUnableToDownloadWebAppManifest() {

PaymentManifestVerifier verifier = new PaymentManifestVerifier(

- mMethodName, mMatchingApps, new PaymentManifestDownloader(null) {

+ mMethodName, mMatchingApps, mWebDataService, new PaymentManifestDownloader(null) {

@Override

public void downloadPaymentMethodManifest(

URI uri, ManifestDownloadCallback callback) {

@@ -149,12 +154,13 @@ public class PaymentManifestVerifierTest {

verifier.verify();

Mockito.verify(mCallback).onInvalidManifest(mMethodName);

+ Mockito.verify(mCallback).onVerifyFinished(verifier);

}

@Test

public void testUnableToParsePaymentMethodManifest() {

- PaymentManifestVerifier verifier = new PaymentManifestVerifier(

- mMethodName, mMatchingApps, mDownloader, new PaymentManifestParser() {

+ PaymentManifestVerifier verifier = new PaymentManifestVerifier(mMethodName, mMatchingApps,

+ mWebDataService, mDownloader, new PaymentManifestParser() {

@Override

public void parsePaymentMethodManifest(

String content, ManifestParseCallback callback) {

@@ -165,12 +171,13 @@ public class PaymentManifestVerifierTest {

verifier.verify();

Mockito.verify(mCallback).onInvalidManifest(mMethodName);

+ Mockito.verify(mCallback).onVerifyFinished(verifier);

}

@Test

public void testUnableToParseWebAppManifest() {

- PaymentManifestVerifier verifier = new PaymentManifestVerifier(

- mMethodName, mMatchingApps, mDownloader, new PaymentManifestParser() {

+ PaymentManifestVerifier verifier = new PaymentManifestVerifier(mMethodName, mMatchingApps,

+ mWebDataService, mDownloader, new PaymentManifestParser() {

@Override

public void parsePaymentMethodManifest(

String content, ManifestParseCallback callback) {

@@ -192,17 +199,19 @@ public class PaymentManifestVerifierTest {

verifier.verify();

Mockito.verify(mCallback).onInvalidManifest(mMethodName);

+ Mockito.verify(mCallback).onVerifyFinished(verifier);

}

@Test

public void testBobPayAllowed() {

PaymentManifestVerifier verifier = new PaymentManifestVerifier(mMethodName, mMatchingApps,

- mDownloader, mParser, mPackageManagerDelegate, mCallback);

+ mWebDataService, mDownloader, mParser, mPackageManagerDelegate, mCallback);

verifier.verify();

Mockito.verify(mCallback).onInvalidPaymentApp(mMethodName, mAlicePay);

Mockito.verify(mCallback).onValidPaymentApp(mMethodName, mBobPay);

+ Mockito.verify(mCallback).onVerifyFinished(verifier);

}

private class CountingParser extends PaymentManifestParser {

@@ -254,12 +263,13 @@ public class PaymentManifestVerifierTest {

}

};

- PaymentManifestVerifier verifier = new PaymentManifestVerifier(

- mMethodName, mMatchingApps, downloader, parser, mPackageManagerDelegate, mCallback);

+ PaymentManifestVerifier verifier = new PaymentManifestVerifier(mMethodName, mMatchingApps,

+ mWebDataService, downloader, parser, mPackageManagerDelegate, mCallback);

verifier.verify();

Mockito.verify(mCallback).onInvalidManifest(mMethodName);

+ Mockito.verify(mCallback).onVerifyFinished(verifier);

Assert.assertEquals(1, downloader.mDownloadWebAppManifestCounter);

Assert.assertEquals(0, parser.mParseWebAppManifestCounter);

}

@@ -302,12 +312,13 @@ public class PaymentManifestVerifierTest {

}

};

- PaymentManifestVerifier verifier = new PaymentManifestVerifier(

- mMethodName, mMatchingApps, downloader, parser, mPackageManagerDelegate, mCallback);

+ PaymentManifestVerifier verifier = new PaymentManifestVerifier(mMethodName, mMatchingApps,

+ mWebDataService, downloader, parser, mPackageManagerDelegate, mCallback);

verifier.verify();

Mockito.verify(mCallback).onInvalidManifest(mMethodName);

+ Mockito.verify(mCallback).onVerifyFinished(verifier);

Assert.assertEquals(1, downloader.mDownloadWebAppManifestCounter);

Assert.assertEquals(1, parser.mParseWebAppManifestCounter);

}