OLD | NEW |
---|---|
(Empty) | |
1 // Copyright (c) 2015 The Chromium Authors. All rights reserved. | |
Robert Sesek
2015/04/01 16:25:02
nit: no (c) in new files
shrike
2015/04/01 20:55:55
More copy/paste fallout. Done.
| |
2 // Use of this source code is governed by a BSD-style license that can be | |
3 // found in the LICENSE file. | |
4 | |
5 #include "chrome/browser/ui/cocoa/spinner_view.h" | |
6 | |
7 #import "ui/gfx/test/ui_cocoa_test_helper.h" | |
8 | |
9 @interface SpinnerView(ExposedForTesting) | |
Robert Sesek
2015/04/01 16:25:02
nit: space before (
shrike
2015/04/01 20:55:55
Done.
| |
10 | |
11 - (BOOL)is_animating; | |
Robert Sesek
2015/04/01 16:25:02
naming: isAnimating
shrike
2015/04/01 20:55:55
Done.
| |
12 | |
13 @end | |
14 | |
15 @implementation SpinnerView(ExposedForTesting) | |
16 | |
17 - (BOOL)is_animating | |
18 { | |
Robert Sesek
2015/04/01 16:25:02
nit: goes on previous line
shrike
2015/04/01 20:55:55
Done.
| |
19 return is_animating_; | |
20 } | |
21 | |
22 @end | |
23 | |
24 namespace { | |
25 | |
26 class SpinnerViewTest : public ui::CocoaTest { | |
Robert Sesek
2015/04/01 16:25:02
namespace should not be indented
shrike
2015/04/01 20:55:55
Done.
| |
27 public: | |
Robert Sesek
2015/04/01 16:25:03
nit: indent 1 space
shrike
2015/04/01 20:55:55
Done.
| |
28 SpinnerViewTest() { | |
29 CGRect frame = NSMakeRect(0.0, 0.0, 16.0, 16.0); | |
30 view_.reset([[SpinnerView alloc] initWithFrame:frame]); | |
31 [[test_window() contentView] addSubview:view_]; | |
32 } | |
33 | |
34 base::scoped_nsobject<SpinnerView> view_; | |
35 }; | |
36 | |
37 TEST_VIEW(SpinnerViewTest, view_) | |
38 | |
39 TEST_F(SpinnerViewTest, StopAnimationOnMiniaturize) { | |
40 EXPECT_TRUE([view_ is_animating]); | |
41 | |
42 [test_window() miniaturize:nil]; | |
43 EXPECT_FALSE([view_ is_animating]); | |
44 | |
45 [test_window() deminiaturize:nil]; | |
46 EXPECT_TRUE([view_ is_animating]); | |
47 } | |
48 | |
49 TEST_F(SpinnerViewTest, | |
50 StopAnimationOnRemoveFromSuperview) { | |
51 EXPECT_TRUE([view_ is_animating]); | |
52 | |
53 [view_ removeFromSuperview]; | |
54 EXPECT_FALSE([view_ is_animating]); | |
55 | |
56 [[test_window() contentView] addSubview:view_]; | |
57 EXPECT_TRUE([view_ is_animating]); | |
58 } | |
59 | |
60 TEST_F(SpinnerViewTest, StopAnimationOnHidden) { | |
61 EXPECT_TRUE([view_ is_animating]); | |
62 | |
63 [view_ setHidden:YES]; | |
64 EXPECT_FALSE([view_ is_animating]); | |
65 | |
66 [view_ setHidden:NO]; | |
67 EXPECT_TRUE([view_ is_animating]); | |
68 } | |
69 } | |
Robert Sesek
2015/04/01 16:25:02
nit: " // namespace" comment at the end
shrike
2015/04/01 20:55:55
Done.
| |
70 | |
Robert Sesek
2015/04/01 16:25:02
nit: extra blakn ilne
shrike
2015/04/01 20:55:55
Done.
| |
OLD | NEW |