summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2015-06-24 17:44:27 +0200
committerKonstantin Käfer <mail@kkaefer.com>2015-07-08 19:45:59 +0200
commit04d57b8ef2e3c3142c08c6d4f50c87ec93434626 (patch)
tree0e863e058a699a801590d1bac42a5d7305925ae4
parenta96a8fef767bacb2b1a57c9e4a808d54d87623e3 (diff)
downloadqtlocation-mapboxgl-04d57b8ef2e3c3142c08c6d4f50c87ec93434626.tar.gz
check for presence of Sprite creation warnings
-rw-r--r--test/annotations/sprite_parser.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/test/annotations/sprite_parser.cpp b/test/annotations/sprite_parser.cpp
index e8dcfd70a5..cb5219b76c 100644
--- a/test/annotations/sprite_parser.cpp
+++ b/test/annotations/sprite_parser.cpp
@@ -9,18 +9,26 @@
using namespace mbgl;
TEST(Annotations, SpriteImageCreationInvalid) {
+ FixtureLog log;
+
const util::Image image_1x = { util::read_file("test/fixtures/annotations/emerald.png") };
ASSERT_TRUE(image_1x);
ASSERT_EQ(200u, image_1x.getWidth());
ASSERT_EQ(299u, image_1x.getHeight());
- // invalid dimensions
ASSERT_EQ(nullptr, createSpriteImage(image_1x, 0, 0, 0, 16, 1, false)); // width == 0
ASSERT_EQ(nullptr, createSpriteImage(image_1x, 0, 0, 16, 0, 1, false)); // height == 0
ASSERT_EQ(nullptr, createSpriteImage(image_1x, 0, 0, 1, 1, 0, false)); // ratio == 0
ASSERT_EQ(nullptr, createSpriteImage(image_1x, 0, 0, 1, 1, 23, false)); // ratio too large
ASSERT_EQ(nullptr, createSpriteImage(image_1x, 0, 0, 2048, 16, 1, false)); // too wide
ASSERT_EQ(nullptr, createSpriteImage(image_1x, 0, 0, 16, 1025, 1, false)); // too tall
+
+ EXPECT_EQ(6u, log.count({
+ EventSeverity::Warning,
+ Event::Sprite,
+ int64_t(-1),
+ "Can't create sprite with invalid metrics",
+ }));
}
TEST(Annotations, SpriteImageCreation1x) {