Chromium Code Reviews| Index: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm |
| =================================================================== |
| --- chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm (revision 99418) |
| +++ chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm (working copy) |
| @@ -144,8 +144,6 @@ |
| EXPECT_NSEQ([[controller warningsField] stringValue], |
| base::SysUTF16ToNSString(prompt.GetPermission(0))); |
| - EXPECT_TRUE([controller warningsBox] != nil); |
| - |
| EXPECT_TRUE([controller cancelButton] != nil); |
| EXPECT_NE(0u, [[[controller cancelButton] stringValue] length]); |
| EXPECT_NE('^', [[[controller cancelButton] stringValue] characterAtIndex:0]); |
| @@ -236,12 +234,6 @@ |
| ASSERT_LT([[controller1 warningsField] frame].size.height, |
| [[controller2 warningsField] frame].size.height); |
| - ASSERT_LT([[controller1 warningsBox] frame].size.height, |
| - [[controller2 warningsBox] frame].size.height); |
| - |
| - ASSERT_EQ([[controller1 warningsBox] frame].origin.y, |
| - [[controller2 warningsBox] frame].origin.y); |
| - |
| ASSERT_LT([[controller1 subtitleField] frame].origin.y, |
| [[controller2 subtitleField] frame].origin.y); |
| @@ -259,8 +251,6 @@ |
| ExtensionInstallUI::Prompt no_warnings_prompt( |
| ExtensionInstallUI::INSTALL_PROMPT); |
| - std::vector<string16> warnings; |
| - |
| scoped_nsobject<ExtensionInstallDialogController> |
| controller([[ExtensionInstallDialogController alloc] |
| initWithParentWindow:test_window() |
| @@ -294,5 +284,64 @@ |
| EXPECT_TRUE([controller subtitleField] == nil); |
| EXPECT_TRUE([controller warningsField] == nil); |
| - EXPECT_TRUE([controller warningsBox] == nil); |
| } |
| + |
| + |
| +// Test that we can load the inline prompt correctly, and that the outlets are |
| +// are hooked up. |
| +TEST_F(ExtensionInstallDialogControllerTest, BasicsInline) { |
| + scoped_ptr<MockExtensionInstallUIDelegate> delegate( |
| + new MockExtensionInstallUIDelegate); |
|
Nico
2011/09/05 22:59:17
Can't you stack-allocate this?
Mihai Parparita -not on Chrome
2011/09/06 00:54:11
Was just following the pattern in the rest of the
|
| + |
| + // No warnings should trigger skinny prompt. |
| + ExtensionInstallUI::Prompt inline_prompt( |
| + ExtensionInstallUI::INLINE_INSTALL_PROMPT); |
| + inline_prompt.SetInlineInstallWebstoreData("1,000", 3.5, 200); |
| + |
| + scoped_nsobject<ExtensionInstallDialogController> |
| + controller([[ExtensionInstallDialogController alloc] |
| + initWithParentWindow:test_window() |
| + profile:helper_.profile() |
| + extension:extension_.get() |
| + delegate:delegate.get() |
| + icon:&icon_ |
| + prompt:inline_prompt]); |
| + |
| + [controller window]; // force nib load |
| + |
| + // Test the right nib loaded. |
| + EXPECT_NSEQ(@"ExtensionInstallPromptInline", [controller windowNibName]); |
| + |
| + // Check all the controls. |
| + EXPECT_TRUE([controller iconView] != nil); |
| + EXPECT_TRUE([[controller iconView] image] != nil); |
| + |
| + EXPECT_TRUE([controller titleField] != nil); |
| + EXPECT_NE(0u, [[[controller titleField] stringValue] length]); |
| + |
| + EXPECT_TRUE([controller cancelButton] != nil); |
| + EXPECT_NE(0u, [[[controller cancelButton] stringValue] length]); |
| + EXPECT_NE('^', [[[controller cancelButton] stringValue] characterAtIndex:0]); |
| + |
| + EXPECT_TRUE([controller okButton] != nil); |
| + EXPECT_NE(0u, [[[controller okButton] stringValue] length]); |
| + EXPECT_NE('^', [[[controller okButton] stringValue] characterAtIndex:0]); |
| + |
| + EXPECT_TRUE([controller ratingStars] != nil); |
| + EXPECT_EQ(5u, [[[controller ratingStars] subviews] count]); |
| + |
| + EXPECT_TRUE([controller ratingCountField] != nil); |
| + EXPECT_NE(0u, [[[controller ratingCountField] stringValue] length]); |
| + |
| + EXPECT_TRUE([controller userCountField] != nil); |
| + EXPECT_NE(0u, [[[controller userCountField] stringValue] length]); |
| + |
| + // Though we have no permissions warnings, these should still be hooked up, |
| + // just invisible |
|
Nico
2011/09/05 22:59:17
trailing .
Mihai Parparita -not on Chrome
2011/09/06 00:54:11
Done.
|
| + EXPECT_TRUE([controller subtitleField] != nil); |
| + EXPECT_TRUE([[controller subtitleField] isHidden]); |
| + EXPECT_TRUE([controller warningsField] != nil); |
| + EXPECT_TRUE([[controller warningsField] isHidden]); |
| + EXPECT_TRUE([controller warningsSeparator] != nil); |
| + EXPECT_TRUE([[controller warningsSeparator] isHidden]); |
| +} |