diff options
Diffstat (limited to 'test/sprite/sprite_image.test.cpp')
-rw-r--r-- | test/sprite/sprite_image.test.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/sprite/sprite_image.test.cpp b/test/sprite/sprite_image.test.cpp index f8982826a3..97a37513ac 100644 --- a/test/sprite/sprite_image.test.cpp +++ b/test/sprite/sprite_image.test.cpp @@ -7,7 +7,7 @@ using namespace mbgl; TEST(Sprite, SpriteImageZeroWidth) { - PremultipliedImage image(0, 16); + PremultipliedImage image({ 0, 16 }); try { SpriteImage(std::move(image), 2.0); FAIL() << "Expected exception"; @@ -17,7 +17,7 @@ TEST(Sprite, SpriteImageZeroWidth) { } TEST(Sprite, SpriteImageZeroHeight) { - PremultipliedImage image(16, 0); + PremultipliedImage image({ 16, 0 }); try { SpriteImage(std::move(image), 2.0); FAIL() << "Expected exception"; @@ -27,7 +27,7 @@ TEST(Sprite, SpriteImageZeroHeight) { } TEST(Sprite, SpriteImageZeroRatio) { - PremultipliedImage image(16, 16); + PremultipliedImage image({ 16, 16 }); try { SpriteImage(std::move(image), 0.0); FAIL() << "Expected exception"; @@ -37,21 +37,21 @@ TEST(Sprite, SpriteImageZeroRatio) { } TEST(Sprite, SpriteImage) { - PremultipliedImage image(32, 24); + PremultipliedImage image({ 32, 24 }); SpriteImage sprite(std::move(image), 2.0); EXPECT_EQ(16, sprite.getWidth()); - EXPECT_EQ(32u, sprite.image.width); + EXPECT_EQ(32u, sprite.image.size.width); EXPECT_EQ(12, sprite.getHeight()); - EXPECT_EQ(24u, sprite.image.height); + EXPECT_EQ(24u, sprite.image.size.height); EXPECT_EQ(2, sprite.pixelRatio); } TEST(Sprite, SpriteImageFractionalRatio) { - PremultipliedImage image(20, 12); + PremultipliedImage image({ 20, 12 }); SpriteImage sprite(std::move(image), 1.5); EXPECT_EQ(float(20.0 / 1.5), sprite.getWidth()); - EXPECT_EQ(20u, sprite.image.width); + EXPECT_EQ(20u, sprite.image.size.width); EXPECT_EQ(float(12.0 / 1.5), sprite.getHeight()); - EXPECT_EQ(12u, sprite.image.height); + EXPECT_EQ(12u, sprite.image.size.height); EXPECT_EQ(1.5, sprite.pixelRatio); } |