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

Unified Diff: chrome/browser/services/gcm/push_messaging_browsertest.cc

Issue 648623003: PushMessagingBrowserTest for registration success and failure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Rebase. 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
Index: chrome/browser/services/gcm/push_messaging_browsertest.cc
diff --git a/chrome/browser/services/gcm/push_messaging_browsertest.cc b/chrome/browser/services/gcm/push_messaging_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..fa4febda1d7a37de3b1dd923ff5b5fc782806214
--- /dev/null
+++ b/chrome/browser/services/gcm/push_messaging_browsertest.cc
@@ -0,0 +1,137 @@
+// Copyright 2014 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 <string>
+
+#include "base/command_line.h"
+#include "chrome/browser/infobars/infobar_service.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/services/gcm/fake_gcm_profile_service.h"
+#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/services/gcm/push_messaging_application_id.h"
+#include "chrome/browser/services/gcm/push_messaging_constants.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "components/infobars/core/confirm_infobar_delegate.h"
+#include "components/infobars/core/infobar.h"
+#include "components/infobars/core/infobar_manager.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
+
+namespace {
+class InfoBarObserver : public infobars::InfoBarManager::Observer {
+ public:
+ InfoBarObserver(Browser* browser, bool accept)
Peter Beverloo 2014/10/20 12:45:22 I don't really like the name of InfoBarObserver gi
Peter Beverloo 2014/10/20 12:45:22 Is it much more noise to pass in a WebContents* ra
Michael van Ouwerkerk 2014/10/20 15:30:37 InfoBarResponder then, as it can deny as well as g
Michael van Ouwerkerk 2014/10/20 15:30:37 I think so.
Peter Beverloo 2014/10/20 16:35:52 Acknowledged, that sounds better :-).
Peter Beverloo 2014/10/20 16:35:52 Did you try this? The following does not look that
Michael van Ouwerkerk 2014/10/20 17:06:49 I didn't mean to dismiss a serious concern, this l
+ : infobar_service_(InfoBarService::FromWebContents(
+ browser->tab_strip_model()->GetActiveWebContents())),
+ accept_(accept) {
+ infobar_service_->AddObserver(this);
+ }
+
+ virtual ~InfoBarObserver() { infobar_service_->RemoveObserver(this); }
+
+ // infobars::InfoBarManager::Observer
+ virtual void OnInfoBarAdded(infobars::InfoBar* infobar) override {
+ ConfirmInfoBarDelegate* delegate =
+ infobar->delegate()->AsConfirmInfoBarDelegate();
Peter Beverloo 2014/10/20 12:45:22 Can we check somehow if the infobar which you're d
Michael van Ouwerkerk 2014/10/20 15:30:37 That seems to require Run-Time Type Information. B
Peter Beverloo 2014/10/20 16:35:52 I was hoping there'd be some way to get the owner
Michael van Ouwerkerk 2014/10/20 17:06:49 Acknowledged.
+ if (accept_)
+ delegate->Accept();
+ else
+ delegate->Cancel();
+ }
+
+ private:
+ InfoBarService* infobar_service_;
+ bool accept_;
+};
+} // namespace
+
+class PushMessagingBrowserTest : public InProcessBrowserTest {
+ public:
+ PushMessagingBrowserTest() : gcm_service_(nullptr) {}
+ virtual ~PushMessagingBrowserTest() {}
+
+ // InProcessBrowserTest:
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ command_line->AppendSwitch(
+ switches::kEnableExperimentalWebPlatformFeatures);
Peter Beverloo 2014/10/20 12:45:22 + InProcessBrowserTest::SetUpCommandLine()
Michael van Ouwerkerk 2014/10/20 15:30:37 Done.
+ }
+
+ // InProcessBrowserTest:
+ virtual void SetUp() override {
+ https_server_.reset(new net::SpawnedTestServer(
+ net::SpawnedTestServer::TYPE_HTTPS,
+ net::BaseTestServer::SSLOptions(
+ net::BaseTestServer::SSLOptions::CERT_OK),
+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data/"))));
+ ASSERT_TRUE(https_server_->Start());
+
+ InProcessBrowserTest::SetUp();
+ }
+
+ // InProcessBrowserTest:
+ virtual void SetUpOnMainThread() override {
+ gcm_service_ = static_cast<gcm::FakeGCMProfileService*>(
+ gcm::GCMProfileServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+ browser()->profile(), &gcm::FakeGCMProfileService::Build));
+ gcm_service_->set_collect(true);
+
+ ui_test_utils::NavigateToURL(
+ browser(), https_server_->GetURL("files/push_messaging/test.html"));
Peter Beverloo 2014/10/20 12:45:22 + InProcessBrowserTest::SetUpOnMainThread()
Michael van Ouwerkerk 2014/10/20 15:30:37 Done.
+ }
+
+ void RunScript(const std::string& script, std::string* result) {
+ ASSERT_TRUE(content::ExecuteScriptAndExtractString(
Peter Beverloo 2014/10/20 12:45:22 This still has the problem that an ASSERT_*() in a
Michael van Ouwerkerk 2014/10/20 15:30:37 It should be an ASSERT, as it would not make sense
Peter Beverloo 2014/10/20 16:35:52 My point is that ASSERTs don't work in called meth
Michael van Ouwerkerk 2014/10/20 17:06:49 Acknowledged.
+ browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(),
+ script,
+ result));
+ }
+
+ void RegisterServiceWorker(std::string* result) {
+ RunScript("registerServiceWorker()", result);
+ }
+
+ void RegisterPush(std::string* result) {
+ RunScript("registerPush('1234567890')", result);
+ }
+
+ protected:
+ scoped_ptr<net::SpawnedTestServer> https_server_;
+ gcm::FakeGCMProfileService* gcm_service_;
+
+ DISALLOW_COPY_AND_ASSIGN(PushMessagingBrowserTest);
+};
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterSuccess) {
+ std::string register_worker_result;
+ RegisterServiceWorker(&register_worker_result);
+ EXPECT_EQ("ok", register_worker_result);
+
+ InfoBarObserver accepting_observer(browser(), true);
+
+ std::string register_push_result;
+ RegisterPush(&register_push_result);
+ EXPECT_EQ(std::string(gcm::kPushMessagingEndpoint) + " - 1",
+ register_push_result);
+
+ gcm::PushMessagingApplicationId expected_id(https_server_->GetURL(""), 0L);
+ EXPECT_EQ(gcm_service_->last_registered_app_id(), expected_id.ToString());
+ EXPECT_EQ(gcm_service_->last_registered_sender_ids()[0], "1234567890");
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingBrowserTest, RegisterFailureNoPermission) {
+ std::string register_worker_result;
+ RegisterServiceWorker(&register_worker_result);
+ EXPECT_EQ("ok", register_worker_result);
+
+ InfoBarObserver cancelling_observer(browser(), false);
+
+ std::string register_push_result;
+ RegisterPush(&register_push_result);
+ EXPECT_EQ("AbortError - Registration failed - permission denied",
+ register_push_result);
+}

Powered by Google App Engine
This is Rietveld 408576698