summaryrefslogtreecommitdiff
path: root/test/text
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2017-12-06 15:18:47 -0800
committerChris Loer <chris.loer@mapbox.com>2017-12-11 10:43:00 -0800
commit56aa7dad4f218215f249a9a2484f8c144ecbde9f (patch)
treebee4460e4d159dd03f535a3986b277f160d130e4 /test/text
parentb4c781aef73faa62e20af38016ac99ce8bc638ac (diff)
downloadqtlocation-mapboxgl-56aa7dad4f218215f249a9a2484f8c144ecbde9f.tar.gz
[macos,ios,android] Unit test fixups
- Add explanatory comment - Remove dead/unused Android test - Increase image diff threshold to .05 to accommodate slightly different versions of "PingFang" between different test platforms
Diffstat (limited to 'test/text')
-rw-r--r--test/text/local_glyph_rasterizer.test.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/test/text/local_glyph_rasterizer.test.cpp b/test/text/local_glyph_rasterizer.test.cpp
index a77083a5d8..84c685d66f 100644
--- a/test/text/local_glyph_rasterizer.test.cpp
+++ b/test/text/local_glyph_rasterizer.test.cpp
@@ -9,6 +9,22 @@
#include <mbgl/util/default_thread_pool.hpp>
#include <mbgl/style/style.hpp>
+/*
+ LoadLocalCJKGlyph in glyph_manager.test.cpp exercises the platform-independent
+ part of LocalGlyphRasterizer. This test actually exercises platform-dependent
+ font loading code for whatever platform it runs on. Different platforms have
+ different default fonts, so adding a new platform requires new "expected"
+ fixtures.
+
+ At the time of writing, we don't run `mbgl-test` on iOS or Android, so the only
+ supported test platform is macOS. Supporting Android would require adding a new
+ test case (probably using the "Droid" font family). iOS should theoretically
+ work -- the "PingFang" font family used below is expected to be available on
+ all iOS devices, and we use a relatively high image diff tolerance (0.05) to
+ account for small changes between the many possible variants of the PingFang
+ family.
+*/
+
using namespace mbgl;
namespace {
@@ -30,7 +46,7 @@ public:
void checkRendering(const char * name) {
test::checkImage(std::string("test/fixtures/local_glyphs/") + name,
- frontend.render(map), 0.0002, 0.1);
+ frontend.render(map), 0.05, 0.1);
}
};
@@ -68,19 +84,3 @@ TEST(LocalGlyphRasterizer, NoLocal) {
test.checkRendering("no_local");
}
-#if ANDROID
-
-TEST(LocalGlyphRasterizer, Droid) {
- LocalGlyphRasterizerTest test(std::string("Droid"));
-
- test.fileSource.glyphsResponse = [&] (const Resource& resource) {
- EXPECT_EQ(Resource::Kind::Glyphs, resource.kind);
- Response response;
- response.data = std::make_shared<std::string>(util::read_file("test/fixtures/resources/glyphs.pbf"));
- return response;
- };
- test.map.getStyle().loadJSON(util::read_file("test/fixtures/local_glyphs/mixed.json"));
- test.checkRendering("droid");
-}
-
-#endif