Add calls to the server to request WebAPK updates.

chrome/browser/android/webapk/webapk_installer_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/webapk/webapk_installer.h"
 
 #include <jni.h>
 #include <memory>
 #include <string>
 
@@ skipping 18 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "url/gurl.h"
 
 namespace {
 
 const base::FilePath::CharType kTestDataDir[] =
     FILE_PATH_LITERAL("chrome/test/data");
 
 // URL of mock WebAPK server.
-const std::string kServerUrl = "/webapkserver";
+const std::string kServerUrl = "/webapkserver/";
+
+// The response format type expected from the WebAPK server.
+const std::string kWebApkServerUrlResponseType = "?alt=proto";
 
 // URL of file to download from the WebAPK server. We use a random file in the
 // test data directory.
 const std::string kDownloadUrl = "/simple.html";
 
 // The package name of the downloaded WebAPK.
 const std::string kDownloadedWebApkPackageName = "party.unicode";
 
 // WebApkInstaller subclass where
-// WebApkInstaller::StartDownloadedWebApkInstall() is stubbed out.
+// WebApkInstaller::StartInstallingDownloadedWebApk() is stubbed out.

[pkotwicz, 2016/08/11 22:02:45]

Nit: "WebApkInstaller::StartInstallingDownloadedWebApk() is stubbed out.
WebApkInstaller::StartUpdateUsingDownloadedWebApk() is stubbed out." ->
"WebApkInstaller::StartInstallingDownloadedWebApk() and
WebApkInstaller::StartUpdateUsingDownloadedWebApk() are stubbed out."

[Xi Han, 2016/08/15 21:38:45]

Done.

+// WebApkInstaller::StartUpdateUsingDownloadedWebApk() is stubbed out.
 class TestWebApkInstaller : public WebApkInstaller {
  public:
   TestWebApkInstaller(const ShortcutInfo& shortcut_info,
                       const SkBitmap& shortcut_icon)
       : WebApkInstaller(shortcut_info, shortcut_icon) {}
 
-  bool StartDownloadedWebApkInstall(
+  bool StartInstallingDownloadedWebApk(
       JNIEnv* env,
       const base::android::ScopedJavaLocalRef<jstring>& file_path,
       const base::android::ScopedJavaLocalRef<jstring>& package_name) override {
+    return true;
+  }
+
+  bool StartUpdateUsingDownloadedWebApk(
+      JNIEnv* env,
+      const base::android::ScopedJavaLocalRef<jstring>& file_path,
+      const base::android::ScopedJavaLocalRef<jstring>& package_name) override {
     return true;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestWebApkInstaller);
 };
 
 // Runs the WebApkInstaller installation process and blocks till done.

[pkotwicz, 2016/08/11 22:02:44]

Nit: "installation" -> "installation/update"

[Xi Han, 2016/08/15 21:38:45]

Done.

 class WebApkInstallerRunner {
  public:
   WebApkInstallerRunner()
       : url_request_context_getter_(new net::TestURLRequestContextGetter(
             base::ThreadTaskRunnerHandle::Get())) {}
   ~WebApkInstallerRunner() {}
 
-  void Run() {
-    ShortcutInfo info(GURL::EmptyGURL());
+  void RunCreateWebApk() {
+    WebApkInstaller* installer = createWebApkInstaller();
 
-    // WebApkInstaller owns itself.
-    WebApkInstaller* installer = new TestWebApkInstaller(info, SkBitmap());
-
-    installer->SetTimeoutMs(100);
     installer->InstallAsyncWithURLRequestContextGetter(
         url_request_context_getter_.get(),
         base::Bind(&WebApkInstallerRunner::OnCompleted,
                    base::Unretained(this)));
 
+    setupCallback();
+  }
+
+  void RunUpdateWebApk() {

[pkotwicz, 2016/08/11 22:02:44]

Nit: "int webapk_version" -> "const int kWebApkVersion"

[Xi Han, 2016/08/15 21:38:45]

Done.

+    int webapk_version = 1;
+
+    // WebApkInstaller owns itself.
+    WebApkInstaller* installer = createWebApkInstaller();
+
+    installer->UpdateAsyncWithURLRequestContextGetter(
+        url_request_context_getter_.get(),
+        base::Bind(&WebApkInstallerRunner::OnCompleted, base::Unretained(this)),
+        kDownloadedWebApkPackageName, webapk_version);
+
+    setupCallback();
+  }
+
+  WebApkInstaller* createWebApkInstaller() {

[pkotwicz, 2016/08/11 22:02:44]

Functions start with uppercase in C++

[Xi Han, 2016/08/15 21:38:45]

Done.

+    ShortcutInfo info(GURL::EmptyGURL());
+
+    // WebApkInstaller owns itself.
+    WebApkInstaller* installer = new TestWebApkInstaller(info, SkBitmap());
+    installer->SetTimeoutMs(100);
+    return installer;
+  }
+
+  void setupCallback() {

[pkotwicz, 2016/08/11 22:02:45]

I think that Run() would be a more appropriate name for this function. (This
function blocks till the callback is called)

[Xi Han, 2016/08/15 21:38:45]

Done.

     base::RunLoop run_loop;
     on_completed_callback_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
   bool success() { return success_; }
 
  private:
   void OnCompleted(bool success) {
     success_ = success;
@@ skipping 36 matching lines @@
  public:
   typedef base::Callback<std::unique_ptr<net::test_server::HttpResponse>(void)>
       WebApkResponseBuilder;
 
   WebApkInstallerTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
   ~WebApkInstallerTest() override {}
 
   void SetUp() override {
     test_server_.AddDefaultHandlers(base::FilePath(kTestDataDir));
-    test_server_.RegisterRequestHandler(
-        base::Bind(&WebApkInstallerTest::HandleCreateWebApkRequest,
-                   base::Unretained(this)));
+    test_server_.RegisterRequestHandler(base::Bind(
+        &WebApkInstallerTest::HandleWebApkRequest, base::Unretained(this)));
     ASSERT_TRUE(test_server_.Start());
 
     SetDefaults();
   }
 
   // Sets the URL to send the webapk::CreateWebApkRequest to. WebApkInstaller
   // should fail if the URL is not |kServerUrl|.
   void SetWebApkServerUrl(const GURL& server_url) {
     base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
         switches::kWebApkServerUrl, server_url.spec());
@@ skipping 10 matching lines @@
  private:
   // Sets default configuration for running WebApkInstaller.
   void SetDefaults() {
     GURL server_url = test_server_.GetURL(kServerUrl);
     SetWebApkServerUrl(server_url);
     GURL download_url = test_server_.GetURL(kDownloadUrl);
     SetWebApkResponseBuilder(
         base::Bind(&BuildValidWebApkResponse, download_url));
   }
 
-  std::unique_ptr<net::test_server::HttpResponse> HandleCreateWebApkRequest(
+  std::unique_ptr<net::test_server::HttpResponse> HandleWebApkRequest(
       const net::test_server::HttpRequest& request) {
-    return (request.relative_url == kServerUrl)
+    return (request.relative_url == GetServerUrlForCreateWebApk() ||
+            request.relative_url == GetServerUrlForUpdateWebApk())
                ? webapk_response_builder_.Run()
                : std::unique_ptr<net::test_server::HttpResponse>();
   }
 
+  std::string GetServerUrlForCreateWebApk() {

[pkotwicz, 2016/08/11 22:02:44]

Nit: This should be a const function

[Xi Han, 2016/08/15 21:38:45]

Done.

+    return kServerUrl + kWebApkServerUrlResponseType;
+  }
+
+  std::string GetServerUrlForUpdateWebApk() {

[pkotwicz, 2016/08/11 22:02:44]

Nit: This should be a const function

[Xi Han, 2016/08/15 21:38:45]

Done.

+    return kServerUrl + kDownloadedWebApkPackageName + "/" +
+           kWebApkServerUrlResponseType;
+  }
+
   content::TestBrowserThreadBundle thread_bundle_;
   net::EmbeddedTestServer test_server_;
 
   // Builds response to the WebAPK creation request.
   WebApkResponseBuilder webapk_response_builder_;
 
   DISALLOW_COPY_AND_ASSIGN(WebApkInstallerTest);
 };
 
 // Test installation succeeding.
 TEST_F(WebApkInstallerTest, Success) {
   WebApkInstallerRunner runner;
-  runner.Run();
+  runner.RunCreateWebApk();
   EXPECT_TRUE(runner.success());
 }
 
 // Test that installation fails if the WebAPK creation request times out.
 TEST_F(WebApkInstallerTest, CreateWebApkRequestTimesOut) {
   GURL server_url = test_server()->GetURL("/slow?1000");
   SetWebApkServerUrl(server_url);
 
   WebApkInstallerRunner runner;
-  runner.Run();
+  runner.RunCreateWebApk();
   EXPECT_FALSE(runner.success());
 }
 
 // Test that installation fails if the WebAPK download times out.
 TEST_F(WebApkInstallerTest, WebApkDownloadTimesOut) {
   GURL download_url = test_server()->GetURL("/slow?1000");
   SetWebApkResponseBuilder(base::Bind(&BuildValidWebApkResponse, download_url));
 
   WebApkInstallerRunner runner;
-  runner.Run();
+  runner.RunCreateWebApk();
   EXPECT_FALSE(runner.success());
 }
 
 // Test that installation fails if the WebAPK download fails.
 TEST_F(WebApkInstallerTest, WebApkDownloadFails) {
   GURL download_url = test_server()->GetURL("/nocontent");
   SetWebApkResponseBuilder(base::Bind(&BuildValidWebApkResponse, download_url));
 
   WebApkInstallerRunner runner;
-  runner.Run();
+  runner.RunCreateWebApk();
   EXPECT_FALSE(runner.success());
 }
 
 namespace {
 
 // Returns an HttpResponse which cannot be parsed as a webapk::WebApkResponse.
 std::unique_ptr<net::test_server::HttpResponse>
 BuildUnparsableWebApkResponse() {
   std::unique_ptr<net::test_server::BasicHttpResponse> response(
       new net::test_server::BasicHttpResponse());
   response->set_code(net::HTTP_OK);
   response->set_content("😀");
   return std::move(response);
 }
 
 }  // anonymous namespace
 
 // Test that an HTTP response which cannot be parsed as a webapk::WebApkResponse
 // is handled properly.
 TEST_F(WebApkInstallerTest, UnparsableCreateWebApkResponse) {
   SetWebApkResponseBuilder(base::Bind(&BuildUnparsableWebApkResponse));
 
   WebApkInstallerRunner runner;
-  runner.Run();
+  runner.RunCreateWebApk();
   EXPECT_FALSE(runner.success());
 }
+
+// Test update succeeding.
+TEST_F(WebApkInstallerTest, UpdateSuccess) {
+  WebApkInstallerRunner runner;
+  runner.RunUpdateWebApk();
+  EXPECT_TRUE(runner.success());
+}

[pkotwicz, 2016/08/11 22:02:45]

Thanks for adding the test!

[Xi Han, 2016/08/15 21:38:45]

The tests are well written, so it is not difficult to add more:)