OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/mac/scoped_nsobject.h" | 5 #include "base/mac/scoped_nsobject.h" |
6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
9 #include "chrome/browser/fullscreen.h" | 9 #include "chrome/browser/fullscreen.h" |
10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
51 } | 51 } |
52 | 52 |
53 TEST_F(BrowserWindowCocoaTest, TestWindowTitle) { | 53 TEST_F(BrowserWindowCocoaTest, TestWindowTitle) { |
54 scoped_ptr<BrowserWindowCocoa> bwc( | 54 scoped_ptr<BrowserWindowCocoa> bwc( |
55 new BrowserWindowCocoa(browser(), controller_)); | 55 new BrowserWindowCocoa(browser(), controller_)); |
56 NSString* playing_emoji = | 56 NSString* playing_emoji = |
57 l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC, base::string16()); | 57 l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_PLAYING_MAC, base::string16()); |
58 NSString* muting_emoji = | 58 NSString* muting_emoji = |
59 l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC, base::string16()); | 59 l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC, base::string16()); |
60 EXPECT_EQ([bwc->WindowTitle() rangeOfString:playing_emoji].location, | 60 EXPECT_EQ([bwc->WindowTitle() rangeOfString:playing_emoji].location, |
61 NSNotFound); | 61 static_cast<NSUInteger>(NSNotFound)); |
Scott Hess - ex-Googler
2015/11/06 14:25:07
EXPECT_EQ() is supposed to be ordered expected, th
| |
62 EXPECT_EQ([bwc->WindowTitle() rangeOfString:muting_emoji].location, | 62 EXPECT_EQ([bwc->WindowTitle() rangeOfString:muting_emoji].location, |
63 NSNotFound); | 63 static_cast<NSUInteger>(NSNotFound)); |
64 bwc->UpdateMediaState(TAB_MEDIA_STATE_AUDIO_PLAYING); | 64 bwc->UpdateMediaState(TAB_MEDIA_STATE_AUDIO_PLAYING); |
65 EXPECT_NE([bwc->WindowTitle() rangeOfString:playing_emoji].location, | 65 EXPECT_NE([bwc->WindowTitle() rangeOfString:playing_emoji].location, |
66 NSNotFound); | 66 static_cast<NSUInteger>(NSNotFound)); |
67 bwc->UpdateMediaState(TAB_MEDIA_STATE_AUDIO_MUTING); | 67 bwc->UpdateMediaState(TAB_MEDIA_STATE_AUDIO_MUTING); |
68 EXPECT_NE([bwc->WindowTitle() rangeOfString:muting_emoji].location, | 68 EXPECT_NE([bwc->WindowTitle() rangeOfString:muting_emoji].location, |
69 NSNotFound); | 69 static_cast<NSUInteger>(NSNotFound)); |
70 bwc->UpdateMediaState(TAB_MEDIA_STATE_NONE); | 70 bwc->UpdateMediaState(TAB_MEDIA_STATE_NONE); |
71 EXPECT_EQ([bwc->WindowTitle() rangeOfString:playing_emoji].location, | 71 EXPECT_EQ([bwc->WindowTitle() rangeOfString:playing_emoji].location, |
72 NSNotFound); | 72 static_cast<NSUInteger>(NSNotFound)); |
73 EXPECT_EQ([bwc->WindowTitle() rangeOfString:muting_emoji].location, | 73 EXPECT_EQ([bwc->WindowTitle() rangeOfString:muting_emoji].location, |
74 NSNotFound); | 74 static_cast<NSUInteger>(NSNotFound)); |
75 } | 75 } |
76 | 76 |
77 // Test that IsMaximized() returns false when the browser window goes from | 77 // Test that IsMaximized() returns false when the browser window goes from |
78 // maximized to minimized state - http://crbug/452976. | 78 // maximized to minimized state - http://crbug/452976. |
79 TEST_F(BrowserWindowCocoaTest, TestMinimizeState) { | 79 TEST_F(BrowserWindowCocoaTest, TestMinimizeState) { |
80 scoped_ptr<BrowserWindowCocoa> bwc( | 80 scoped_ptr<BrowserWindowCocoa> bwc( |
81 new BrowserWindowCocoa(browser(), controller_)); | 81 new BrowserWindowCocoa(browser(), controller_)); |
82 | 82 |
83 EXPECT_FALSE(bwc->IsMinimized()); | 83 EXPECT_FALSE(bwc->IsMinimized()); |
84 bwc->Maximize(); | 84 bwc->Maximize(); |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
204 [[[window_ stub] andReturn:nil] delegate]; | 204 [[[window_ stub] andReturn:nil] delegate]; |
205 [[[controller_ stub] andReturn:window_] window]; | 205 [[[controller_ stub] andReturn:window_] window]; |
206 [[window_ expect] orderOut:nil]; | 206 [[window_ expect] orderOut:nil]; |
207 [[window_ expect] close]; | 207 [[window_ expect] close]; |
208 CreateAndCloseBrowserWindow(); | 208 CreateAndCloseBrowserWindow(); |
209 EXPECT_OCMOCK_VERIFY(controller_); | 209 EXPECT_OCMOCK_VERIFY(controller_); |
210 EXPECT_OCMOCK_VERIFY(window_); | 210 EXPECT_OCMOCK_VERIFY(window_); |
211 } | 211 } |
212 | 212 |
213 // TODO(???): test other methods of BrowserWindowCocoa | 213 // TODO(???): test other methods of BrowserWindowCocoa |
OLD | NEW |