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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/vr_shell/ui_elements_unittest.cc

Issue 2801073002: [vr] Use base's time classes (Closed)
Patch Set: updated tests Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements.cc ('k') | chrome/browser/android/vr_shell/ui_scene.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/vr_shell/ui_elements_unittest.cc
diff --git a/chrome/browser/android/vr_shell/ui_elements_unittest.cc b/chrome/browser/android/vr_shell/ui_elements_unittest.cc
index 83183dc589fbf1b4de57d629c0ee6277c3a117a6..fd509d34c3339016c68d6bc4a92844cc34c7d6c6 100644
--- a/chrome/browser/android/vr_shell/ui_elements_unittest.cc
+++ b/chrome/browser/android/vr_shell/ui_elements_unittest.cc
@@ -30,17 +30,29 @@
namespace vr_shell {
+namespace {
+
+base::TimeTicks usToTicks(uint64_t us) {
+ return base::TimeTicks::FromInternalValue(us);
+}
+
+base::TimeDelta usToDelta(uint64_t us) {
+ return base::TimeDelta::FromInternalValue(us);
+}
+
+} // namespace
+
TEST(UiElements, AnimateCopyRect) {
ContentRectangle rect;
rect.copy_rect = {10, 100, 1000, 10000};
- std::unique_ptr<Animation> animation(
- new Animation(0, Animation::Property::COPYRECT,
- std::unique_ptr<easing::Easing>(new easing::Linear()), {},
- {20, 200, 2000, 20000}, 50000, 10000));
+ std::unique_ptr<Animation> animation(new Animation(
+ 0, Animation::Property::COPYRECT,
+ std::unique_ptr<easing::Easing>(new easing::Linear()), {},
+ {20, 200, 2000, 20000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(50000);
+ rect.Animate(usToTicks(50000));
EXPECT_RECTF_EQ(rect.copy_rect, Rectf({10, 100, 1000, 10000}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_RECTF_EQ(rect.copy_rect, Rectf({20, 200, 2000, 20000}));
}
@@ -50,11 +62,11 @@ TEST(UiElements, AnimateSize) {
std::unique_ptr<Animation> animation(
new Animation(0, Animation::Property::SIZE,
std::unique_ptr<easing::Easing>(new easing::Linear()), {},
- {20, 200}, 50000, 10000));
+ {20, 200}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(50000);
+ rect.Animate(usToTicks(50000));
EXPECT_VEC3F_EQ(rect.size, gvr::Vec3f({10, 100}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_VEC3F_EQ(rect.size, gvr::Vec3f({20, 200}));
}
@@ -64,75 +76,75 @@ TEST(UiElements, AnimateTranslation) {
std::unique_ptr<Animation> animation(
new Animation(0, Animation::Property::TRANSLATION,
std::unique_ptr<easing::Easing>(new easing::Linear()), {},
- {20, 200, 2000}, 50000, 10000));
+ {20, 200, 2000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(50000);
+ rect.Animate(usToTicks(50000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({10, 100, 1000}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({20, 200, 2000}));
}
TEST(UiElements, AnimateRotation) {
ContentRectangle rect;
rect.rotation = {10, 100, 1000, 10000};
- std::unique_ptr<Animation> animation(
- new Animation(0, Animation::Property::ROTATION,
- std::unique_ptr<easing::Easing>(new easing::Linear()), {},
- {20, 200, 2000, 20000}, 50000, 10000));
+ std::unique_ptr<Animation> animation(new Animation(
+ 0, Animation::Property::ROTATION,
+ std::unique_ptr<easing::Easing>(new easing::Linear()), {},
+ {20, 200, 2000, 20000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(50000);
+ rect.Animate(usToTicks(50000));
EXPECT_ROTATION(rect.rotation, RotationAxisAngle({10, 100, 1000, 10000}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_ROTATION(rect.rotation, RotationAxisAngle({20, 200, 2000, 20000}));
}
TEST(UiElements, AnimationHasNoEffectBeforeScheduledStart) {
ContentRectangle rect;
- std::unique_ptr<Animation> animation(
- new Animation(0, Animation::Property::TRANSLATION,
- std::unique_ptr<easing::Easing>(new easing::Linear()),
- {10, 100, 1000}, {20, 200, 2000}, 50000, 10000));
+ std::unique_ptr<Animation> animation(new Animation(
+ 0, Animation::Property::TRANSLATION,
+ std::unique_ptr<easing::Easing>(new easing::Linear()), {10, 100, 1000},
+ {20, 200, 2000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(49999);
+ rect.Animate(usToTicks(49999));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({0, 0, 0}));
}
TEST(UiElements, AnimationPurgedWhenDone) {
ContentRectangle rect;
- std::unique_ptr<Animation> animation(
- new Animation(0, Animation::Property::TRANSLATION,
- std::unique_ptr<easing::Easing>(new easing::Linear()),
- {10, 100, 1000}, {20, 200, 2000}, 50000, 10000));
+ std::unique_ptr<Animation> animation(new Animation(
+ 0, Animation::Property::TRANSLATION,
+ std::unique_ptr<easing::Easing>(new easing::Linear()), {10, 100, 1000},
+ {20, 200, 2000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_EQ(0u, rect.animations.size());
}
TEST(UiElements, AnimationLinearEasing) {
ContentRectangle rect;
- std::unique_ptr<Animation> animation(
- new Animation(0, Animation::Property::TRANSLATION,
- std::unique_ptr<easing::Easing>(new easing::Linear()),
- {10, 100, 1000}, {20, 200, 2000}, 50000, 10000));
+ std::unique_ptr<Animation> animation(new Animation(
+ 0, Animation::Property::TRANSLATION,
+ std::unique_ptr<easing::Easing>(new easing::Linear()), {10, 100, 1000},
+ {20, 200, 2000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(50000);
+ rect.Animate(usToTicks(50000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({10, 100, 1000}));
- rect.Animate(55000);
+ rect.Animate(usToTicks(55000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({15, 150, 1500}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({20, 200, 2000}));
}
TEST(UiElements, AnimationStartFromSpecifiedLocation) {
ContentRectangle rect;
- std::unique_ptr<Animation> animation(
- new Animation(0, Animation::Property::TRANSLATION,
- std::unique_ptr<easing::Easing>(new easing::Linear()),
- {10, 100, 1000}, {20, 200, 2000}, 50000, 10000));
+ std::unique_ptr<Animation> animation(new Animation(
+ 0, Animation::Property::TRANSLATION,
+ std::unique_ptr<easing::Easing>(new easing::Linear()), {10, 100, 1000},
+ {20, 200, 2000}, usToTicks(50000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
- rect.Animate(50000);
+ rect.Animate(usToTicks(50000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({10, 100, 1000}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({20, 200, 2000}));
}
@@ -146,18 +158,18 @@ TEST(UiElements, AnimationOverlap) {
std::unique_ptr<Animation> animation(
new Animation(0, Animation::Property::TRANSLATION,
std::unique_ptr<easing::Easing>(new easing::Linear()), {},
- {20, 200, 2000}, 50000, 10000));
+ {20, 200, 2000}, usToTicks(50000), usToDelta(10000)));
std::unique_ptr<Animation> animation2(
new Animation(0, Animation::Property::TRANSLATION,
std::unique_ptr<easing::Easing>(new easing::Linear()), {},
- {50, 500, 5000}, 55000, 10000));
+ {50, 500, 5000}, usToTicks(55000), usToDelta(10000)));
rect.animations.emplace_back(std::move(animation));
rect.animations.emplace_back(std::move(animation2));
- rect.Animate(55000);
+ rect.Animate(usToTicks(55000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({10, 100, 1000}));
- rect.Animate(60000);
+ rect.Animate(usToTicks(60000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({30, 300, 3000}));
- rect.Animate(65000);
+ rect.Animate(usToTicks(65000));
EXPECT_VEC3F_EQ(rect.translation, gvr::Vec3f({50, 500, 5000}));
}
« no previous file with comments | « chrome/browser/android/vr_shell/ui_elements.cc ('k') | chrome/browser/android/vr_shell/ui_scene.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698