Explicit animation support

ui/gfx/compositor/layer_animation_element_unittest.cc

Index: ui/gfx/compositor/layer_animation_element_unittest.cc
diff --git a/ui/gfx/compositor/layer_animation_element_unittest.cc b/ui/gfx/compositor/layer_animation_element_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d1ee171a13bcac5073d54fde9ece57cd8a45c9a6
--- /dev/null
+++ b/ui/gfx/compositor/layer_animation_element_unittest.cc
@@ -0,0 +1,130 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/time.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/transform.h"
+#include "ui/gfx/compositor/layer_animation_delegate.h"
+#include "ui/gfx/compositor/layer_animation_element.h"

[sky, 2011/10/20 16:33:03]

Tests should include the .h first, as you would in a non test .cc file.

+#include "ui/gfx/compositor/test_utils.h"
+#include "ui/gfx/compositor/test_layer_animation_delegate.h"
+
+namespace ui {
+
+namespace {
+
+// Check that the transformation element progresses the delegate as expected and
+// that the element can be reused after it completes.
+TEST(LayerAnimationElementTest, TransformElement) {
+  TestLayerAnimationDelegate delegate;
+  Transform start_transform, target_transform, middle_transform;
+  start_transform.SetRotate(-90);
+  target_transform.SetRotate(90);
+  base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
+
+  scoped_ptr<LayerAnimationElement> element(
+      LayerAnimationElement::CreateTransformElement(target_transform, delta));
+
+  for (int i = 0; i < 2; ++i) {
+    delegate.SetTransformFromAnimation(start_transform);
+    element->Progress(0.0, &delegate);
+    CheckApproximatelyEqual(start_transform,
+                            delegate.GetTransformForAnimation());
+    element->Progress(0.5, &delegate);
+    CheckApproximatelyEqual(middle_transform,
+                            delegate.GetTransformForAnimation());
+    element->Progress(1.0, &delegate);
+    CheckApproximatelyEqual(target_transform,
+                            delegate.GetTransformForAnimation());
+  }
+
+  EXPECT_EQ(delta, element->duration());
+}
+
+// Check that the bounds element progresses the delegate as expected and
+// that the element can be reused after it completes.
+TEST(LayerAnimationElementTest, BoundsElement) {
+  TestLayerAnimationDelegate delegate;
+  gfx::Rect start, target, middle;
+  start = target = middle = gfx::Rect(0, 0, 50, 50);
+  start.set_x(-90);
+  target.set_x(90);
+  base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
+
+  scoped_ptr<LayerAnimationElement> element(
+      LayerAnimationElement::CreateBoundsElement(target, delta));
+
+  for (int i = 0; i < 2; ++i) {
+    delegate.SetBoundsFromAnimation(start);
+    element->Progress(0.0, &delegate);
+    CheckApproximatelyEqual(start, delegate.GetBoundsForAnimation());
+    element->Progress(0.5, &delegate);
+    CheckApproximatelyEqual(middle, delegate.GetBoundsForAnimation());
+    element->Progress(1.0, &delegate);
+    CheckApproximatelyEqual(target, delegate.GetBoundsForAnimation());
+  }
+
+  EXPECT_EQ(delta, element->duration());
+}
+
+// Check that the opacity element progresses the delegate as expected and
+// that the element can be reused after it completes.
+TEST(LayerAnimationElementTest, OpacityElement) {
+  TestLayerAnimationDelegate delegate;
+  float start = 0.0;
+  float middle = 0.5;
+  float target = 1.0;
+  base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
+  scoped_ptr<LayerAnimationElement> element(
+      LayerAnimationElement::CreateOpacityElement(target, delta));
+
+  for (int i = 0; i < 2; ++i) {
+    delegate.SetOpacityFromAnimation(start);
+    element->Progress(0.0, &delegate);
+    EXPECT_FLOAT_EQ(start, delegate.GetOpacityForAnimation());
+    element->Progress(0.5, &delegate);
+    EXPECT_FLOAT_EQ(middle, delegate.GetOpacityForAnimation());
+    element->Progress(1.0, &delegate);
+    EXPECT_FLOAT_EQ(target, delegate.GetOpacityForAnimation());
+  }
+
+  EXPECT_EQ(delta, element->duration());
+}
+
+// Check that the pause element progresses the delegate as expected and
+// that the element can be reused after it completes.
+TEST(LayerAnimationElementTest, PauseElement) {
+  LayerAnimationElement::AnimatableProperties properties;
+  properties.insert(LayerAnimationElement::TRANSFORM);
+  properties.insert(LayerAnimationElement::BOUNDS);
+  properties.insert(LayerAnimationElement::OPACITY);
+  base::TimeDelta delta = base::TimeDelta::FromSeconds(1);
+
+  scoped_ptr<LayerAnimationElement> element(
+      LayerAnimationElement::CreatePauseElement(properties, delta));
+
+  TestLayerAnimationDelegate delegate;
+  TestLayerAnimationDelegate copy = delegate;
+
+  element->Progress(1.0, &delegate);
+
+  // Nothing should have changed.
+  CheckApproximatelyEqual(delegate.GetBoundsForAnimation(),
+                          copy.GetBoundsForAnimation());
+  CheckApproximatelyEqual(delegate.GetTransformForAnimation(),
+                          copy.GetTransformForAnimation());
+  EXPECT_FLOAT_EQ(delegate.GetOpacityForAnimation(),
+                  copy.GetOpacityForAnimation());
+
+  // Pause should last for |delta|.
+  EXPECT_EQ(delta, element->duration());
+}
+
+} // namespace
+
+} // namespace ui