summaryrefslogtreecommitdiff
path: root/test/style/style_parser.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'test/style/style_parser.cpp')
-rw-r--r--test/style/style_parser.cpp22
1 files changed, 17 insertions, 5 deletions
diff --git a/test/style/style_parser.cpp b/test/style/style_parser.cpp
index 22b5acb12b..64ee4af9fc 100644
--- a/test/style/style_parser.cpp
+++ b/test/style/style_parser.cpp
@@ -90,15 +90,16 @@ TEST(StyleParser, ParseTileJSONRaster) {
auto result = StyleParser::parseTileJSON(
util::read_file("test/fixtures/style_parser/tilejson.raster.json"),
"mapbox://mapbox.satellite",
- SourceType::Raster);
+ SourceType::Raster,
+ 256);
EXPECT_EQ(0, result->minZoom);
EXPECT_EQ(15, result->maxZoom);
EXPECT_EQ("attribution", result->attribution);
#if !defined(__ANDROID__) && !defined(__APPLE__)
- EXPECT_EQ("http://a.tiles.mapbox.com/mapbox.satellite/{z}-{x}-{y}{ratio}.webp?access_token=key", result->tiles[0]);
+ EXPECT_EQ("mapbox://tiles/mapbox.satellite/{z}/{x}/{y}{ratio}.webp", result->tiles[0]);
#else
- EXPECT_EQ("http://a.tiles.mapbox.com/mapbox.satellite/{z}-{x}-{y}{ratio}.png?access_token=key", result->tiles[0]);
+ EXPECT_EQ("mapbox://tiles/mapbox.satellite/{z}/{x}/{y}{ratio}.png", result->tiles[0]);
#endif
}
@@ -106,10 +107,21 @@ TEST(StyleParser, ParseTileJSONVector) {
auto result = StyleParser::parseTileJSON(
util::read_file("test/fixtures/style_parser/tilejson.vector.json"),
"mapbox://mapbox.streets",
- SourceType::Vector);
+ SourceType::Vector,
+ 256);
EXPECT_EQ(0, result->minZoom);
EXPECT_EQ(15, result->maxZoom);
EXPECT_EQ("attribution", result->attribution);
- EXPECT_EQ("http://a.tiles.mapbox.com/mapbox.streets/{z}-{x}-{y}.vector.pbf?access_token=key", result->tiles[0]);
+ EXPECT_EQ("mapbox://tiles/mapbox.streets/{z}/{x}/{y}.vector.pbf", result->tiles[0]);
+}
+
+TEST(StyleParser, FontStacks) {
+ StyleParser parser;
+ parser.parse(util::read_file("test/fixtures/style_parser/font_stacks.json"));
+ auto result = parser.fontStacks();
+ ASSERT_EQ(3, result.size());
+ ASSERT_EQ("a", result[0]);
+ ASSERT_EQ("a,b", result[1]);
+ ASSERT_EQ("a,b,c", result[2]);
}