| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" | 5 #include "chrome/browser/apps/app_shim/app_shim_host_mac.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/memory/scoped_vector.h" | 10 #include "base/memory/scoped_vector.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 apps::AppShimLaunchResult GetLaunchResult() { | 71 apps::AppShimLaunchResult GetLaunchResult() { |
| 72 EXPECT_EQ(1u, host()->sent_messages().size()); | 72 EXPECT_EQ(1u, host()->sent_messages().size()); |
| 73 IPC::Message* message = host()->sent_messages()[0]; | 73 IPC::Message* message = host()->sent_messages()[0]; |
| 74 EXPECT_EQ(AppShimMsg_LaunchApp_Done::ID, message->type()); | 74 EXPECT_EQ(AppShimMsg_LaunchApp_Done::ID, message->type()); |
| 75 AppShimMsg_LaunchApp_Done::Param param; | 75 AppShimMsg_LaunchApp_Done::Param param; |
| 76 AppShimMsg_LaunchApp_Done::Read(message, ¶m); | 76 AppShimMsg_LaunchApp_Done::Read(message, ¶m); |
| 77 return base::get<0>(param); | 77 return base::get<0>(param); |
| 78 } | 78 } |
| 79 | 79 |
| 80 void SimulateDisconnect() { | 80 void SimulateDisconnect() { |
| 81 implicit_cast<IPC::Listener*>(host_.release())->OnChannelError(); | 81 static_cast<IPC::Listener*>(host_.release())->OnChannelError(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 protected: | 84 protected: |
| 85 void OnShimLaunch(Host* host, | 85 void OnShimLaunch(Host* host, |
| 86 apps::AppShimLaunchType launch_type, | 86 apps::AppShimLaunchType launch_type, |
| 87 const std::vector<base::FilePath>& file) override { | 87 const std::vector<base::FilePath>& file) override { |
| 88 ++launch_count_; | 88 ++launch_count_; |
| 89 if (launch_type == apps::APP_SHIM_LAUNCH_NORMAL) | 89 if (launch_type == apps::APP_SHIM_LAUNCH_NORMAL) |
| 90 ++launch_now_count_; | 90 ++launch_now_count_; |
| 91 host->OnAppLaunchComplete(launch_result_); | 91 host->OnAppLaunchComplete(launch_result_); |
| (...skipping 29 matching lines...) Expand all Loading... |
| 121 DISALLOW_COPY_AND_ASSIGN(AppShimHostTest); | 121 DISALLOW_COPY_AND_ASSIGN(AppShimHostTest); |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 | 124 |
| 125 } // namespace | 125 } // namespace |
| 126 | 126 |
| 127 TEST_F(AppShimHostTest, TestLaunchAppWithHandler) { | 127 TEST_F(AppShimHostTest, TestLaunchAppWithHandler) { |
| 128 apps::AppShimHandler::RegisterHandler(kTestAppId, this); | 128 apps::AppShimHandler::RegisterHandler(kTestAppId, this); |
| 129 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); | 129 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); |
| 130 EXPECT_EQ(kTestAppId, | 130 EXPECT_EQ(kTestAppId, |
| 131 implicit_cast<apps::AppShimHandler::Host*>(host())->GetAppId()); | 131 static_cast<apps::AppShimHandler::Host*>(host())->GetAppId()); |
| 132 EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult()); | 132 EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult()); |
| 133 EXPECT_EQ(1, launch_count_); | 133 EXPECT_EQ(1, launch_count_); |
| 134 EXPECT_EQ(1, launch_now_count_); | 134 EXPECT_EQ(1, launch_now_count_); |
| 135 EXPECT_EQ(0, focus_count_); | 135 EXPECT_EQ(0, focus_count_); |
| 136 EXPECT_EQ(0, close_count_); | 136 EXPECT_EQ(0, close_count_); |
| 137 | 137 |
| 138 // A second OnAppLaunchComplete is ignored. | 138 // A second OnAppLaunchComplete is ignored. |
| 139 implicit_cast<apps::AppShimHandler::Host*>(host())-> | 139 static_cast<apps::AppShimHandler::Host*>(host()) |
| 140 OnAppLaunchComplete(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND); | 140 ->OnAppLaunchComplete(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND); |
| 141 EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult()); | 141 EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult()); |
| 142 | 142 |
| 143 EXPECT_TRUE(host()->ReceiveMessage( | 143 EXPECT_TRUE(host()->ReceiveMessage( |
| 144 new AppShimHostMsg_FocusApp(apps::APP_SHIM_FOCUS_NORMAL, | 144 new AppShimHostMsg_FocusApp(apps::APP_SHIM_FOCUS_NORMAL, |
| 145 std::vector<base::FilePath>()))); | 145 std::vector<base::FilePath>()))); |
| 146 EXPECT_EQ(1, focus_count_); | 146 EXPECT_EQ(1, focus_count_); |
| 147 | 147 |
| 148 EXPECT_TRUE(host()->ReceiveMessage(new AppShimHostMsg_QuitApp())); | 148 EXPECT_TRUE(host()->ReceiveMessage(new AppShimHostMsg_QuitApp())); |
| 149 EXPECT_EQ(1, quit_count_); | 149 EXPECT_EQ(1, quit_count_); |
| 150 | 150 |
| 151 SimulateDisconnect(); | 151 SimulateDisconnect(); |
| 152 EXPECT_EQ(1, close_count_); | 152 EXPECT_EQ(1, close_count_); |
| 153 apps::AppShimHandler::RemoveHandler(kTestAppId); | 153 apps::AppShimHandler::RemoveHandler(kTestAppId); |
| 154 } | 154 } |
| 155 | 155 |
| 156 TEST_F(AppShimHostTest, TestNoLaunchNow) { | 156 TEST_F(AppShimHostTest, TestNoLaunchNow) { |
| 157 apps::AppShimHandler::RegisterHandler(kTestAppId, this); | 157 apps::AppShimHandler::RegisterHandler(kTestAppId, this); |
| 158 LaunchApp(apps::APP_SHIM_LAUNCH_REGISTER_ONLY); | 158 LaunchApp(apps::APP_SHIM_LAUNCH_REGISTER_ONLY); |
| 159 EXPECT_EQ(kTestAppId, | 159 EXPECT_EQ(kTestAppId, |
| 160 implicit_cast<apps::AppShimHandler::Host*>(host())->GetAppId()); | 160 static_cast<apps::AppShimHandler::Host*>(host())->GetAppId()); |
| 161 EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult()); | 161 EXPECT_EQ(apps::APP_SHIM_LAUNCH_SUCCESS, GetLaunchResult()); |
| 162 EXPECT_EQ(1, launch_count_); | 162 EXPECT_EQ(1, launch_count_); |
| 163 EXPECT_EQ(0, launch_now_count_); | 163 EXPECT_EQ(0, launch_now_count_); |
| 164 EXPECT_EQ(0, focus_count_); | 164 EXPECT_EQ(0, focus_count_); |
| 165 EXPECT_EQ(0, close_count_); | 165 EXPECT_EQ(0, close_count_); |
| 166 apps::AppShimHandler::RemoveHandler(kTestAppId); | 166 apps::AppShimHandler::RemoveHandler(kTestAppId); |
| 167 } | 167 } |
| 168 | 168 |
| 169 TEST_F(AppShimHostTest, TestFailLaunch) { | 169 TEST_F(AppShimHostTest, TestFailLaunch) { |
| 170 apps::AppShimHandler::RegisterHandler(kTestAppId, this); | 170 apps::AppShimHandler::RegisterHandler(kTestAppId, this); |
| 171 launch_result_ = apps::APP_SHIM_LAUNCH_APP_NOT_FOUND; | 171 launch_result_ = apps::APP_SHIM_LAUNCH_APP_NOT_FOUND; |
| 172 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); | 172 LaunchApp(apps::APP_SHIM_LAUNCH_NORMAL); |
| 173 EXPECT_EQ(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND, GetLaunchResult()); | 173 EXPECT_EQ(apps::APP_SHIM_LAUNCH_APP_NOT_FOUND, GetLaunchResult()); |
| 174 apps::AppShimHandler::RemoveHandler(kTestAppId); | 174 apps::AppShimHandler::RemoveHandler(kTestAppId); |
| 175 } | 175 } |
| OLD | NEW |