diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-16 15:53:59 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-17 11:23:47 -0700 |
| commit | e7154adac3985b8d877c40d16c7d4b3916c7246b (patch) | |
| tree | d68c579d078488b5ace871eb8d540d5c6f630de4 /test/sprite | |
| parent | 786707649a2efcddd24fb976150b044097d74219 (diff) | |
| download | qtlocation-mapboxgl-e7154adac3985b8d877c40d16c7d4b3916c7246b.tar.gz | |
[core] Remove redundant SpriteAtlasElement members
Diffstat (limited to 'test/sprite')
| -rw-r--r-- | test/sprite/sprite_atlas.test.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/sprite/sprite_atlas.test.cpp b/test/sprite/sprite_atlas.test.cpp index 269e5b4b62..f6953e61f7 100644 --- a/test/sprite/sprite_atlas.test.cpp +++ b/test/sprite/sprite_atlas.test.cpp @@ -36,10 +36,10 @@ TEST(SpriteAtlas, Basic) { EXPECT_EQ(0, metro.pos.y); EXPECT_EQ(20, metro.pos.w); EXPECT_EQ(20, metro.pos.h); - EXPECT_EQ(18, metro.width); - EXPECT_EQ(18, metro.height); - EXPECT_EQ(18u, metro.width * imagePixelRatio); - EXPECT_EQ(18u, metro.height * imagePixelRatio); + EXPECT_EQ(18, metro.size[0]); + EXPECT_EQ(18, metro.size[1]); + EXPECT_EQ(18u, metro.size[0] * imagePixelRatio); + EXPECT_EQ(18u, metro.size[1] * imagePixelRatio); EXPECT_EQ(1.0f, imagePixelRatio); @@ -93,10 +93,10 @@ TEST(SpriteAtlas, Size) { EXPECT_EQ(0, metro.pos.y); EXPECT_EQ(15, metro.pos.w); EXPECT_EQ(15, metro.pos.h); - EXPECT_EQ(18, metro.width); - EXPECT_EQ(18, metro.height); - EXPECT_EQ(18u, metro.width * imagePixelRatio); - EXPECT_EQ(18u, metro.height * imagePixelRatio); + EXPECT_EQ(18, metro.size[0]); + EXPECT_EQ(18, metro.size[1]); + EXPECT_EQ(18u, metro.size[0] * imagePixelRatio); + EXPECT_EQ(18u, metro.size[1] * imagePixelRatio); EXPECT_EQ(1.0f, imagePixelRatio); // Now the image was created lazily. @@ -120,10 +120,10 @@ TEST(SpriteAtlas, Updates) { EXPECT_EQ(0, one.pos.y); EXPECT_EQ(18, one.pos.w); EXPECT_EQ(14, one.pos.h); - EXPECT_EQ(16, one.width); - EXPECT_EQ(12, one.height); - EXPECT_EQ(16u, one.width * imagePixelRatio); - EXPECT_EQ(12u, one.height * imagePixelRatio); + EXPECT_EQ(16, one.size[0]); + EXPECT_EQ(12, one.size[1]); + EXPECT_EQ(16u, one.size[0] * imagePixelRatio); + EXPECT_EQ(12u, one.size[1] * imagePixelRatio); EXPECT_EQ(1.0f, imagePixelRatio); // Now the image was created lazily. |