tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] fix pedantic warning messages

Browse Source
This commit is contained in:
Konstantin Käfer
2016-06-03 18:05:04 +02:00
parent 9b6c2e6940
commit 2bdecdf9f9
41 changed files with 196 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
include/mbgl/platform/darwin/settings_nsuserdefaults.hpp
View File

@@ -1,27 +0,0 @@
#pragma once
#import <mbgl/ios/MGLTypes.h>
namespace mbgl {
class Settings_NSUserDefaults {
public:
Settings_NSUserDefaults();
void load();
void save();
void clear();
public:
double longitude = 0;
double latitude = 0;
double zoom = 0;
double bearing = 0;
double pitch = 0;
MGLUserTrackingMode userTrackingMode = MGLUserTrackingModeNone;
bool showsUserLocation = false;
uint32_t debug = 0;
};
}

4
include/mbgl/platform/event.hpp
View File

@@ -19,7 +19,7 @@ MBGL_DEFINE_ENUM_CLASS(EventSeverityClass, EventSeverity, {
{ EventSeverity::Warning, "WARNING" },
{ EventSeverity::Error, "ERROR" },
{ EventSeverity(-1), "UNKNOWN" },
});
})
enum class Event : uint8_t {
General,
@@ -58,7 +58,7 @@ MBGL_DEFINE_ENUM_CLASS(EventClass, Event, {
{ Event::Crash, "Crash" },
{ Event::Glyph, "Glyph" },
{ Event(-1), "Unknown" },
});
})
struct EventPermutation {

2
include/mbgl/style/types.hpp
View File

@@ -19,7 +19,7 @@ MBGL_DEFINE_ENUM_CLASS(SourceTypeClass, SourceType, {
{ SourceType::GeoJSON, "geojson" },
{ SourceType::Video, "video" },
{ SourceType::Annotations, "annotations" },
});
})
namespace style {

2
include/mbgl/util/constants.hpp
View File

@@ -35,7 +35,7 @@ constexpr double PITCH_MAX = M_PI / 3;
constexpr double MIN_ZOOM = 0.0;
constexpr double MAX_ZOOM = 25.5;
constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024;;
constexpr uint64_t DEFAULT_MAX_CACHE_SIZE = 50 * 1024 * 1024;
constexpr Duration DEFAULT_FADE_DURATION = Milliseconds(300);
constexpr Seconds CLOCK_SKEW_RETRY_TIMEOUT { 30 };

60
platform/darwin/src/settings_nsuserdefaults.mm
View File

@@ -1,60 +0,0 @@
#import <Foundation/Foundation.h>
#include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
using namespace mbgl;
Settings_NSUserDefaults::Settings_NSUserDefaults()
{
[[NSUserDefaults standardUserDefaults] registerDefaults:@{
@"longitude" : @(longitude),
@"latitude" : @(latitude),
@"zoom" : @(zoom),
@"bearing" : @(bearing),
@"pitch" : @(pitch),
@"userTrackingMode" : @(userTrackingMode),
@"showsUserLocation" : @(showsUserLocation),
@"debug" : @(debug),
}];
load();
}
void Settings_NSUserDefaults::load()
{
NSDictionary *settings = [[NSUserDefaults standardUserDefaults] dictionaryRepresentation];
longitude = [settings[@"longitude"] doubleValue];
latitude = [settings[@"latitude"] doubleValue];
zoom = [settings[@"zoom"] doubleValue];
bearing = [settings[@"bearing"] doubleValue];
pitch = [settings[@"pitch"] doubleValue];
debug = [settings[@"debug"] boolValue];
unsigned uncheckedTrackingMode = [settings[@"userTrackingMode"] unsignedIntValue];
if (uncheckedTrackingMode > MGLUserTrackingModeNone &&
uncheckedTrackingMode <= MGLUserTrackingModeFollowWithCourse)
{
userTrackingMode = (MGLUserTrackingMode)uncheckedTrackingMode;
}
showsUserLocation = [settings[@"showsUserLocation"] boolValue];
}
void Settings_NSUserDefaults::save()
{
[[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:@{
@"longitude" : @(longitude),
@"latitude" : @(latitude),
@"zoom" : @(zoom),
@"bearing" : @(bearing),
@"pitch" : @(pitch),
@"userTrackingMode" : @(userTrackingMode),
@"showsUserLocation" : @(showsUserLocation),
@"debug" : @(debug),
}];
[[NSUserDefaults standardUserDefaults] synchronize];
}
void Settings_NSUserDefaults::clear()
{
[NSUserDefaults resetStandardUserDefaults];
}

4
platform/default/run_loop.cpp
View File

@@ -14,9 +14,9 @@ using namespace mbgl::util;
static ThreadLocal<RunLoop>& current = *new ThreadLocal<RunLoop>;
#if UV_VERSION_MAJOR == 0 && UV_VERSION_MINOR <= 10
void dummyCallback(uv_async_t*, int) {};
void dummyCallback(uv_async_t*, int) {}
#else
void dummyCallback(uv_async_t*) {};
void dummyCallback(uv_async_t*) {}
#endif
} // namespace

2
src/mbgl/geometry/glyph_atlas.cpp
View File

@@ -197,4 +197,4 @@ void GlyphAtlas::bind(gl::ObjectStore& store) {
} else {
MBGL_CHECK_ERROR(glBindTexture(GL_TEXTURE_2D, *texture));
}
};
}

4
src/mbgl/geometry/line_atlas.cpp
View File

@@ -119,7 +119,7 @@ LinePatternPos LineAtlas::addDash(const std::vector<float> &dasharray, bool roun
bind(store);
return position;
};
}
void LineAtlas::upload(gl::ObjectStore& store) {
if (dirty) {
@@ -171,4 +171,4 @@ void LineAtlas::bind(gl::ObjectStore& store) {
dirty = false;
}
};
}

1
src/mbgl/map/camera.cpp
View File

@@ -1 +0,0 @@
#include <mbgl/map/camera.hpp>

2
src/mbgl/renderer/frame_history.cpp
View File

@@ -6,7 +6,7 @@ using namespace mbgl;
FrameHistory::FrameHistory() {
changeOpacities.fill(0);
opacities.fill(0);
};
}
void FrameHistory::record(const TimePoint& now, float zoom, const Duration& duration) {

2
src/mbgl/renderer/symbol_bucket.cpp
View File

@@ -57,7 +57,7 @@ SymbolInstance::SymbolInstance(Anchor& anchor, const GeometryCoordinates& line,
// Create the collision features that will be used to check whether this symbol instance can be placed
textCollisionFeature(line, anchor, shapedText, textBoxScale, textPadding, textAlongLine, indexedFeature),
iconCollisionFeature(line, anchor, shapedIcon, iconBoxScale, iconPadding, iconAlongLine, indexedFeature)
{};
{}
SymbolBucket::SymbolBucket(uint32_t overscaling_, float zoom_, const MapMode mode_, const std::string& bucketName_, const std::string& sourceLayerName_)

2
src/mbgl/sprite/sprite_atlas.cpp
View File

@@ -243,7 +243,7 @@ void SpriteAtlas::bind(bool linear, gl::ObjectStore& objectStore) {
// pixelWidth, pixelHeight, pixelWidth, pixelHeight);
#endif
}
};
}
SpriteAtlas::~SpriteAtlas() = default;

