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

[msvc] Avoid warnings in tests (#276)

Browse Source
This commit is contained in:
Tadej Novak
2022-04-26 17:44:49 +02:00
committed by GitHub
parent 32ed70c95d
commit 2dcc9d8b61
19 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/style/conversion/stringify.test.cpp
View File

@@ -67,7 +67,7 @@ TEST(Stringify, Vector) {
}
TEST(Stringify, Map) {
ASSERT_EQ(stringify(std::unordered_map<std::string, float> {{ "a", 1 }}), "{\"a\":1.0}");
ASSERT_EQ(stringify(std::unordered_map<std::string, float> {{ "a", 1.0f }}), "{\"a\":1.0}");
}
TEST(Stringify, Value) {

2
test/style/filter.test.cpp
View File

@@ -51,7 +51,7 @@ void writeJSON(rapidjson::Writer<rapidjson::StringBuffer>& writer, const Value&
[&] (int64_t t) { writer.Int64(t); },
[&] (double f) {
// make sure integer values are stringified without trailing ".0".
f == std::floor(f) ? writer.Int(f) : writer.Double(f);
f == std::floor(f) ? writer.Int(static_cast<int>(f)) : writer.Double(f);
},
[&] (const std::string& s) { writer.String(s); },
[&] (const std::vector<Value>& arr) {

12
test/style/style.test.cpp
View File

@@ -138,9 +138,9 @@ TEST(Style, AddRemoveImage) {
util::RunLoop loop;
auto fileSource = std::make_shared<StubFileSource>();
Style::Impl style{fileSource, 1.0};
style.addImage(std::make_unique<style::Image>("one", PremultipliedImage({16, 16}), 2));
style.addImage(std::make_unique<style::Image>("two", PremultipliedImage({16, 16}), 2));
style.addImage(std::make_unique<style::Image>("three", PremultipliedImage({16, 16}), 2));
style.addImage(std::make_unique<style::Image>("one", PremultipliedImage({16, 16}), 2.0f));
style.addImage(std::make_unique<style::Image>("two", PremultipliedImage({16, 16}), 2.0f));
style.addImage(std::make_unique<style::Image>("three", PremultipliedImage({16, 16}), 2.0f));
style.removeImage("one");
style.removeImage("two");
@@ -155,9 +155,9 @@ TEST(Style, AddRemoveRemoveImage) {
util::RunLoop loop;
auto fileSource = std::make_shared<StubFileSource>();
Style::Impl style{fileSource, 1.0};
style.addImage(std::make_unique<style::Image>("one", PremultipliedImage({16, 16}), 2));
style.addImage(std::make_unique<style::Image>("two", PremultipliedImage({16, 16}), 2));
style.addImage(std::make_unique<style::Image>("three", PremultipliedImage({16, 16}), 2));
style.addImage(std::make_unique<style::Image>("one", PremultipliedImage({16, 16}), 2.0f));
style.addImage(std::make_unique<style::Image>("two", PremultipliedImage({16, 16}), 2.0f));
style.addImage(std::make_unique<style::Image>("three", PremultipliedImage({16, 16}), 2.0f));
style.removeImage("one");
style.removeImage("two");

24
test/style/style_image.test.cpp
View File

@@ -8,7 +8,7 @@ using namespace mbgl;
TEST(StyleImage, ZeroWidth) {
try {
style::Image("test", PremultipliedImage({ 0, 16 }), 2.0);
style::Image("test", PremultipliedImage({ 0, 16 }), 2.0f);
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("dimensions may not be zero", ex.what());
@@ -17,7 +17,7 @@ TEST(StyleImage, ZeroWidth) {
TEST(StyleImage, ZeroHeight) {
try {
style::Image("test", PremultipliedImage({ 16, 0 }), 2.0);
style::Image("test", PremultipliedImage({ 16, 0 }), 2.0f);
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("dimensions may not be zero", ex.what());
@@ -26,7 +26,7 @@ TEST(StyleImage, ZeroHeight) {
TEST(StyleImage, ZeroRatio) {
try {
style::Image("test", PremultipliedImage({ 16, 16 }), 0.0);
style::Image("test", PremultipliedImage({ 16, 16 }), 0.0f);
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("pixelRatio may not be <= 0", ex.what());
@@ -34,14 +34,14 @@ TEST(StyleImage, ZeroRatio) {
}
TEST(StyleImage, Retina) {
style::Image image("test", PremultipliedImage({ 32, 24 }), 2.0);
style::Image image("test", PremultipliedImage({ 32, 24 }), 2.0f);
EXPECT_EQ(32u, image.getImage().size.width);
EXPECT_EQ(24u, image.getImage().size.height);
EXPECT_EQ(2, image.getPixelRatio());
}
TEST(StyleImage, FractionalRatio) {
style::Image image("test", PremultipliedImage({ 20, 12 }), 1.5);
style::Image image("test", PremultipliedImage({ 20, 12 }), 1.5f);
EXPECT_EQ(20u, image.getImage().size.width);
EXPECT_EQ(12u, image.getImage().size.height);
EXPECT_EQ(1.5, image.getPixelRatio());
@@ -50,7 +50,7 @@ TEST(StyleImage, FractionalRatio) {
TEST(StyleImage, InvalidStretchX) {
// out of left bound
try {
style::Image("test", PremultipliedImage({16, 16}), 1, {{-1, 3}});
style::Image("test", PremultipliedImage({16, 16}), 1, {{-1.0f, 3.0f}});
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what());
@@ -58,7 +58,7 @@ TEST(StyleImage, InvalidStretchX) {
// overlapping
try {
style::Image("test", PremultipliedImage({16, 16}), 1, {{0, 3}, {2., 4.}});
style::Image("test", PremultipliedImage({16, 16}), 1, {{0.0f, 3.0f}, {2.0f, 4.0f}});
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what());
@@ -68,7 +68,7 @@ TEST(StyleImage, InvalidStretchX) {
TEST(StyleImage, InvalidStretchY) {
// out of bottom bound
try {
style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{14, 20}});
style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{14.0f, 20.0f}});
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what());
@@ -76,7 +76,7 @@ TEST(StyleImage, InvalidStretchY) {
// must be sorted
try {
style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{4, 8}, {2, 3}});
style::Image("test", PremultipliedImage({16, 16}), 1, {}, {{4.0f, 8.0f}, {2.0f, 3.0f}});
FAIL() << "Expected exception";
} catch (util::StyleImageException& ex) {
EXPECT_STREQ("stretchX is out of bounds or overlapping", ex.what());
@@ -111,11 +111,11 @@ TEST(StyleImage, InvalidContent) {
TEST(StyleImage, StretchContent) {
style::Image image(
"test", PremultipliedImage({16, 16}), 1, {{2, 14}}, {{0, 4}, {12, 16}}, style::ImageContent{2, 2, 14, 14});
"test", PremultipliedImage({16, 16}), 1, {{2.0f, 14.0f}}, {{0.0f, 4.0f}, {12.0f, 16.0f}}, style::ImageContent{2, 2, 14, 14});
EXPECT_EQ(16u, image.getImage().size.width);
EXPECT_EQ(16u, image.getImage().size.height);
EXPECT_EQ(1.0, image.getPixelRatio());
EXPECT_EQ((style::ImageStretches{{2, 14}}), image.getStretchX());
EXPECT_EQ((style::ImageStretches{{0, 4}, {12, 16}}), image.getStretchY());
EXPECT_EQ((style::ImageStretches{{2.0f, 14.0f}}), image.getStretchX());
EXPECT_EQ((style::ImageStretches{{0.0f, 4.0f}, {12.0f, 16.0f}}), image.getStretchY());
EXPECT_EQ((style::ImageContent{2, 2, 14, 14}), image.getContent());
}