| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #import "base/mac/scoped_nsobject.h" | 7 #import "base/mac/scoped_nsobject.h" |
| 8 #include "base/strings/sys_string_conversions.h" | 8 #include "base/strings/sys_string_conversions.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #import "chrome/browser/extensions/extension_install_prompt.h" | 10 #import "chrome/browser/extensions/extension_install_prompt.h" |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 [[[controller storeLinkButton] stringValue] characterAtIndex:0]); | 255 [[[controller storeLinkButton] stringValue] characterAtIndex:0]); |
| 256 | 256 |
| 257 // Though we have no permissions warnings, these should still be hooked up, | 257 // Though we have no permissions warnings, these should still be hooked up, |
| 258 // just invisible. | 258 // just invisible. |
| 259 EXPECT_TRUE([controller outlineView]); | 259 EXPECT_TRUE([controller outlineView]); |
| 260 EXPECT_TRUE([[[controller outlineView] enclosingScrollView] isHidden]); | 260 EXPECT_TRUE([[[controller outlineView] enclosingScrollView] isHidden]); |
| 261 EXPECT_TRUE([controller warningsSeparator]); | 261 EXPECT_TRUE([controller warningsSeparator]); |
| 262 EXPECT_TRUE([[controller warningsSeparator] isHidden]); | 262 EXPECT_TRUE([[controller warningsSeparator] isHidden]); |
| 263 } | 263 } |
| 264 | 264 |
| 265 TEST_F(ExtensionInstallViewControllerTest, OAuthIssues) { | |
| 266 chrome::MockExtensionInstallPromptDelegate delegate; | |
| 267 | |
| 268 ExtensionInstallPrompt::Prompt prompt = | |
| 269 chrome::BuildExtensionInstallPrompt(extension_.get()); | |
| 270 std::vector<base::string16> permissions; | |
| 271 permissions.push_back(base::UTF8ToUTF16("warning 1")); | |
| 272 prompt.SetPermissions(permissions); | |
| 273 // No details provided with this permission. | |
| 274 std::vector<base::string16> details; | |
| 275 details.push_back(base::string16()); | |
| 276 prompt.SetPermissionsDetails(details); | |
| 277 | |
| 278 IssueAdviceInfoEntry issue; | |
| 279 issue.description = base::UTF8ToUTF16("issue description 1"); | |
| 280 issue.details.push_back(base::UTF8ToUTF16("issue detail 1")); | |
| 281 IssueAdviceInfo issues; | |
| 282 issues.push_back(issue); | |
| 283 prompt.SetOAuthIssueAdvice(issues); | |
| 284 prompt.SetIsShowingDetails( | |
| 285 ExtensionInstallPrompt::OAUTH_DETAILS, 0, true); | |
| 286 | |
| 287 base::scoped_nsobject<ExtensionInstallViewController> controller( | |
| 288 [[ExtensionInstallViewController alloc] initWithNavigator:browser() | |
| 289 delegate:&delegate | |
| 290 prompt:prompt]); | |
| 291 | |
| 292 [controller view]; // Force nib load. | |
| 293 NSOutlineView* outlineView = [controller outlineView]; | |
| 294 EXPECT_TRUE(outlineView); | |
| 295 EXPECT_EQ(6, [outlineView numberOfRows]); | |
| 296 EXPECT_NSEQ(base::SysUTF16ToNSString(prompt.GetOAuthIssue(0).description), | |
| 297 [[outlineView dataSource] outlineView:outlineView | |
| 298 objectValueForTableColumn:nil | |
| 299 byItem:[outlineView itemAtRow:3]]); | |
| 300 | |
| 301 EXPECT_NSEQ(base::SysUTF16ToNSString(prompt.GetOAuthIssue(0).details[0]), | |
| 302 [[outlineView dataSource] outlineView:outlineView | |
| 303 objectValueForTableColumn:nil | |
| 304 byItem:[outlineView itemAtRow:4]]); | |
| 305 } | |
| 306 | |
| 307 TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) { | 265 TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) { |
| 308 chrome::MockExtensionInstallPromptDelegate delegate; | 266 chrome::MockExtensionInstallPromptDelegate delegate; |
| 309 | 267 |
| 310 ExtensionInstallPrompt::Prompt prompt = | 268 ExtensionInstallPrompt::Prompt prompt = |
| 311 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); | 269 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); |
| 312 std::vector<base::string16> permissions; | 270 std::vector<base::string16> permissions; |
| 313 permissions.push_back(base::UTF8ToUTF16("warning 1")); | 271 permissions.push_back(base::UTF8ToUTF16("warning 1")); |
| 314 prompt.SetPermissions(permissions); | 272 prompt.SetPermissions(permissions); |
| 315 // No details provided with this permission. | 273 // No details provided with this permission. |
| 316 std::vector<base::string16> details; | 274 std::vector<base::string16> details; |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 [controller view]; // Force nib load. | 313 [controller view]; // Force nib load. |
| 356 | 314 |
| 357 NSOutlineView* outlineView = [controller outlineView]; | 315 NSOutlineView* outlineView = [controller outlineView]; |
| 358 EXPECT_TRUE(outlineView); | 316 EXPECT_TRUE(outlineView); |
| 359 EXPECT_EQ(4, [outlineView numberOfRows]); | 317 EXPECT_EQ(4, [outlineView numberOfRows]); |
| 360 EXPECT_NSEQ(base::SysUTF16ToNSString(prompt.GetPermissionsDetails(0)), | 318 EXPECT_NSEQ(base::SysUTF16ToNSString(prompt.GetPermissionsDetails(0)), |
| 361 [[outlineView dataSource] outlineView:outlineView | 319 [[outlineView dataSource] outlineView:outlineView |
| 362 objectValueForTableColumn:nil | 320 objectValueForTableColumn:nil |
| 363 byItem:[outlineView itemAtRow:2]]); | 321 byItem:[outlineView itemAtRow:2]]); |
| 364 } | 322 } |
| OLD | NEW |