2
src/mbgl/style/parser.cpp
View File

@@ -484,7 +484,7 @@ void Parser::parseLayer(const std::string& id, const JSValue& value, std::unique
MBGL_DEFINE_ENUM_CLASS(VisibilityTypeClass, VisibilityType, {
{ VisibilityType::Visible, "visible" },
{ VisibilityType::None, "none" },
});
})
void Parser::parseVisibility(Layer& layer, const JSValue& value) {
Layer::Impl& impl = *layer.baseImpl;

18
src/mbgl/style/property_evaluator.cpp
View File

@@ -21,15 +21,15 @@ template <> inline std::vector<std::string> defaultStopsValue() { return {{}}; }
template <> inline std::array<float, 2> defaultStopsValue() { return {{ 0, 0 }}; }
template <> inline std::string defaultStopsValue() { return {}; }
template <> inline TranslateAnchorType defaultStopsValue() { return {}; };
template <> inline RotateAnchorType defaultStopsValue() { return {}; };
template <> inline LineCapType defaultStopsValue() { return {}; };
template <> inline LineJoinType defaultStopsValue() { return {}; };
template <> inline SymbolPlacementType defaultStopsValue() { return {}; };
template <> inline TextAnchorType defaultStopsValue() { return {}; };
template <> inline TextJustifyType defaultStopsValue() { return {}; };
template <> inline TextTransformType defaultStopsValue() { return {}; };
template <> inline AlignmentType defaultStopsValue() { return {}; };
template <> inline TranslateAnchorType defaultStopsValue() { return {}; }
template <> inline RotateAnchorType defaultStopsValue() { return {}; }
template <> inline LineCapType defaultStopsValue() { return {}; }
template <> inline LineJoinType defaultStopsValue() { return {}; }
template <> inline SymbolPlacementType defaultStopsValue() { return {}; }
template <> inline TextAnchorType defaultStopsValue() { return {}; }
template <> inline TextJustifyType defaultStopsValue() { return {}; }
template <> inline TextTransformType defaultStopsValue() { return {}; }
template <> inline AlignmentType defaultStopsValue() { return {}; }
template <typename T>
T PropertyEvaluator<T>::operator()(const Function<T>& fn) const {

18
src/mbgl/style/property_parsing.cpp
View File

@@ -58,7 +58,7 @@ optional<Color> parseConstant(const char* name, const JSValue& value) {
MBGL_DEFINE_ENUM_CLASS(TranslateAnchorTypeClass, TranslateAnchorType, {
{ TranslateAnchorType::Map, "map" },
{ TranslateAnchorType::Viewport, "viewport" },
});
})
template <>
optional<TranslateAnchorType> parseConstant(const char* name, const JSValue& value) {
@@ -73,7 +73,7 @@ optional<TranslateAnchorType> parseConstant(const char* name, const JSValue& val
MBGL_DEFINE_ENUM_CLASS(RotateAnchorTypeClass, RotateAnchorType, {
{ RotateAnchorType::Map, "map" },
{ RotateAnchorType::Viewport, "viewport" },
});
})
template <>
optional<RotateAnchorType> parseConstant<RotateAnchorType>(const char* name, const JSValue& value) {
@@ -89,7 +89,7 @@ MBGL_DEFINE_ENUM_CLASS(LineCapTypeClass, LineCapType, {
{ LineCapType::Round, "round" },
{ LineCapType::Butt, "butt" },
{ LineCapType::Square, "square" },
});
})
template <>
optional<LineCapType> parseConstant<LineCapType>(const char* name, const JSValue& value) {
@@ -107,7 +107,7 @@ MBGL_DEFINE_ENUM_CLASS(LineJoinTypeClass, LineJoinType, {
{ LineJoinType::Round, "round" },
{ LineJoinType::FakeRound, "fakeround" },
{ LineJoinType::FlipBevel, "flipbevel" },
});
})
template <>
optional<LineJoinType> parseConstant<LineJoinType>(const char* name, const JSValue& value) {
@@ -122,7 +122,7 @@ optional<LineJoinType> parseConstant<LineJoinType>(const char* name, const JSVal
MBGL_DEFINE_ENUM_CLASS(SymbolPlacementTypeClass, SymbolPlacementType, {
{ SymbolPlacementType::Point, "point" },
{ SymbolPlacementType::Line, "line" },
});
})
template <>
optional<SymbolPlacementType> parseConstant<SymbolPlacementType>(const char* name, const JSValue& value) {
@@ -144,7 +144,7 @@ MBGL_DEFINE_ENUM_CLASS(TextAnchorTypeClass, TextAnchorType, {
{ TextAnchorType::TopRight, "top-right" },
{ TextAnchorType::BottomLeft, "bottom-left" },
{ TextAnchorType::BottomRight, "bottom-right" }
});
})
template <>
optional<TextAnchorType> parseConstant<TextAnchorType>(const char* name, const JSValue& value) {
@@ -160,7 +160,7 @@ MBGL_DEFINE_ENUM_CLASS(TextJustifyTypeClass, TextJustifyType, {
{ TextJustifyType::Center, "center" },
{ TextJustifyType::Left, "left" },
{ TextJustifyType::Right, "right" },
});
})
template <>
optional<TextJustifyType> parseConstant<TextJustifyType>(const char* name, const JSValue& value) {
@@ -176,7 +176,7 @@ MBGL_DEFINE_ENUM_CLASS(TextTransformTypeClass, TextTransformType, {
{ TextTransformType::None, "none" },
{ TextTransformType::Uppercase, "uppercase" },
{ TextTransformType::Lowercase, "lowercase" },
});
})
template <>
optional<TextTransformType> parseConstant<TextTransformType>(const char* name, const JSValue& value) {
@@ -191,7 +191,7 @@ optional<TextTransformType> parseConstant<TextTransformType>(const char* name, c
MBGL_DEFINE_ENUM_CLASS(AlignmentTypeClass, AlignmentType, {
{ AlignmentType::Map, "map" },
{ AlignmentType::Viewport, "viewport" },
});
})
template <>
optional<AlignmentType> parseConstant<AlignmentType>(const char* name, const JSValue& value) {

3
src/mbgl/tile/tile.cpp
View File

@@ -1,3 +0,0 @@
#include <mbgl/tile/tile.hpp>
using namespace mbgl;

4
src/mbgl/tile/tile_cache.cpp
View File

@@ -37,7 +37,7 @@ void TileCache::add(const OverscaledTileID& key, std::unique_ptr<TileData> data)
}
assert(orderedKeys.size() <= size);
};
}
std::unique_ptr<TileData> TileCache::get(const OverscaledTileID& key) {
@@ -52,7 +52,7 @@ std::unique_ptr<TileData> TileCache::get(const OverscaledTileID& key) {
}
return data;
};
}
bool TileCache::has(const OverscaledTileID& key) {
return tiles.find(key) != tiles.end();

2
src/mbgl/util/grid_index.cpp
View File

@@ -17,7 +17,7 @@ GridIndex<T>::GridIndex(int32_t extent_, int32_t n_, int32_t padding_) :
max(extent + double(padding) / n * extent)
{
cells.resize(d * d);
};
}
template <class T>
void GridIndex<T>::insert(T&& t, const BBox& bbox) {

2
src/mbgl/util/mat2.cpp
View File

@@ -41,7 +41,7 @@ void matrix::rotate(mat2& out, const mat2& a, double rad) {
out[1] = a1 * c + a3 * s;
out[2] = a0 * -s + a2 * c;
out[3] = a1 * -s + a3 * c;
};
}
void matrix::scale(mat2& out, const mat2& a, double v0, double v1) {
double a0 = a[0], a1 = a[1], a2 = a[2], a3 = a[3];

2
src/mbgl/util/mat3.cpp
View File

@@ -80,7 +80,7 @@ void matrix::rotate(mat3& out, const mat3& a, double rad) {
out[6] = a20;
out[7] = a21;
out[8] = a22;
};
}
void matrix::scale(mat3& out, const mat3& a, double x, double y) {
out[0] = x * a[0];

1
src/mbgl/util/tile_coordinate.cpp
View File

@@ -1 +0,0 @@
#include <mbgl/util/tile_coordinate.hpp>

0
src/mbgl/util/work_task.cpp
View File

4
test/api/annotations.cpp
View File

@@ -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);
}

