summaryrefslogtreecommitdiff
path: root/test/api
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-06-03 18:05:04 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-06-13 11:16:19 +0200
commit2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8 (patch)
treeef946d0f27b721f12662047beda6ff1d3cb31e23 /test/api
parent9b6c2e6940ed33a87a20274eda19320e8c688fdf (diff)
downloadqtlocation-mapboxgl-2bdecdf9f9a93c30f7d482f9993c47b86a9f5eb8.tar.gz
[core] fix pedantic warning messages
Diffstat (limited to 'test/api')
-rw-r--r--test/api/annotations.cpp4
-rw-r--r--test/api/render_missing.cpp2
-rw-r--r--test/api/repeated_render.cpp8
-rw-r--r--test/api/set_style.cpp2
4 files changed, 8 insertions, 8 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp
index 60d7db6baa..fefc1c79b1 100644
--- a/test/api/annotations.cpp
+++ b/test/api/annotations.cpp
@@ -195,7 +195,7 @@ TEST(Annotations, QueryRenderedFeatures) {
test.map.addAnnotation(SymbolAnnotation { Point<double> { 0, 0 }, "default_marker" });
test::render(test.map);
-
+
auto features = test.map.queryRenderedFeatures(test.map.pixelForLatLng({ 0, 0 }));
- EXPECT_EQ(features.size(), 1);
+ EXPECT_EQ(features.size(), 1u);
}
diff --git a/test/api/render_missing.cpp b/test/api/render_missing.cpp
index e0fb8e4c55..135c1ecae5 100644
--- a/test/api/render_missing.cpp
+++ b/test/api/render_missing.cpp
@@ -56,7 +56,7 @@ TEST(API, TEST_REQUIRES_SERVER(RenderMissingTile)) {
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
- EXPECT_EQ(1, flo->count(FixtureLog::Message(
+ EXPECT_EQ(1u, flo->count(FixtureLog::Message(
EventSeverity::Error, Event::Style, -1,
std::string("Failed to load tile 0/0/0=>0 for source mapbox: " + message))));
auto unchecked = flo->unchecked();
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.cpp
index 3a71ddb08d..cf71cb8416 100644
--- a/test/api/repeated_render.cpp
+++ b/test/api/repeated_render.cpp
@@ -42,8 +42,8 @@ TEST(API, RepeatedRender) {
loop.runOnce();
}
- ASSERT_EQ(256, result.width);
- ASSERT_EQ(512, result.height);
+ ASSERT_EQ(256u, result.width);
+ ASSERT_EQ(512u, result.height);
#if !TEST_READ_ONLY
util::write_file("test/fixtures/api/1.png", encodePNG(result));
#endif
@@ -60,8 +60,8 @@ TEST(API, RepeatedRender) {
loop.runOnce();
}
- ASSERT_EQ(256, result.width);
- ASSERT_EQ(512, result.height);
+ ASSERT_EQ(256u, result.width);
+ ASSERT_EQ(512u, result.height);
#if !TEST_READ_ONLY
util::write_file("test/fixtures/api/2.png", encodePNG(result));
#endif
diff --git a/test/api/set_style.cpp b/test/api/set_style.cpp
index fb5027c076..2399e4ea50 100644
--- a/test/api/set_style.cpp
+++ b/test/api/set_style.cpp
@@ -26,7 +26,7 @@ TEST(API, SetStyle) {
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
- EXPECT_EQ(1ul, flo->count({ EventSeverity::Error, Event::ParseStyle, -1,
+ EXPECT_EQ(1u, flo->count({ EventSeverity::Error, Event::ParseStyle, -1,
"Error parsing style JSON at 0: Invalid value." }));
auto unchecked = flo->unchecked();
EXPECT_TRUE(unchecked.empty()) << unchecked;