Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(691)

Side by Side Diff: app/animation_container_unittest.cc

Issue 1961001: Refactors animation to allow for cleaner subclassing. I'm doing this (Closed)
Patch Set: Incorporated review feedback Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « app/animation_container.cc ('k') | app/animation_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/animation.h"
6 #include "app/animation_container.h" 5 #include "app/animation_container.h"
6 #include "app/linear_animation.h"
7 #include "app/test_animation_delegate.h" 7 #include "app/test_animation_delegate.h"
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
11 using testing::AtLeast; 11 using testing::AtLeast;
12 12
13 namespace { 13 namespace {
14 14
15 class MockObserver : public AnimationContainer::Observer { 15 class MockObserver : public AnimationContainer::Observer {
16 public: 16 public:
17 MockObserver() {} 17 MockObserver() {}
18 18
19 MOCK_METHOD1(AnimationContainerProgressed, void(AnimationContainer*)); 19 MOCK_METHOD1(AnimationContainerProgressed, void(AnimationContainer*));
20 MOCK_METHOD1(AnimationContainerEmpty, void(AnimationContainer*)); 20 MOCK_METHOD1(AnimationContainerEmpty, void(AnimationContainer*));
21 21
22 private: 22 private:
23 DISALLOW_COPY_AND_ASSIGN(MockObserver); 23 DISALLOW_COPY_AND_ASSIGN(MockObserver);
24 }; 24 };
25 25
26 class TestAnimation : public Animation { 26 class TestAnimation : public LinearAnimation {
27 public: 27 public:
28 TestAnimation(AnimationDelegate* delegate) 28 TestAnimation(AnimationDelegate* delegate)
29 : Animation(20, 20, delegate) { 29 : LinearAnimation(20, 20, delegate) {
30 } 30 }
31 31
32 virtual void AnimateToState(double state) { 32 virtual void AnimateToState(double state) {
33 } 33 }
34 34
35 private: 35 private:
36 DISALLOW_COPY_AND_ASSIGN(TestAnimation); 36 DISALLOW_COPY_AND_ASSIGN(TestAnimation);
37 }; 37 };
38 38
39 } // namespace 39 } // namespace
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 MessageLoop::current()->Run(); 111 MessageLoop::current()->Run();
112 112
113 // The timer should have finished. 113 // The timer should have finished.
114 EXPECT_TRUE(delegate1.finished()); 114 EXPECT_TRUE(delegate1.finished());
115 115
116 // And the container should no longer be runnings. 116 // And the container should no longer be runnings.
117 EXPECT_FALSE(container->is_running()); 117 EXPECT_FALSE(container->is_running());
118 118
119 container->set_observer(NULL); 119 container->set_observer(NULL);
120 } 120 }
OLDNEW
« no previous file with comments | « app/animation_container.cc ('k') | app/animation_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698