diff options
| author | Jake Pruitt <jake@mapbox.com> | 2016-09-16 14:11:16 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-16 14:11:16 -0700 |
| commit | d169ea55c1cfa85cd8bf19f94c5f023569f71810 (patch) | |
| tree | df9e1c59c5d140af94fc33c4b170319ba3c50429 /test | |
| parent | 032b4d896427116d9314216d0b5f991cdd2f37b7 (diff) | |
| download | qtlocation-mapboxgl-d169ea55c1cfa85cd8bf19f94c5f023569f71810.tar.gz | |
Keep query strings in source URLs (#6182)
Carries over any query strings from mapbox://-prefixed styles urls,
source urls and tile urls to the api.mapbox.com requests.
Diffstat (limited to 'test')
| -rw-r--r-- | test/util/mapbox.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/test/util/mapbox.cpp b/test/util/mapbox.cpp index f3fb42c59d..b559c3a947 100644 --- a/test/util/mapbox.cpp +++ b/test/util/mapbox.cpp @@ -16,6 +16,12 @@ TEST(Mapbox, SourceURL) { "https://api.example.com/v4/user.map.json?access_token=key&secure", mbgl::util::mapbox::normalizeSourceURL("https://api.example.com", "mapbox://user.map", "key")); EXPECT_EQ( + "https://api.mapbox.com/v4/user.map.json?access_token=key&secure&style=mapbox://styles/mapbox/streets-v9@0", + mbgl::util::mapbox::normalizeSourceURL(util::API_BASE_URL, "mapbox://user.map?style=mapbox://styles/mapbox/streets-v9@0", "key")); + EXPECT_EQ( + "https://api.mapbox.com/v4/user.map.json?access_token=key&secure", + mbgl::util::mapbox::normalizeSourceURL(util::API_BASE_URL, "mapbox://user.map?", "key")); + EXPECT_EQ( "http://path", mbgl::util::mapbox::normalizeSourceURL(util::API_BASE_URL, "http://path", "key")); EXPECT_THROW( @@ -55,6 +61,12 @@ TEST(Mapbox, StyleURL) { "https://api.mapbox.com/styles/v1/user/style/draft?access_token=key", mbgl::util::mapbox::normalizeStyleURL(util::API_BASE_URL, "mapbox://styles/user/style/draft", "key")); EXPECT_EQ( + "https://api.mapbox.com/styles/v1/user/style?access_token=key&shave=true", + mbgl::util::mapbox::normalizeStyleURL(util::API_BASE_URL, "mapbox://styles/user/style?shave=true", "key")); + EXPECT_EQ( + "https://api.mapbox.com/styles/v1/user/style?access_token=key", + mbgl::util::mapbox::normalizeStyleURL(util::API_BASE_URL, "mapbox://styles/user/style?", "key")); + EXPECT_EQ( "http://path", mbgl::util::mapbox::normalizeStyleURL(util::API_BASE_URL, "http://path", "key")); } @@ -91,6 +103,12 @@ TEST(Mapbox, TileURL) { "https://api.mapbox.com/v4/a.b/0/0/0.pbf?access_token=key", mbgl::util::mapbox::normalizeTileURL(util::API_BASE_URL, "mapbox://tiles/a.b/0/0/0.pbf", "key")); EXPECT_EQ( + "https://api.mapbox.com/v4/a.b/0/0/0.pbf?access_token=key&style=mapbox://styles/mapbox/streets-v9@0", + mbgl::util::mapbox::normalizeTileURL(util::API_BASE_URL, "mapbox://tiles/a.b/0/0/0.pbf?style=mapbox://styles/mapbox/streets-v9@0", "key")); + EXPECT_EQ( + "https://api.mapbox.com/v4/a.b/0/0/0.pbf?access_token=key", + mbgl::util::mapbox::normalizeTileURL(util::API_BASE_URL, "mapbox://tiles/a.b/0/0/0.pbf?", "key")); + EXPECT_EQ( "https://api.mapbox.com/v4/a.b/0/0/0.png?access_token=key", mbgl::util::mapbox::normalizeTileURL(util::API_BASE_URL, "mapbox://tiles/a.b/0/0/0.png", "key")); EXPECT_EQ( |