From 98c1d817896f8723dcf348d6e6d292c42f9a6c13 Mon Sep 17 00:00:00 2001 From: "rpaquay@chromium.org" Date: Wed, 24 Apr 2013 05:10:08 +0000 Subject: Improve implementation and add tests. The first CL for bug 180618 contained initial support for the tag. This is a follow up CL to * fix issues related to various combinations of flags, permissions and property/attributes behavior, * add corresponding tests, * and improve code readability of "ad_view.js" BUG=226125 TBR=asargent@chromium.org (for trivial changes in chrome/browser/component_updater/test/component_updater_service_unittest.cc) Review URL: https://chromiumcodereview.appspot.com/12967016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196036 0039d316-1c4b-4281-b951-d872f2087c98 --- .../test/component_updater_service_unittest.cc | 12 +- chrome/browser/extensions/ad_view_browsertest.cc | 143 ++++++++++++++++++--- .../api/management/management_browsertest.cc | 10 +- .../extension_disabled_ui_browsertest.cc | 2 +- 4 files changed, 139 insertions(+), 28 deletions(-) (limited to 'chrome/browser') diff --git a/chrome/browser/component_updater/test/component_updater_service_unittest.cc b/chrome/browser/component_updater/test/component_updater_service_unittest.cc index 6689e49..ce85ad1 100644 --- a/chrome/browser/component_updater/test/component_updater_service_unittest.cc +++ b/chrome/browser/component_updater/test/component_updater_service_unittest.cc @@ -294,7 +294,7 @@ TEST_F(ComponentUpdaterTest, CheckCrxSleep) { io_thread.StartIOThread(); file_thread.Start(); - content::URLRequestPrepackagedInterceptor interceptor; + content::URLLocalHostRequestPrepackagedInterceptor interceptor; CrxComponent com; EXPECT_EQ(ComponentUpdateService::kOk, @@ -373,7 +373,7 @@ TEST_F(ComponentUpdaterTest, InstallCrx) { io_thread.StartIOThread(); file_thread.Start(); - content::URLRequestPrepackagedInterceptor interceptor; + content::URLLocalHostRequestPrepackagedInterceptor interceptor; CrxComponent com1; RegisterComponent(&com1, kTestComponent_jebg, Version("0.9")); @@ -438,7 +438,7 @@ TEST_F(ComponentUpdaterTest, InstallCrxTwoSources) { io_thread.StartIOThread(); file_thread.Start(); - content::URLRequestPrepackagedInterceptor interceptor; + content::URLLocalHostRequestPrepackagedInterceptor interceptor; CrxComponent com1; RegisterComponent(&com1, kTestComponent_abag, Version("2.2")); @@ -510,7 +510,7 @@ TEST_F(ComponentUpdaterTest, ProdVersionCheck) { io_thread.StartIOThread(); file_thread.Start(); - content::URLRequestPrepackagedInterceptor interceptor; + content::URLLocalHostRequestPrepackagedInterceptor interceptor; CrxComponent com; RegisterComponent(&com, kTestComponent_jebg, Version("0.9")); @@ -550,7 +550,7 @@ TEST_F(ComponentUpdaterTest, CheckForUpdateSoon) { io_thread.StartIOThread(); file_thread.Start(); - content::URLRequestPrepackagedInterceptor interceptor; + content::URLLocalHostRequestPrepackagedInterceptor interceptor; CrxComponent com1; RegisterComponent(&com1, kTestComponent_abag, Version("2.2")); @@ -666,7 +666,7 @@ TEST_F(ComponentUpdaterTest, CheckReRegistration) { io_thread.StartIOThread(); file_thread.Start(); - content::URLRequestPrepackagedInterceptor interceptor; + content::URLLocalHostRequestPrepackagedInterceptor interceptor; CrxComponent com1; RegisterComponent(&com1, kTestComponent_jebg, Version("0.9")); diff --git a/chrome/browser/extensions/ad_view_browsertest.cc b/chrome/browser/extensions/ad_view_browsertest.cc index bb6310a..0391268 100644 --- a/chrome/browser/extensions/ad_view_browsertest.cc +++ b/chrome/browser/extensions/ad_view_browsertest.cc @@ -1,10 +1,12 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Copyright 2013 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/extensions/extension_test_message_listener.h" #include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/common/chrome_switches.h" +#include "content/test/net/url_request_prepackaged_interceptor.h" +#include "net/url_request/url_fetcher.h" class AdViewTest : public extensions::PlatformAppBrowserTest { protected: @@ -15,34 +17,143 @@ class AdViewTest : public extensions::PlatformAppBrowserTest { } }; -IN_PROC_BROWSER_TEST_F(AdViewTest, LoadEventIsCalled) { +// This test checks the "loadcommit" event is called when the page inside an +// is loaded. +IN_PROC_BROWSER_TEST_F(AdViewTest, LoadCommitEventIsCalled) { ASSERT_TRUE(StartTestServer()); - ExtensionTestMessageListener listener("guest-loaded", false); - LoadAndLaunchPlatformApp("ad_view/load_event"); - ASSERT_TRUE(listener.WaitUntilSatisfied()); + ASSERT_TRUE(RunPlatformAppTest( + "platform_apps/ad_view/loadcommit_event")) << message_; } +// This test checks the "loadabort" event is called when the "src" attribute +// of an is an invalid URL. +IN_PROC_BROWSER_TEST_F(AdViewTest, LoadAbortEventIsCalled) { + ASSERT_TRUE(StartTestServer()); + + ASSERT_TRUE(RunPlatformAppTest( + "platform_apps/ad_view/loadabort_event")) << message_; +} + +// This test checks the page loaded inside an has the ability to +// 1) receive "message" events from the application, and 2) use +// "window.postMessage" to post back a message to the application. #if defined(OS_WIN) // Flaky, or takes too long time on Win7. (http://crbug.com/230271) -#define MAYBE_AdNetworkIsLoaded DISABLED_AdNetworkIsLoaded +#define MAYBE_CommitMessageFromAdNetwork DISABLED_CommitMessageFromAdNetwork #else -#define MAYBE_AdNetworkIsLoaded AdNetworkIsLoaded +#define MAYBE_CommitMessageFromAdNetwork CommitMessageFromAdNetwork #endif -IN_PROC_BROWSER_TEST_F(AdViewTest, MAYBE_AdNetworkIsLoaded) { +IN_PROC_BROWSER_TEST_F(AdViewTest, MAYBE_CommitMessageFromAdNetwork) { ASSERT_TRUE(StartTestServer()); - ExtensionTestMessageListener listener("ad-network-loaded", false); - LoadAndLaunchPlatformApp("ad_view/ad_network_loaded"); - ASSERT_TRUE(listener.WaitUntilSatisfied()); + ASSERT_TRUE(RunPlatformAppTest( + "platform_apps/ad_view/onloadcommit_ack")) << message_; } -// This test currently fails on trybots because it requires new binary file -// (image315.png). The test will be enabled once the binary files are committed. +// This test checks the page running inside an has the ability to load +// and display an image inside an