From d169ea55c1cfa85cd8bf19f94c5f023569f71810 Mon Sep 17 00:00:00 2001
From: Jake Pruitt <jake@mapbox.com>
Date: Fri, 16 Sep 2016 14:11:16 -0700
Subject: 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.
---
 test/util/mapbox.cpp | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'test')

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
@@ -15,6 +15,12 @@ TEST(Mapbox, SourceURL) {
     EXPECT_EQ(
         "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"));
@@ -54,6 +60,12 @@ TEST(Mapbox, StyleURL) {
     EXPECT_EQ(
         "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"));
@@ -90,6 +102,12 @@ TEST(Mapbox, TileURL) {
     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.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"));
-- 
cgit v1.2.1