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

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

Issue 2733543002: [Android:WebAPK] Don't add webapp to homescreen if WebAPK install times out part 1/3 (Closed)
Patch Set: Merge branch 'refactor_shortcut_helper29' into refactor_shortcut_helper3 Created 3 years, 10 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
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 f16681f8bb658e27fab0f0aa5b197d53669cc5bf..e74ad2690ddde683ad60684897ea0c54d3c3d411 100644
--- a/chrome/browser/android/webapk/webapk_installer_unittest.cc
+++ b/chrome/browser/android/webapk/webapk_installer_unittest.cc
@@ -19,6 +19,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/android/shortcut_info.h"
#include "chrome/browser/android/webapk/webapk.pb.h"
+#include "chrome/browser/android/webapk/webapk_install_service.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/browser_thread.h"
@@ -159,11 +160,12 @@ class WebApkInstallerRunner {
run_loop.Run();
}
- bool success() { return success_; }
+ WebApkInstallResult result() { return result_; }
private:
- void OnCompleted(bool success, const std::string& webapk_package) {
- success_ = success;
+ void OnCompleted(WebApkInstallResult result,
+ const std::string& webapk_package) {
+ result_ = result;
on_completed_callback_.Run();
}
@@ -175,8 +177,8 @@ class WebApkInstallerRunner {
// Called after the installation process has succeeded or failed.
base::Closure on_completed_callback_;
- // Whether the installation process succeeded.
- bool success_;
+ // The result of the installation process.
+ WebApkInstallResult result_;
// Whether Google Play Service can be used and the install delegate is
// available.
@@ -344,7 +346,7 @@ class WebApkInstallerTest : public ::testing::Test {
TEST_F(WebApkInstallerTest, Success) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALLED, runner->result());
}
// Test that installation fails if fetching the bitmap at the best primary icon
@@ -356,7 +358,7 @@ TEST_F(WebApkInstallerTest, BestPrimaryIconUrlDownloadTimesOut) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALL_FAILED, runner->result());
}
// Test that installation fails if the WebAPK creation request times out.
@@ -366,7 +368,7 @@ TEST_F(WebApkInstallerTest, CreateWebApkRequestTimesOut) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALL_FAILED, runner->result());
}
// Test that installation fails if the WebAPK download times out.
@@ -376,7 +378,7 @@ TEST_F(WebApkInstallerTest, WebApkDownloadTimesOut) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALL_FAILED, runner->result());
}
// Test that installation fails if the WebAPK download fails.
@@ -386,7 +388,7 @@ TEST_F(WebApkInstallerTest, WebApkDownloadFails) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALL_FAILED, runner->result());
}
namespace {
@@ -410,14 +412,14 @@ TEST_F(WebApkInstallerTest, UnparsableCreateWebApkResponse) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALL_FAILED, runner->result());
}
// Test update succeeding.
TEST_F(WebApkInstallerTest, UpdateSuccess) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunUpdateWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALLED, runner->result());
}
// Test that an update suceeds if the WebAPK server returns a HTTP response with
@@ -432,7 +434,7 @@ TEST_F(WebApkInstallerTest, UpdateSuccessWithEmptyDownloadUrlInResponse) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunUpdateWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALLED, runner->result());
}
// Test installation succeeds using Google Play.
@@ -440,7 +442,7 @@ TEST_F(WebApkInstallerTest, InstallFromGooglePlaySuccess) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->SetCanUseGooglePlayInstallService(true);
runner->RunInstallWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::INSTALLED, runner->result());
}
// When there is no Web Manifest available for a site, an empty

Powered by Google App Engine
This is Rietveld 408576698