Chromium Code Reviews| Index: cc/proto/gfx_conversions_unittest.cc |
| diff --git a/cc/proto/gfx_conversions_unittest.cc b/cc/proto/gfx_conversions_unittest.cc |
| index 6ffdb96d6e8f11d921dd51f99091cd24cc97f931..8d91f4c5d3e17ba525425c56459a830c553cc934 100644 |
| --- a/cc/proto/gfx_conversions_unittest.cc |
| +++ b/cc/proto/gfx_conversions_unittest.cc |
| @@ -8,16 +8,20 @@ |
| #include "cc/proto/pointf.pb.h" |
| #include "cc/proto/rect.pb.h" |
| #include "cc/proto/rectf.pb.h" |
| +#include "cc/proto/scroll_offset.pb.h" |
| #include "cc/proto/size.pb.h" |
| #include "cc/proto/sizef.pb.h" |
| #include "cc/proto/transform.pb.h" |
| +#include "cc/proto/vector2df.pb.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "ui/gfx/geometry/point.h" |
| #include "ui/gfx/geometry/point_f.h" |
| #include "ui/gfx/geometry/rect.h" |
| #include "ui/gfx/geometry/rect_f.h" |
| +#include "ui/gfx/geometry/scroll_offset.h" |
| #include "ui/gfx/geometry/size.h" |
| #include "ui/gfx/geometry/size_f.h" |
| +#include "ui/gfx/geometry/vector2d_f.h" |
| #include "ui/gfx/transform.h" |
| namespace cc { |
| @@ -173,5 +177,31 @@ TEST(GfxProtoConversionsTest, SerializeDeserializeTransform) { |
| EXPECT_EQ(transform, ProtoToTransform(proto)); |
| } |
| +TEST(GfxProtoConversionsTest, SerializeDeserializeVector2dF) { |
| + const gfx::Vector2dF vector(5.1f, 10.2f); |
|
vmpstr
2015/11/24 19:32:33
Can you add a few more random things? Maybe some n
Khushal
2015/11/24 22:22:40
Done.
|
| + |
| + // Test Vector2dFToProto |
| + proto::Vector2dF proto; |
| + Vector2dFToProto(vector, &proto); |
| + EXPECT_EQ(vector.x(), proto.x()); |
| + EXPECT_EQ(vector.y(), proto.y()); |
| + |
| + // Test ProtoToVector2dF |
| + EXPECT_EQ(vector, ProtoToVector2dF(proto)); |
| +} |
| + |
| +TEST(GfxProtoConversionsTest, SerializeDeserializeScrollOffset) { |
| + const gfx::ScrollOffset scroll_offset(5.1f, 10.2f); |
|
vmpstr
2015/11/24 19:32:33
Same here.
Khushal
2015/11/24 22:22:40
Done.
|
| + |
| + // Test ScrollOffsetToProto |
| + proto::ScrollOffset proto; |
| + ScrollOffsetToProto(scroll_offset, &proto); |
| + EXPECT_EQ(scroll_offset.x(), proto.x()); |
| + EXPECT_EQ(scroll_offset.y(), proto.y()); |
| + |
| + // Test ProtoToScrollOffset |
| + EXPECT_EQ(scroll_offset, ProtoToScrollOffset(proto)); |
| +} |
| + |
| } // namespace |
| } // namespace cc |