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

Unified Diff: apps/app_shim/app_shim_interactive_uitest_mac.mm

Issue 316493002: [Mac] Add interactive App Shim test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 6 years, 6 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: apps/app_shim/app_shim_interactive_uitest_mac.mm
diff --git a/apps/app_shim/app_shim_interactive_uitest_mac.mm b/apps/app_shim/app_shim_interactive_uitest_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..ca13b3f224937fa51186e71a2f91eb31b74b1f73
--- /dev/null
+++ b/apps/app_shim/app_shim_interactive_uitest_mac.mm
@@ -0,0 +1,227 @@
+// 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.
+
+#import <Cocoa/Cocoa.h>
+#include <vector>
+
+#include "apps/app_shim/app_shim_host_manager_mac.h"
+#include "apps/app_shim/extension_app_shim_handler_mac.h"
+#include "apps/switches.h"
+#include "apps/ui/native_app_window.h"
+#include "base/auto_reset.h"
+#include "base/callback.h"
+#include "base/files/file_path_watcher.h"
+#include "base/mac/foundation_util.h"
+#include "base/mac/launch_services_util.h"
+#include "base/mac/scoped_nsobject.h"
+#include "base/path_service.h"
+#include "base/process/launch.h"
+#include "base/strings/sys_string_conversions.h"
+#include "base/test/test_timeouts.h"
+#include "chrome/browser/apps/app_browsertest_util.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/extensions/extension_test_message_listener.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/web_applications/web_app_mac.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/common/mac/app_mode_common.h"
+#include "content/public/test/test_utils.h"
+#include "extensions/browser/extension_registry.h"
+#import "ui/events/test/cocoa_test_event_utils.h"
+
+namespace {
+
+// General end-to-end test for app shims.
+class AppShimInteractiveTest : public extensions::PlatformAppBrowserTest {
+ protected:
+ AppShimInteractiveTest()
+ : auto_reset_(&g_app_shims_allow_update_and_launch_in_tests, true) {}
+
+ // Temporarily enable app shims.
+ base::AutoReset<bool> auto_reset_;
+
+ DISALLOW_COPY_AND_ASSIGN(AppShimInteractiveTest);
+};
+
+// Watches for changes to a file. This is designed to be used from the the UI
+// thread.
+class WindowedFilePathWatcher
+ : public base::RefCountedThreadSafe<WindowedFilePathWatcher> {
+ public:
+ WindowedFilePathWatcher(const base::FilePath& path)
+ : observed_(false) {
+ content::BrowserThread::PostTask(
+ content::BrowserThread::FILE,
tapted 2014/06/04 09:36:03 nit: indent 2 more spaces
jackhou1 2014/06/05 02:57:11 Done.
+ FROM_HERE,
+ base::Bind(&WindowedFilePathWatcher::Watch, this, path));
+ }
+
+ void Wait() {
+ if (observed_)
+ return;
+
+ run_loop_.reset(new base::RunLoop);
+ run_loop_->Run();
+ }
+
+ protected:
+ friend class base::RefCountedThreadSafe<WindowedFilePathWatcher>;
+ virtual ~WindowedFilePathWatcher() {}
+
+ void Watch(const base::FilePath& path) {
+ watcher_.Watch(
+ path, false, base::Bind(&WindowedFilePathWatcher::Observe, this));
+ }
+
+ void Observe(const base::FilePath& path, bool error) {
+ observed_ = true;
+ content::BrowserThread::PostTask(
+ content::BrowserThread::UI,
tapted 2014/06/04 09:36:03 nit: indent
jackhou1 2014/06/05 02:57:11 Done.
+ FROM_HERE,
+ base::Bind(&WindowedFilePathWatcher::StopRunLoop, this));
+ }
+
+ void StopRunLoop() {
+ if (run_loop_.get())
+ run_loop_->Quit();
+ }
+
+ base::FilePathWatcher watcher_;
+ bool observed_;
+ scoped_ptr<base::RunLoop> run_loop_;
+
+ DISALLOW_COPY_AND_ASSIGN(WindowedFilePathWatcher);
+};
+
+NSString* GetBundleID(const base::FilePath& shim_path) {
+ base::FilePath plist_path = shim_path.Append("Contents").Append("Info.plist");
+ NSMutableDictionary* plist = [NSMutableDictionary
+ dictionaryWithContentsOfFile:base::mac::FilePathToNSString(plist_path)];
+ return [plist objectForKey:base::mac::CFToNSCast(kCFBundleIdentifierKey)];
+}
+
+bool HasAppShimHost(Profile* profile, const std::string& app_id) {
+ return g_browser_process->platform_part()->app_shim_host_manager()->
+ extension_app_shim_handler()->FindHost(profile, app_id);
+}
+
+} // namespace
+
+// Watches for NSNotifications from the shared workspace.
+@interface WindowedNSNotificationObserver : NSObject {
+ @private
+ BOOL notificationReceived_;
+ scoped_ptr<base::RunLoop> runLoop_;
+}
+
+-(id) initForNotification:(NSString*)name;
tapted 2014/06/04 09:36:03 nit: spacing on all these should be like - (id)in
jackhou1 2014/06/05 02:57:11 Done.
+-(void) observe:(NSNotification*)notification;
+-(void) wait;
+@end
+
+@implementation WindowedNSNotificationObserver
+
+-(id) initForNotification:(NSString*)name {
+ if (self = [super init]) {
+ [[[NSWorkspace sharedWorkspace] notificationCenter]
+ addObserver:self
tapted 2014/06/04 09:36:03 nit: min 4 spaces indent
jackhou1 2014/06/05 02:57:11 Done.
+ selector:@selector(observe:)
+ name:name
+ object:nil];
+ }
+ return self;
+}
+
+-(void) observe:(NSNotification*)notification {
+ DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+ [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
+ notificationReceived_ = YES;
tapted 2014/06/04 09:36:03 I think this will quit once any application is sta
jackhou1 2014/06/05 02:57:11 Done.
+ if (runLoop_.get())
+ runLoop_->Quit();
+}
+
+-(void) wait {
+ if (notificationReceived_)
+ return;
+
+ runLoop_.reset(new base::RunLoop);
+ runLoop_->Run();
+}
+
+@end
+
+namespace apps {
+
+// Test that launching the shim for an app starts the app, and vice versa.
+// These two cases are combined because the time to run the test is dominated
+// by loading the extension and creating the shim.
+IN_PROC_BROWSER_TEST_F(AppShimInteractiveTest, Launch) {
+ // Create the internal app shim.
+ const extensions::Extension* app = InstallPlatformApp("minimal");
+
+ // Use a WebAppShortcutCreator to get the path.
+ web_app::WebAppShortcutCreator shortcut_creator(
+ web_app::GetWebAppDataDirectory(profile()->GetPath(), app->id(), GURL()),
+ web_app::ShortcutInfoForExtensionAndProfile(app, profile()),
+ extensions::FileHandlersInfo());
+ base::FilePath shim_path = shortcut_creator.GetInternalShortcutPath();
+ EXPECT_FALSE(base::PathExists(shim_path));
+
+ // Simulate updating the app. FilePathWatcher is used to wait for file
+ // operations on the shim to be finished before attempting to launch it.
+ scoped_refptr<WindowedFilePathWatcher> file_watcher =
+ new WindowedFilePathWatcher(shim_path);
tapted 2014/06/04 09:36:03 I think this is watching the .app root directory?
jackhou1 2014/06/05 02:57:11 It's guaranteed but in a non-obvious way. Added a
tapted 2014/06/05 04:08:01 Ah - cool makes sense. FilePathWatcher's documenta
+ web_app::UpdateAllShortcuts(base::string16(), profile(), app);
+ file_watcher->Wait();
+ NSString* bundle_id = GetBundleID(shim_path);
+
+ // Case 1: Launch the shim, it should start the app.
+ {
+ ExtensionTestMessageListener launched_listener("Launched", false);
+ CommandLine shim_cmdline(CommandLine::NO_PROGRAM);
+ shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
+ ProcessSerialNumber shim_psn;
+ ASSERT_TRUE(base::mac::OpenApplicationWithPath(
+ shim_path, shim_cmdline, kLSLaunchDefaults, &shim_psn));
+ ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
+
+ EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
+
+ // If the window is closed, the shim should quit.
+ pid_t shim_pid;
+ EXPECT_EQ(noErr, GetProcessPID(&shim_psn, &shim_pid));
+ GetFirstAppWindow()->GetBaseWindow()->Close();
+ ASSERT_TRUE(base::WaitForSingleProcess(
+ shim_pid, TestTimeouts::action_timeout()));
+
+ EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
+ }
+
+ // Case 2: Launch the app, it should start the shim.
+ {
+ base::scoped_nsobject<WindowedNSNotificationObserver> observer;
+ observer.reset([[WindowedNSNotificationObserver alloc]
+ initForNotification:NSWorkspaceDidLaunchApplicationNotification]);
+ LaunchPlatformApp(app);
+ [observer wait];
+
+ // Quitting the shim eventually closes the app.
+ NSArray* running_shim = [NSRunningApplication
tapted 2014/06/04 09:36:03 git cl format might format this line differently t
jackhou1 2014/06/05 02:57:11 Ran git cl format. It's ok with this, but it puts
+ runningApplicationsWithBundleIdentifier:bundle_id];
+ ASSERT_EQ(1u, [running_shim count]);
+
+ observer.reset([[WindowedNSNotificationObserver alloc]
+ initForNotification:NSWorkspaceDidTerminateApplicationNotification]);
+ [base::mac::ObjCCastStrict<NSRunningApplication>(
+ [running_shim objectAtIndex:0]) terminate];
+ [observer wait];
tapted 2014/06/04 09:36:03 I *think* this is not racy, but it might need a co
jackhou1 2014/06/05 02:57:11 I think this is only fired when the shim actually
tapted 2014/06/05 04:08:01 Yep - I just meant it's subtle that [NSRunnignAppl
jackhou1 2014/06/05 05:11:01 Done.
+
+ EXPECT_FALSE(GetFirstAppWindow());
+ EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
tapted 2014/06/04 09:36:03 add a matching EXPECT_TRUE(HasAppShimHost../window
jackhou1 2014/06/05 02:57:11 Looks like I need to wait for the shim to connect
+ }
+}
+
+} // namespace apps
« no previous file with comments | « no previous file | apps/app_shim/chrome_main_app_mode_mac.mm » ('j') | chrome/browser/web_applications/web_app_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698