2
test/api/render_missing.cpp
View File

@@ -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();

8
test/api/repeated_render.cpp
View File

@@ -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

2
test/api/set_style.cpp
View File

@@ -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;

18
test/gl/object.cpp
View File

@@ -15,7 +15,7 @@ namespace {
static bool getFlag = false;
static bool setFlag = false;
}; // namespace
} // namespace
struct MockGLObject {
using Type = bool;
@@ -74,35 +74,35 @@ TEST(GLObject, Store) {
EXPECT_TRUE(store.empty());
mbgl::gl::UniqueProgram program = store.createProgram();
EXPECT_NE(program.get(), 0);
EXPECT_NE(program.get(), 0u);
program.reset();
EXPECT_FALSE(store.empty());
store.performCleanup();
EXPECT_TRUE(store.empty());
mbgl::gl::UniqueShader shader = store.createShader(GL_VERTEX_SHADER);
EXPECT_NE(shader.get(), 0);
EXPECT_NE(shader.get(), 0u);
shader.reset();
EXPECT_FALSE(store.empty());
store.performCleanup();
EXPECT_TRUE(store.empty());
mbgl::gl::UniqueBuffer buffer = store.createBuffer();
EXPECT_NE(buffer.get(), 0);
EXPECT_NE(buffer.get(), 0u);
buffer.reset();
EXPECT_FALSE(store.empty());
store.performCleanup();
EXPECT_TRUE(store.empty());
mbgl::gl::UniqueTexture texture = store.createTexture();
EXPECT_NE(texture.get(), 0);
EXPECT_NE(texture.get(), 0u);
texture.reset();
EXPECT_FALSE(store.empty());
store.performCleanup();
EXPECT_TRUE(store.empty());
mbgl::gl::UniqueVAO vao = store.createVAO();
EXPECT_NE(vao.get(), 0);
EXPECT_NE(vao.get(), 0u);
vao.reset();
EXPECT_FALSE(store.empty());
store.performCleanup();
@@ -110,7 +110,7 @@ TEST(GLObject, Store) {
mbgl::gl::UniqueTexturePool texturePool = store.createTexturePool();
for (auto& id : texturePool.get()) {
EXPECT_NE(id, 0);
EXPECT_NE(id, 0u);
}
EXPECT_TRUE(texturePool.get().size() == size_t(mbgl::gl::TextureMax));
texturePool.reset();
@@ -150,7 +150,7 @@ TEST(GLObject, TexturePool) {
// Trigger a new texture pool creation.
{
mbgl::gl::PooledTexture id = pool.acquireTexture(store);
EXPECT_EQ(id, mbgl::gl::TextureMax + 1);
EXPECT_EQ(id, GLuint(mbgl::gl::TextureMax + 1));
EXPECT_TRUE(store.empty());
id.reset();
@@ -164,7 +164,7 @@ TEST(GLObject, TexturePool) {
// First pool is still full, thus creating a new pool.
mbgl::gl::PooledTexture id1 = pool.acquireTexture(store);
EXPECT_GT(id1.get(), mbgl::gl::TextureMax);
EXPECT_GT(id1.get(), GLuint(mbgl::gl::TextureMax));
EXPECT_TRUE(store.empty());
// Release all textures from the first pool.

12
test/sprite/sprite_atlas.cpp
View File

@@ -52,8 +52,8 @@ TEST(Sprite, SpriteAtlas) {
EXPECT_EQ(20, metro.pos.h);
EXPECT_EQ(18, metro.spriteImage->getWidth());
EXPECT_EQ(18, metro.spriteImage->getHeight());
EXPECT_EQ(18, metro.spriteImage->image.width);
EXPECT_EQ(18, metro.spriteImage->image.height);
EXPECT_EQ(18u, metro.spriteImage->image.width);
EXPECT_EQ(18u, metro.spriteImage->image.height);
EXPECT_EQ(1.0f, metro.spriteImage->pixelRatio);
EXPECT_TRUE(atlas.getData());
@@ -108,8 +108,8 @@ TEST(Sprite, SpriteAtlasSize) {
EXPECT_EQ(16, metro.pos.h);
EXPECT_EQ(18, metro.spriteImage->getWidth());
EXPECT_EQ(18, metro.spriteImage->getHeight());
EXPECT_EQ(18, metro.spriteImage->image.width);
EXPECT_EQ(18, metro.spriteImage->image.height);
EXPECT_EQ(18u, metro.spriteImage->image.width);
EXPECT_EQ(18u, metro.spriteImage->image.height);
EXPECT_EQ(1.0f, metro.spriteImage->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteatlassize.png"),
@@ -135,8 +135,8 @@ TEST(Sprite, SpriteAtlasUpdates) {
EXPECT_EQ(16, one.pos.h);
EXPECT_EQ(16, one.spriteImage->getWidth());
EXPECT_EQ(12, one.spriteImage->getHeight());
EXPECT_EQ(16, one.spriteImage->image.width);
EXPECT_EQ(12, one.spriteImage->image.height);
EXPECT_EQ(16u, one.spriteImage->image.width);
EXPECT_EQ(12u, one.spriteImage->image.height);
EXPECT_EQ(1.0f, one.spriteImage->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteatlas-empty.png"),

8
test/sprite/sprite_image.cpp
View File

@@ -40,9 +40,9 @@ TEST(Sprite, SpriteImage) {
PremultipliedImage image(32, 24);
SpriteImage sprite(std::move(image), 2.0);
EXPECT_EQ(16, sprite.getWidth());
EXPECT_EQ(32, sprite.image.width);
EXPECT_EQ(32u, sprite.image.width);
EXPECT_EQ(12, sprite.getHeight());
EXPECT_EQ(24, sprite.image.height);
EXPECT_EQ(24u, sprite.image.height);
EXPECT_EQ(2, sprite.pixelRatio);
}
@@ -50,8 +50,8 @@ TEST(Sprite, SpriteImageFractionalRatio) {
PremultipliedImage image(20, 12);
SpriteImage sprite(std::move(image), 1.5);
EXPECT_EQ(float(20.0 / 1.5), sprite.getWidth());
EXPECT_EQ(20, sprite.image.width);
EXPECT_EQ(20u, sprite.image.width);
EXPECT_EQ(float(12.0 / 1.5), sprite.getHeight());
EXPECT_EQ(12, sprite.image.height);
EXPECT_EQ(12u, sprite.image.height);
EXPECT_EQ(1.5, sprite.pixelRatio);
}

20
test/sprite/sprite_parser.cpp
View File

@@ -60,8 +60,8 @@ TEST(Sprite, SpriteImageCreation1x) {
ASSERT_TRUE(sprite.get());
EXPECT_EQ(18, sprite->getWidth());
EXPECT_EQ(18, sprite->getHeight());
EXPECT_EQ(18, sprite->image.width);
EXPECT_EQ(18, sprite->image.height);
EXPECT_EQ(18u, sprite->image.width);
EXPECT_EQ(18u, sprite->image.height);
EXPECT_EQ(1, sprite->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1x-museum.png"),
sprite->image);
@@ -76,8 +76,8 @@ TEST(Sprite, SpriteImageCreation2x) {
ASSERT_TRUE(sprite.get());
EXPECT_EQ(18, sprite->getWidth());
EXPECT_EQ(18, sprite->getHeight());
EXPECT_EQ(36, sprite->image.width);
EXPECT_EQ(36, sprite->image.height);
EXPECT_EQ(36u, sprite->image.width);
EXPECT_EQ(36u, sprite->image.height);
EXPECT_EQ(2, sprite->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation2x.png"),
sprite->image);
@@ -91,8 +91,8 @@ TEST(Sprite, SpriteImageCreation1_5x) {
ASSERT_TRUE(sprite.get());
EXPECT_EQ(24, sprite->getWidth());
EXPECT_EQ(24, sprite->getHeight());
EXPECT_EQ(36, sprite->image.width);
EXPECT_EQ(36, sprite->image.height);
EXPECT_EQ(36u, sprite->image.width);
EXPECT_EQ(36u, sprite->image.height);
EXPECT_EQ(1.5, sprite->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1_5x-museum.png"),
sprite->image);
@@ -102,8 +102,8 @@ TEST(Sprite, SpriteImageCreation1_5x) {
ASSERT_TRUE(sprite2.get());
EXPECT_EQ(float(35 / 1.5), sprite2->getWidth());
EXPECT_EQ(float(35 / 1.5), sprite2->getHeight());
EXPECT_EQ(35, sprite2->image.width);
EXPECT_EQ(35, sprite2->image.height);
EXPECT_EQ(35u, sprite2->image.width);
EXPECT_EQ(35u, sprite2->image.height);
EXPECT_EQ(1.5, sprite2->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteimagecreation1_5x-hospital.png"),
sprite2->image);
@@ -198,8 +198,8 @@ TEST(Sprite, SpriteParsing) {
auto sprite = images.find("generic-metro")->second;
EXPECT_EQ(18, sprite->getWidth());
EXPECT_EQ(18, sprite->getHeight());
EXPECT_EQ(18, sprite->image.width);
EXPECT_EQ(18, sprite->image.height);
EXPECT_EQ(18u, sprite->image.width);
EXPECT_EQ(18u, sprite->image.height);
EXPECT_EQ(1, sprite->pixelRatio);
EXPECT_EQ(readImage("test/fixtures/annotations/result-spriteparsing.png"), sprite->image);
}

8
test/sprite/sprite_store.cpp
View File

@@ -181,14 +181,14 @@ Response successfulSpriteImageResponse(const Resource& resource) {
Response response;
response.data = std::make_shared<std::string>(util::read_file(resource.url));
return response;
};
}
Response successfulSpriteJSONResponse(const Resource& resource) {
EXPECT_EQ("test/fixtures/resources/sprite.json", resource.url);
Response response;
response.data = std::make_shared<std::string>(util::read_file(resource.url));
return response;
};
}
Response failedSpriteResponse(const Resource&) {
Response response;
@@ -196,13 +196,13 @@ Response failedSpriteResponse(const Resource&) {
Response::Error::Reason::Other,
"Failed by the test case");
return response;
};
}
Response corruptSpriteResponse(const Resource&) {
Response response;
response.data = std::make_shared<std::string>("CORRUPT");
return response;
};
}
TEST(SpriteStore, LoadingSuccess) {
SpriteStoreTest test;

18
test/storage/headers.cpp
View File

@@ -12,12 +12,12 @@ TEST(HTTPHeader, Parsing) {
cc = http::CacheControl::parse(R"#(max-age =34)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(34, *cc.maxAge);
EXPECT_EQ(34u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(,max-age=1)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(1, *cc.maxAge);
EXPECT_EQ(1u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(max-age=-1)#");
@@ -30,12 +30,12 @@ TEST(HTTPHeader, Parsing) {
cc = http::CacheControl::parse(R"#(max-age="34,max-age="22,max-age=28)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(28, *cc.maxAge);
EXPECT_EQ(28u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(max-age=3,max-age="34)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(3, *cc.maxAge);
EXPECT_EQ(3u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(max-age="\",max-age=4,")#");
@@ -44,26 +44,26 @@ TEST(HTTPHeader, Parsing) {
cc = http::CacheControl::parse(R"#(private, max-age=0, no-cache)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(0, *cc.maxAge);
EXPECT_EQ(0u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(max-age=0, no-cache, no-store)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(0, *cc.maxAge);
EXPECT_EQ(0u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(, private , max-bar=3 , no-cache, "\,",,foo=",",,max-age=32)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(32, *cc.maxAge);
EXPECT_EQ(32u, *cc.maxAge);
EXPECT_FALSE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(max-age=3600, must-revalidate)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(3600, *cc.maxAge);
EXPECT_EQ(3600u, *cc.maxAge);
EXPECT_TRUE(cc.mustRevalidate);
cc = http::CacheControl::parse(R"#(no-cache="Expires,Via",max-age=3600, must-revalidate)#");
ASSERT_TRUE(bool(cc.maxAge));
EXPECT_EQ(3600, *cc.maxAge);
EXPECT_EQ(3600u, *cc.maxAge);
EXPECT_TRUE(cc.mustRevalidate);
}

60
test/storage/offline_database.cpp
View File

@@ -113,7 +113,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(SchemaVersion)) {
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
EXPECT_EQ(1ul, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
EXPECT_EQ(1u, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
}
TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) {
@@ -129,7 +129,7 @@ TEST(OfflineDatabase, TEST_REQUIRES_WRITE(Invalid)) {
auto observer = Log::removeObserver();
auto flo = dynamic_cast<FixtureLogObserver*>(observer.get());
EXPECT_EQ(1ul, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
EXPECT_EQ(1u, flo->count({ EventSeverity::Warning, Event::Database, -1, "Removing existing incompatible offline database" }));
}
TEST(OfflineDatabase, PutDoesNotStoreConnectionErrors) {
@@ -169,7 +169,7 @@ TEST(OfflineDatabase, PutResource) {
response.data = std::make_shared<std::string>("first");
auto insertPutResult = db.put(resource, response);
EXPECT_TRUE(insertPutResult.first);
EXPECT_EQ(5, insertPutResult.second);
EXPECT_EQ(5u, insertPutResult.second);
auto insertGetResult = db.get(resource);
EXPECT_EQ(nullptr, insertGetResult->error.get());
@@ -178,7 +178,7 @@ TEST(OfflineDatabase, PutResource) {
response.data = std::make_shared<std::string>("second");
auto updatePutResult = db.put(resource, response);
EXPECT_FALSE(updatePutResult.first);
EXPECT_EQ(6, updatePutResult.second);
EXPECT_EQ(6u, updatePutResult.second);
auto updateGetResult = db.get(resource);
EXPECT_EQ(nullptr, updateGetResult->error.get());
@@ -203,7 +203,7 @@ TEST(OfflineDatabase, PutTile) {
response.data = std::make_shared<std::string>("first");
auto insertPutResult = db.put(resource, response);
EXPECT_TRUE(insertPutResult.first);
EXPECT_EQ(5, insertPutResult.second);
EXPECT_EQ(5u, insertPutResult.second);
auto insertGetResult = db.get(resource);
EXPECT_EQ(nullptr, insertGetResult->error.get());
@@ -212,7 +212,7 @@ TEST(OfflineDatabase, PutTile) {
response.data = std::make_shared<std::string>("second");
auto updatePutResult = db.put(resource, response);
EXPECT_FALSE(updatePutResult.first);
EXPECT_EQ(6, updatePutResult.second);
EXPECT_EQ(6u, updatePutResult.second);
auto updateGetResult = db.get(resource);
EXPECT_EQ(nullptr, updateGetResult->error.get());
@@ -284,7 +284,7 @@ TEST(OfflineDatabase, ListRegions) {
OfflineRegion region = db.createRegion(definition, metadata);
std::vector<OfflineRegion> regions = db.listRegions();
ASSERT_EQ(1, regions.size());
ASSERT_EQ(1u, regions.size());
EXPECT_EQ(region.getID(), regions.at(0).getID());
EXPECT_EQ(definition.styleURL, regions.at(0).getDefinition().styleURL);
EXPECT_EQ(definition.bounds, regions.at(0).getDefinition().bounds);
@@ -327,7 +327,7 @@ TEST(OfflineDatabase, DeleteRegion) {
db.deleteRegion(std::move(region));
ASSERT_EQ(0, db.listRegions().size());
ASSERT_EQ(0u, db.listRegions().size());
}
TEST(OfflineDatabase, CreateRegionInfiniteMaxZoom) {
@@ -391,15 +391,15 @@ TEST(OfflineDatabase, PutReturnsSize) {
Response compressible;
compressible.data = std::make_shared<std::string>(1024, 0);
EXPECT_EQ(17, db.put(Resource::style("http://example.com/compressible"), compressible).second);
EXPECT_EQ(17u, db.put(Resource::style("http://example.com/compressible"), compressible).second);
Response incompressible;
incompressible.data = randomString(1024);
EXPECT_EQ(1024, db.put(Resource::style("http://example.com/incompressible"), incompressible).second);
EXPECT_EQ(1024u, db.put(Resource::style("http://example.com/incompressible"), incompressible).second);
Response noContent;
noContent.noContent = true;
EXPECT_EQ(0, db.put(Resource::style("http://example.com/noContent"), noContent).second);
EXPECT_EQ(0u, db.put(Resource::style("http://example.com/noContent"), noContent).second);
}
TEST(OfflineDatabase, PutEvictsLeastRecentlyUsedResources) {
@@ -458,10 +458,10 @@ TEST(OfflineDatabase, GetRegionCompletedStatus) {
OfflineRegion region = db.createRegion(definition, metadata);
OfflineRegionStatus status1 = db.getRegionCompletedStatus(region.getID());
EXPECT_EQ(0, status1.completedResourceCount);
EXPECT_EQ(0, status1.completedResourceSize);
EXPECT_EQ(0, status1.completedTileCount);
EXPECT_EQ(0, status1.completedTileSize);
EXPECT_EQ(0u, status1.completedResourceCount);
EXPECT_EQ(0u, status1.completedResourceSize);
EXPECT_EQ(0u, status1.completedTileCount);
EXPECT_EQ(0u, status1.completedTileSize);
Response response;
response.data = std::make_shared<std::string>("data");
@@ -469,17 +469,17 @@ TEST(OfflineDatabase, GetRegionCompletedStatus) {
uint64_t styleSize = db.putRegionResource(region.getID(), Resource::style("http://example.com/"), response);
OfflineRegionStatus status2 = db.getRegionCompletedStatus(region.getID());
EXPECT_EQ(1, status2.completedResourceCount);
EXPECT_EQ(1u, status2.completedResourceCount);
EXPECT_EQ(styleSize, status2.completedResourceSize);
EXPECT_EQ(0, status2.completedTileCount);
EXPECT_EQ(0, status2.completedTileSize);
EXPECT_EQ(0u, status2.completedTileCount);
EXPECT_EQ(0u, status2.completedTileSize);
uint64_t tileSize = db.putRegionResource(region.getID(), Resource::tile("http://example.com/", 1.0, 0, 0, 0), response);
OfflineRegionStatus status3 = db.getRegionCompletedStatus(region.getID());
EXPECT_EQ(2, status3.completedResourceCount);
EXPECT_EQ(2u, status3.completedResourceCount);
EXPECT_EQ(styleSize + tileSize, status3.completedResourceSize);
EXPECT_EQ(1, status3.completedTileCount);
EXPECT_EQ(1u, status3.completedTileCount);
EXPECT_EQ(tileSize, status3.completedTileSize);
}
@@ -501,43 +501,43 @@ TEST(OfflineDatabase, OfflineMapboxTileCount) {
response.data = std::make_shared<std::string>("data");
// Count is initially zero.
EXPECT_EQ(0, db.getOfflineMapboxTileCount());
EXPECT_EQ(0u, db.getOfflineMapboxTileCount());
// Count stays the same after putting a non-tile resource.
db.putRegionResource(region1.getID(), Resource::style("http://example.com/"), response);
EXPECT_EQ(0, db.getOfflineMapboxTileCount());
EXPECT_EQ(0u, db.getOfflineMapboxTileCount());
// Count stays the same after putting a non-Mapbox tile.
db.putRegionResource(region1.getID(), nonMapboxTile, response);
EXPECT_EQ(0, db.getOfflineMapboxTileCount());
EXPECT_EQ(0u, db.getOfflineMapboxTileCount());
// Count increases after putting a Mapbox tile not used by another region.
db.putRegionResource(region1.getID(), mapboxTile1, response);
EXPECT_EQ(1, db.getOfflineMapboxTileCount());
EXPECT_EQ(1u, db.getOfflineMapboxTileCount());
// Count stays the same after putting a Mapbox tile used by another region.
db.putRegionResource(region2.getID(), mapboxTile1, response);
EXPECT_EQ(1, db.getOfflineMapboxTileCount());
EXPECT_EQ(1u, db.getOfflineMapboxTileCount());
// Count stays the same after putting a Mapbox tile used by the same region.
db.putRegionResource(region2.getID(), mapboxTile1, response);
EXPECT_EQ(1, db.getOfflineMapboxTileCount());
EXPECT_EQ(1u, db.getOfflineMapboxTileCount());
// Count stays the same after deleting a region when the tile is still used by another region.
db.deleteRegion(std::move(region2));
EXPECT_EQ(1, db.getOfflineMapboxTileCount());
EXPECT_EQ(1u, db.getOfflineMapboxTileCount());
// Count stays the same after the putting a non-offline Mapbox tile.
db.put(mapboxTile2, response);
EXPECT_EQ(1, db.getOfflineMapboxTileCount());
EXPECT_EQ(1u, db.getOfflineMapboxTileCount());
// Count increases after putting a pre-existing, but non-offline Mapbox tile.
db.putRegionResource(region1.getID(), mapboxTile2, response);
EXPECT_EQ(2, db.getOfflineMapboxTileCount());
EXPECT_EQ(2u, db.getOfflineMapboxTileCount());
// Count decreases after deleting a region when the tiles are not used by other regions.
db.deleteRegion(std::move(region1));
EXPECT_EQ(0, db.getOfflineMapboxTileCount());
EXPECT_EQ(0u, db.getOfflineMapboxTileCount());
}
static int databasePageCount(const std::string& path) {

48
test/storage/offline_download.cpp
View File

@@ -77,12 +77,12 @@ TEST(OfflineDownload, NoSubresources) {
if (!expectsInactiveStatus) {
expectsInactiveStatus = true;
EXPECT_EQ(OfflineRegionDownloadState::Active, status.downloadState);
EXPECT_EQ(1, status.completedResourceCount);
EXPECT_EQ(1u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_TRUE(status.requiredResourceCountIsPrecise);
} else {
EXPECT_EQ(OfflineRegionDownloadState::Inactive, status.downloadState);
EXPECT_EQ(1, status.completedResourceCount);
EXPECT_EQ(1u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_TRUE(status.requiredResourceCountIsPrecise);
test.loop.stop();
@@ -123,7 +123,7 @@ TEST(OfflineDownload, InlineSource) {
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (status.complete()) {
EXPECT_EQ(2, status.completedResourceCount);
EXPECT_EQ(2u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_TRUE(status.requiredResourceCountIsPrecise);
test.loop.stop();
@@ -158,7 +158,7 @@ TEST(OfflineDownload, GeoJSONSource) {
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (status.complete()) {
EXPECT_EQ(2, status.completedResourceCount);
EXPECT_EQ(2u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_TRUE(status.requiredResourceCountIsPrecise);
test.loop.stop();
@@ -217,7 +217,7 @@ TEST(OfflineDownload, Activate) {
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (status.complete()) {
EXPECT_EQ(261, status.completedResourceCount); // 256 glyphs, 1 tile, 1 style, source, sprite image, and sprite json
EXPECT_EQ(261u, status.completedResourceCount); // 256 glyphs, 1 tile, 1 style, source, sprite image, and sprite json
EXPECT_EQ(test.size, status.completedResourceSize);
download.setState(OfflineRegionDownloadState::Inactive);
@@ -248,9 +248,9 @@ TEST(OfflineDownload, GetStatusNoResources) {
OfflineRegionStatus status = download.getStatus();
EXPECT_EQ(OfflineRegionDownloadState::Inactive, status.downloadState);
EXPECT_EQ(0, status.completedResourceCount);
EXPECT_EQ(0, status.completedResourceSize);
EXPECT_EQ(1, status.requiredResourceCount);
EXPECT_EQ(0u, status.completedResourceCount);
EXPECT_EQ(0u, status.completedResourceSize);
EXPECT_EQ(1u, status.requiredResourceCount);
EXPECT_FALSE(status.requiredResourceCountIsPrecise);
EXPECT_FALSE(status.complete());
}
@@ -270,9 +270,9 @@ TEST(OfflineDownload, GetStatusStyleComplete) {
OfflineRegionStatus status = download.getStatus();
EXPECT_EQ(OfflineRegionDownloadState::Inactive, status.downloadState);
EXPECT_EQ(1, status.completedResourceCount);
EXPECT_EQ(1u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_EQ(260, status.requiredResourceCount);
EXPECT_EQ(260u, status.requiredResourceCount);
EXPECT_FALSE(status.requiredResourceCountIsPrecise);
EXPECT_FALSE(status.complete());
}
@@ -296,9 +296,9 @@ TEST(OfflineDownload, GetStatusStyleAndSourceComplete) {
OfflineRegionStatus status = download.getStatus();
EXPECT_EQ(OfflineRegionDownloadState::Inactive, status.downloadState);
EXPECT_EQ(2, status.completedResourceCount);
EXPECT_EQ(2u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_EQ(261, status.requiredResourceCount);
EXPECT_EQ(261u, status.requiredResourceCount);
EXPECT_TRUE(status.requiredResourceCountIsPrecise);
EXPECT_FALSE(status.complete());
}
@@ -353,7 +353,7 @@ TEST(OfflineDownload, RequestErrorsAreRetried) {
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (status.complete()) {
EXPECT_EQ(1, status.completedResourceCount);
EXPECT_EQ(1u, status.completedResourceCount);
test.loop.stop();
}
};
@@ -391,7 +391,7 @@ TEST(OfflineDownload, TileCountLimitExceededNoTileResponse) {
};
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (!mapboxTileCountLimitExceededCalled) {
if (!mapboxTileCountLimitExceededCalled) {
EXPECT_FALSE(status.complete());
EXPECT_EQ(OfflineRegionDownloadState::Active, status.downloadState);
} else {
@@ -422,7 +422,7 @@ TEST(OfflineDownload, TileCountLimitExceededWithTileResponse) {
EXPECT_EQ("http://127.0.0.1:3000/style.json", resource.url);
return test.response("mapbox_source.style.json");
};
test.fileSource.tileResponse = [&] (const Resource& resource) {
const Resource::TileData& tile = *resource.tileData;
EXPECT_EQ("mapbox://{z}-{x}-{y}.vector.pbf", tile.urlTemplate);
@@ -442,7 +442,7 @@ TEST(OfflineDownload, TileCountLimitExceededWithTileResponse) {
mapboxTileCountLimitExceededCalled = true;
};
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (!mapboxTileCountLimitExceededCalled) {
EXPECT_EQ(OfflineRegionDownloadState::Active, status.downloadState);
} else {
@@ -481,7 +481,7 @@ TEST(OfflineDownload, WithPreviouslyExistingTile) {
observer->statusChangedFn = [&] (OfflineRegionStatus status) {
if (status.complete()) {
EXPECT_EQ(2, status.completedResourceCount);
EXPECT_EQ(2u, status.completedResourceCount);
EXPECT_EQ(test.size, status.completedResourceSize);
EXPECT_TRUE(status.requiredResourceCountIsPrecise);
test.loop.stop();
@@ -543,22 +543,22 @@ TEST(OfflineDownload, ReactivatePreviouslyCompletedDownload) {
test.loop.run();
ASSERT_EQ(4, statusesAfterReactivate.size());
ASSERT_EQ(4u, statusesAfterReactivate.size());
EXPECT_EQ(OfflineRegionDownloadState::Active, statusesAfterReactivate[0].downloadState);
EXPECT_FALSE(statusesAfterReactivate[0].requiredResourceCountIsPrecise);
EXPECT_EQ(1, statusesAfterReactivate[0].requiredResourceCount);
EXPECT_EQ(0, statusesAfterReactivate[0].completedResourceCount);
EXPECT_EQ(1u, statusesAfterReactivate[0].requiredResourceCount);
EXPECT_EQ(0u, statusesAfterReactivate[0].completedResourceCount);
EXPECT_EQ(OfflineRegionDownloadState::Active, statusesAfterReactivate[1].downloadState);
EXPECT_TRUE(statusesAfterReactivate[1].requiredResourceCountIsPrecise);
EXPECT_EQ(2, statusesAfterReactivate[1].requiredResourceCount);
EXPECT_EQ(1, statusesAfterReactivate[1].completedResourceCount);
EXPECT_EQ(2u, statusesAfterReactivate[1].requiredResourceCount);
EXPECT_EQ(1u, statusesAfterReactivate[1].completedResourceCount);
EXPECT_EQ(OfflineRegionDownloadState::Active, statusesAfterReactivate[2].downloadState);
EXPECT_TRUE(statusesAfterReactivate[2].requiredResourceCountIsPrecise);
EXPECT_EQ(2, statusesAfterReactivate[2].requiredResourceCount);
EXPECT_EQ(2, statusesAfterReactivate[2].completedResourceCount);
EXPECT_EQ(2u, statusesAfterReactivate[2].requiredResourceCount);
EXPECT_EQ(2u, statusesAfterReactivate[2].completedResourceCount);
}
TEST(OfflineDownload, Deactivate) {

2
test/style/filter.cpp
View File

@@ -57,7 +57,7 @@ TEST(Filter, EqualsString) {
Filter f = parse("[\"==\", \"foo\", \"bar\"]");
ASSERT_TRUE(evaluate(f, {{ "foo", std::string("bar") }}));
ASSERT_FALSE(evaluate(f, {{ "foo", std::string("baz") }}));
};
}
TEST(Filter, EqualsNumber) {
Filter f = parse("[\"==\", \"foo\", 0]");

6
test/style/style_parser.cpp
View File

@@ -61,7 +61,7 @@ TEST_P(StyleParserTest, ParseStyle) {
std::cerr << "Unchecked Log Messages (" << base << "/" << name << "): " << std::endl << unchecked;
}
ASSERT_EQ(0ul, unchecked.size());
ASSERT_EQ(0u, unchecked.size());
}
}
@@ -81,7 +81,7 @@ INSTANTIATE_TEST_CASE_P(StyleParser, StyleParserTest, ::testing::ValuesIn([] {
closedir(dir);
}
EXPECT_GT(names.size(), 0ul);
EXPECT_GT(names.size(), 0u);
return names;
}()));
@@ -119,7 +119,7 @@ TEST(StyleParser, FontStacks) {
style::Parser parser;
parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json"));
auto result = parser.fontStacks();
ASSERT_EQ(3, result.size());
ASSERT_EQ(3u, result.size());
ASSERT_EQ(FontStack({"a"}), result[0]);
ASSERT_EQ(FontStack({"a", "b"}), result[1]);
ASSERT_EQ(FontStack({"a", "b", "c"}), result[2]);

12
test/tile/geometry_tile.cpp
View File

@@ -9,9 +9,9 @@ TEST(GeometryTile, classifyRings1) {
});
// output: 1 polygon
ASSERT_EQ(polygons.size(), 1);
ASSERT_EQ(polygons.size(), 1u);
// output: polygon 1 has 1 exterior
ASSERT_EQ(polygons[0].size(), 1);
ASSERT_EQ(polygons[0].size(), 1u);
}
TEST(GeometryTile, classifyRings2) {
@@ -21,9 +21,9 @@ TEST(GeometryTile, classifyRings2) {
});
// output: 1 polygon
ASSERT_EQ(polygons.size(), 1);
ASSERT_EQ(polygons.size(), 1u);
// output: polygon 1 has 1 exterior, 1 interior
ASSERT_EQ(polygons[0].size(), 2);
ASSERT_EQ(polygons[0].size(), 2u);
}
TEST(GeometryTile, limitHoles1) {
@@ -36,7 +36,7 @@ TEST(GeometryTile, limitHoles1) {
limitHoles(polygon, 1);
// output: polygon 1 has 1 exterior, 1 interior
ASSERT_EQ(polygon.size(), 2);
ASSERT_EQ(polygon.size(), 2u);
// ensure we've kept the right rings (ones with largest areas)
ASSERT_EQ(polygon[0][0].x, 0);
@@ -53,7 +53,7 @@ TEST(GeometryTile, limitHoles2) {
limitHoles(polygon, 1);
// output: polygon 1 has 1 exterior, 1 interior
ASSERT_EQ(polygon.size(), 2);
ASSERT_EQ(polygon.size(), 2u);
// ensure we've kept the right rings (ones with largest areas)
ASSERT_EQ(polygon[0][0].x, 0);

70
test/tile/tile_id.cpp
View File

@@ -6,9 +6,9 @@ using namespace mbgl;
TEST(TileID, Canonical) {
CanonicalTileID id_0_0_0(0, 0, 0);
EXPECT_EQ(0, id_0_0_0.z);
EXPECT_EQ(0, id_0_0_0.x);
EXPECT_EQ(0, id_0_0_0.y);
EXPECT_EQ(0u, id_0_0_0.z);
EXPECT_EQ(0u, id_0_0_0.x);
EXPECT_EQ(0u, id_0_0_0.y);
EXPECT_TRUE(CanonicalTileID(4, 2, 3) == CanonicalTileID(4, 2, 3));
EXPECT_FALSE(CanonicalTileID(4, 2, 3) != CanonicalTileID(4, 2, 3));
@@ -157,11 +157,11 @@ TEST(TileID, Overscaled) {
EXPECT_TRUE(OverscaledTileID(4, 2, 3) < OverscaledTileID(7, { 4, 2, 3 }));
EXPECT_FALSE(OverscaledTileID(7, { 4, 2, 3 }) < OverscaledTileID(4, 2, 3));
EXPECT_EQ(8, OverscaledTileID(7, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(4, OverscaledTileID(6, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(2, OverscaledTileID(5, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(1, OverscaledTileID(4, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(2147483648, OverscaledTileID(31, { 0, 0, 0 }).overscaleFactor());
EXPECT_EQ(8u, OverscaledTileID(7, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(4u, OverscaledTileID(6, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(2u, OverscaledTileID(5, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(1u, OverscaledTileID(4, { 4, 2, 3 }).overscaleFactor());
EXPECT_EQ(2147483648u, OverscaledTileID(31, { 0, 0, 0 }).overscaleFactor());
EXPECT_EQ(OverscaledTileID(0, { 0, 0, 0 }), OverscaledTileID(4, 2, 3).scaledTo(0));
EXPECT_EQ(OverscaledTileID(1, { 1, 0, 0 }), OverscaledTileID(4, 2, 3).scaledTo(1));
@@ -214,58 +214,58 @@ TEST(TileID, Overscaled) {
TEST(TileID, Unwrapped) {
UnwrappedTileID id_0_0_0(0, 0, 0);
EXPECT_EQ(0, id_0_0_0.canonical.z);
EXPECT_EQ(0, id_0_0_0.canonical.x);
EXPECT_EQ(0, id_0_0_0.canonical.y);
EXPECT_EQ(0u, id_0_0_0.canonical.z);
EXPECT_EQ(0u, id_0_0_0.canonical.x);
EXPECT_EQ(0u, id_0_0_0.canonical.y);
EXPECT_EQ(0, id_0_0_0.wrap);
UnwrappedTileID id_0_1_0(0, 1, 0);
EXPECT_EQ(0, id_0_1_0.canonical.z);
EXPECT_EQ(0, id_0_1_0.canonical.x);
EXPECT_EQ(0, id_0_1_0.canonical.y);
EXPECT_EQ(0u, id_0_1_0.canonical.z);
EXPECT_EQ(0u, id_0_1_0.canonical.x);
EXPECT_EQ(0u, id_0_1_0.canonical.y);
EXPECT_EQ(1, id_0_1_0.wrap);
UnwrappedTileID id_0_4_0(0, 4, 0);
EXPECT_EQ(0, id_0_4_0.canonical.z);
EXPECT_EQ(0, id_0_4_0.canonical.x);
EXPECT_EQ(0, id_0_4_0.canonical.y);
EXPECT_EQ(0u, id_0_4_0.canonical.z);
EXPECT_EQ(0u, id_0_4_0.canonical.x);
EXPECT_EQ(0u, id_0_4_0.canonical.y);
EXPECT_EQ(4, id_0_4_0.wrap);
UnwrappedTileID id_0_n1_0(0, -1, 0);
EXPECT_EQ(0, id_0_n1_0.canonical.z);
EXPECT_EQ(0, id_0_n1_0.canonical.x);
EXPECT_EQ(0, id_0_n1_0.canonical.y);
EXPECT_EQ(0u, id_0_n1_0.canonical.z);
EXPECT_EQ(0u, id_0_n1_0.canonical.x);
EXPECT_EQ(0u, id_0_n1_0.canonical.y);
EXPECT_EQ(-1, id_0_n1_0.wrap);
UnwrappedTileID id_0_0_1(0, 0, 1);
EXPECT_EQ(0, id_0_0_1.canonical.z);
EXPECT_EQ(0, id_0_0_1.canonical.x);
EXPECT_EQ(0, id_0_0_1.canonical.y);
EXPECT_EQ(0u, id_0_0_1.canonical.z);
EXPECT_EQ(0u, id_0_0_1.canonical.x);
EXPECT_EQ(0u, id_0_0_1.canonical.y);
EXPECT_EQ(0, id_0_0_1.wrap);
UnwrappedTileID id_0_0_n1(0, 0, -1);
EXPECT_EQ(0, id_0_0_n1.canonical.z);
EXPECT_EQ(0, id_0_0_n1.canonical.x);
EXPECT_EQ(0, id_0_0_n1.canonical.y);
EXPECT_EQ(0u, id_0_0_n1.canonical.z);
EXPECT_EQ(0u, id_0_0_n1.canonical.x);
EXPECT_EQ(0u, id_0_0_n1.canonical.y);
EXPECT_EQ(0, id_0_0_n1.wrap);
UnwrappedTileID id_18_262143_0(18, 262143, 0);
EXPECT_EQ(18, id_18_262143_0.canonical.z);
EXPECT_EQ(262143, id_18_262143_0.canonical.x);
EXPECT_EQ(0, id_18_262143_0.canonical.y);
EXPECT_EQ(18u, id_18_262143_0.canonical.z);
EXPECT_EQ(262143u, id_18_262143_0.canonical.x);
EXPECT_EQ(0u, id_18_262143_0.canonical.y);
EXPECT_EQ(0, id_18_262143_0.wrap);
UnwrappedTileID id_18_262144_0(18, 262144, 0);
EXPECT_EQ(18, id_18_262144_0.canonical.z);
EXPECT_EQ(0, id_18_262144_0.canonical.x);
EXPECT_EQ(0, id_18_262144_0.canonical.y);
EXPECT_EQ(18u, id_18_262144_0.canonical.z);
EXPECT_EQ(0u, id_18_262144_0.canonical.x);
EXPECT_EQ(0u, id_18_262144_0.canonical.y);
EXPECT_EQ(1, id_18_262144_0.wrap);
UnwrappedTileID a(2, 4, 3);
UnwrappedTileID b(a);
EXPECT_EQ(2, b.canonical.z);
EXPECT_EQ(0, b.canonical.x);
EXPECT_EQ(3, b.canonical.y);
EXPECT_EQ(2u, b.canonical.z);
EXPECT_EQ(0u, b.canonical.x);
EXPECT_EQ(3u, b.canonical.y);
EXPECT_EQ(1, b.wrap);
EXPECT_TRUE(UnwrappedTileID(0, 0, 0) < UnwrappedTileID(1, 0, 0));

8
test/util/async_task.cpp
View File

@@ -49,7 +49,7 @@ TEST(AsyncTask, RequestCoalescing) {
loop.runOnce();
EXPECT_EQ(count, 1);
EXPECT_EQ(count, 1u);
}
TEST(AsyncTask, DestroyShouldNotRunQueue) {
@@ -61,7 +61,7 @@ TEST(AsyncTask, DestroyShouldNotRunQueue) {
async->send();
async.reset();
EXPECT_EQ(count, 0);
EXPECT_EQ(count, 0u);
}
TEST(AsyncTask, DestroyAfterSignaling) {
@@ -114,7 +114,7 @@ TEST(AsyncTask, RequestCoalescingMultithreaded) {
loop.runOnce();
EXPECT_EQ(count, 1);
EXPECT_EQ(count, 1u);
}
TEST(AsyncTask, ThreadSafety) {
@@ -149,5 +149,5 @@ TEST(AsyncTask, ThreadSafety) {
// We expect here more than 1 but 1 would also be
// a valid result, although very unlikely (I hope).
EXPECT_GT(count, 0);
EXPECT_GT(count, 0u);
}

12
test/util/image.cpp
View File

@@ -68,21 +68,21 @@ TEST(Image, PNGReadProfileAlpha) {
TEST(Image, PNGTile) {
PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.png"));
EXPECT_EQ(256, image.width);
EXPECT_EQ(256, image.height);
EXPECT_EQ(256u, image.width);
EXPECT_EQ(256u, image.height);
}
TEST(Image, JPEGTile) {
PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.jpeg"));
EXPECT_EQ(256, image.width);
EXPECT_EQ(256, image.height);
EXPECT_EQ(256u, image.width);
EXPECT_EQ(256u, image.height);
}
#if !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS)
TEST(Image, WebPTile) {
PremultipliedImage image = decodeImage(util::read_file("test/fixtures/image/tile.webp"));
EXPECT_EQ(256, image.width);
EXPECT_EQ(256, image.height);
EXPECT_EQ(256u, image.width);
EXPECT_EQ(256u, image.height);
}
#endif // !defined(__ANDROID__) && !defined(__APPLE__) && !defined(QT_IMAGE_DECODERS)

2
test/util/thread_local.cpp
View File

@@ -91,5 +91,5 @@ TEST(ThreadLocalStorage, AutoReclaim) {
thread1.reset();
thread2.reset();
EXPECT_EQ(counter, 2);
EXPECT_EQ(counter, 2u);
}