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

Unified Diff: ui/views/animation/ink_drop_animation_controller_factory_unittest.cc

Issue 1478303003: Converted all Views to use an InkDropDelegate instead of a InkDropAnimationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed CustomButton::set_ink_drop_action_on_click() method. Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/animation/button_ink_drop_delegate.cc ('k') | ui/views/animation/ink_drop_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
diff --git a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
index 8f15a8286f68ad0e88d3deac7a4245d06beb0e18..eb32904b8a5fea360b1301245143d030205c6962 100644
--- a/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
+++ b/ui/views/animation/ink_drop_animation_controller_factory_unittest.cc
@@ -19,6 +19,8 @@ namespace views {
// Macro that will execute |test_code| against all derivatives of the
// InkDropAnimationController returned by the InkDropAnimationControllerFactory.
+// TODO(bruthig): Refactor these tests to use TEST_P and
+// INSTANTIATE_TEST_CASE_P.
#define TEST_ALL_INK_DROPS(test_name, test_code) \
TEST_F(InkDropAnimationControllerFactoryTest, test_name) \
test_code TEST_F(MDInkDropAnimationControllerFactoryTest, test_name) test_code
@@ -79,6 +81,14 @@ void MDInkDropAnimationControllerFactoryTest::SetUp() {
InkDropAnimationControllerFactoryTest::SetUp();
}
+TEST_ALL_INK_DROPS(VerifyAllInkDropLayersRemovedAfterDestruction,
+ {
+ ink_drop_animation_controller_->AnimateToState(
+ InkDropState::ACTION_PENDING);
+ ink_drop_animation_controller_.reset();
+ EXPECT_EQ(0, test_ink_drop_host_.num_ink_drop_layers());
+ })
+
TEST_ALL_INK_DROPS(StateIsHiddenInitially,
{
EXPECT_EQ(
« no previous file with comments | « ui/views/animation/button_ink_drop_delegate.cc ('k') | ui/views/animation/ink_drop_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698