[core] Do not constrain on X axis in ConstrainMode::HeightOnly

2 files changed, 12 insertions, 9 deletions

diff --git a/test/fixtures/offline_database/offline_sideload.db b/test/fixtures/offline_database/offline_sideload.db
new file mode 100644
index 0000000000..8909c402b2
--- /dev/null
+++ b/test/fixtures/offline_database/offline_sideload.db
diff --git a/test/style/expression/expression.test.cpp b/test/style/expression/expression.test.cpp
index 4c2ec5cf92..bed3d4f063 100644
--- a/test/style/expression/expression.test.cpp
+++ b/test/style/expression/expression.test.cpp
@@ -29,18 +29,21 @@ TEST(Expression, IsExpression) {
 
     for(auto& entry : allExpressions.GetObject()) {
         const std::string name { entry.name.GetString(), entry.name.GetStringLength() };
-        if (name == "line-progress" ||
-            name == "feature-state" ||
-            name == "interpolate-hcl" ||
-            name == "interpolate-lab" ||
-            name == "format") {
-            // Not yet implemented
-            continue;
-        }
         JSDocument document;
         document.Parse<0>(R"([")" + name + R"("])");
-
         const JSValue* expression = &document;
+
+        // TODO:   "feature-state": https://github.com/mapbox/mapbox-gl-native/issues/12613
+        // TODO: "interpolate-hcl": https://github.com/mapbox/mapbox-gl-native/issues/8720
+        // TODO: "interpolate-lab": https://github.com/mapbox/mapbox-gl-native/issues/8720
+        // TODO:          "format": https://github.com/mapbox/mapbox-gl-native/issues/12612
+        if (name == "feature-state" || name == "interpolate-hcl" || name == "interpolate-lab" || name == "format") {
+            if (expression::isExpression(conversion::Convertible(expression))) {
+                ASSERT_TRUE(false) << "Expression name" << name << "is implemented - please update Expression.IsExpression test.";
+            }
+            continue;
+        }
+
         EXPECT_TRUE(expression::isExpression(conversion::Convertible(expression))) << name;
     }
 }