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

Unified Diff: chrome/browser/android/webapk/webapk_installer_unittest.cc

Issue 2528073002: Add a flag in WebAPK's proto when the Web App Manifest is no longer available. (Closed)
Patch Set: Nits. Created 4 years 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
Index: chrome/browser/android/webapk/webapk_installer_unittest.cc
diff --git a/chrome/browser/android/webapk/webapk_installer_unittest.cc b/chrome/browser/android/webapk/webapk_installer_unittest.cc
index 10021ff93107a0b7e7a694291742e2e107c0910b..ba56d7f378ba6507c471db80588ef06d7da7a8a0 100644
--- a/chrome/browser/android/webapk/webapk_installer_unittest.cc
+++ b/chrome/browser/android/webapk/webapk_installer_unittest.cc
@@ -107,13 +107,29 @@ class WebApkInstallerRunner {
const int kWebApkVersion = 1;
WebApkInstaller* installer = CreateWebApkInstaller();
+ std::map<std::string, std::string> icon_url_to_murmur2_hash_map;
+ icon_url_to_murmur2_hash_map[best_icon_url_.spec()] = kIconMurmur2Hash;
installer->UpdateAsyncWithURLRequestContextGetter(
url_request_context_getter_.get(),
base::Bind(&WebApkInstallerRunner::OnCompleted, base::Unretained(this)),
- kIconMurmur2Hash,
kDownloadedWebApkPackageName,
- kWebApkVersion);
+ kWebApkVersion,
+ false /* stale_manifest */,
+ icon_url_to_murmur2_hash_map);
+
+ Run();
+ }
+
+ void BuildWebApkProto(
+ bool state_manifest,
+ const std::map<std::string, std::string> icon_url_to_murmur2_hash_map) {
+ WebApkInstaller* installer = CreateWebApkInstaller();
+ installer->BuildWebApkProtoInBackgroundForTesting(
+ base::Bind(&WebApkInstallerRunner::onBuildWebApkProtoComeplete,
+ base::Unretained(this)),
+ state_manifest,
+ icon_url_to_murmur2_hash_map);
Run();
}
@@ -136,12 +152,22 @@ class WebApkInstallerRunner {
bool success() { return success_; }
+ webapk::WebApk* GetWebApkRequest() {
+ return webapk_request_.get();
+ }
+
private:
void OnCompleted(bool success, const std::string& webapk_package) {
success_ = success;
on_completed_callback_.Run();
}
+ void onBuildWebApkProtoComeplete(
+ std::unique_ptr<webapk::WebApk> webapk_request) {
+ webapk_request_ = std::move(webapk_request);
+ on_completed_callback_.Run();
+ }
+
scoped_refptr<net::TestURLRequestContextGetter>
url_request_context_getter_;
@@ -154,6 +180,9 @@ class WebApkInstallerRunner {
// Whether the installation process succeeded.
bool success_;
+ // The request sent to WebAPK server.
+ std::unique_ptr<webapk::WebApk> webapk_request_;
+
DISALLOW_COPY_AND_ASSIGN(WebApkInstallerRunner);
};
@@ -331,3 +360,73 @@ TEST_F(WebApkInstallerTest, UpdateSuccess) {
runner->RunUpdateWebApk();
EXPECT_TRUE(runner->success());
}
+
+// When there is no Web Manifest available for a site, an empty |best_icon_url|
+// is used to build a WebApk update request. Tests the request can be built
+// properly.
+TEST_F(WebApkInstallerTest, BuildWebApkProtoWhenManifestIsObsolete) {
+ GURL icon_url_1 = test_server()->GetURL("/icon1.png");
+ GURL icon_url_2 = test_server()->GetURL("/icon2.png");
+ GURL best_icon_url("");
+ std::string icon_murmur2_hash_1 = "1";
+ std::string icon_murmur2_hash_2 = "2";
+ std::map<std::string, std::string> icon_url_to_murmur2_hash_map;
+ icon_url_to_murmur2_hash_map[icon_url_1.spec()] = icon_murmur2_hash_1;
+ icon_url_to_murmur2_hash_map[icon_url_2.spec()] = icon_murmur2_hash_2;
+
+ SetBestIconUrl(best_icon_url);
+ std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
+ runner->BuildWebApkProto(true, icon_url_to_murmur2_hash_map);
+ webapk::WebApk* webapk_request = runner->GetWebApkRequest();
+ webapk::WebAppManifest manifest = webapk_request->manifest();
+
+ EXPECT_EQ(3, manifest.icons_size());
+
+ webapk::Image icons[3];
+ for (int i = 0; i < 3; ++i)
+ icons[i] = manifest.icons(i);
+
+ EXPECT_EQ(best_icon_url.spec(), icons[0].src());
pkotwicz 2016/12/09 22:18:55 Replace best_icon_url.spec() with "" to make it su
Xi Han 2016/12/13 20:59:15 Done.
+ EXPECT_FALSE(icons[0].has_hash());
+ EXPECT_TRUE(icons[0].has_image_data());
+
+ EXPECT_EQ(icon_url_1.spec(), icons[1].src());
+ EXPECT_EQ(icon_murmur2_hash_1, icons[1].hash());
+ EXPECT_FALSE(icons[1].has_image_data());
+
+ EXPECT_EQ(icon_url_2.spec(), icons[2].src());
+ EXPECT_EQ(icon_murmur2_hash_2, icons[2].hash());
+ EXPECT_FALSE(icons[2].has_image_data());
+}
+
+// Tests a WebApk install or update request is built properly when the Chrome
+// knows the best icon URL of a site after fetching its Web Manifest.
+TEST_F(WebApkInstallerTest, BuildWebApkProtoWhenManifestIsAvailable) {
+ GURL icon_url_1 = test_server()->GetURL("/icon.png");
+ GURL best_icon_url = test_server()->GetURL(kBestIconUrl);
+ std::string icon_murmur2_hash_1 = "1";
+ std::string best_icon_murmur2_hash = "0";
+ std::map<std::string, std::string> icon_url_to_murmur2_hash_map;
+ icon_url_to_murmur2_hash_map[icon_url_1.spec()] = icon_murmur2_hash_1;
+ icon_url_to_murmur2_hash_map[best_icon_url.spec()] =
+ best_icon_murmur2_hash;
+
+ std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
+ runner->BuildWebApkProto(false, icon_url_to_murmur2_hash_map);
+ webapk::WebApk* webapk_request = runner->GetWebApkRequest();
+ webapk::WebAppManifest manifest = webapk_request->manifest();
+
+ EXPECT_EQ(2, manifest.icons_size());
+
+ webapk::Image icons[2];
+ for (int i = 0; i < 2; ++i)
+ icons[i] = manifest.icons(i);
+
+ EXPECT_EQ(best_icon_url.spec(), icons[0].src());
+ EXPECT_EQ(best_icon_murmur2_hash, icons[0].hash());
+ EXPECT_TRUE(icons[0].has_image_data());
+
+ EXPECT_EQ(icon_url_1.spec(), icons[1].src());
+ EXPECT_EQ(icon_murmur2_hash_1, icons[1].hash());
+ EXPECT_FALSE(icons[1].has_image_data());
+}

Powered by Google App Engine
This is Rietveld 408576698