Merge pull request #8110 from vespa-engine/bratseth/disallow-dash

Bratseth/disallow dash 

1 files changed, 11 insertions, 0 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
index ed80c0bf256..dae6b9f0fb9 100644
--- a/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/test/QueryTestCase.java
@@ -308,6 +308,17 @@ public class QueryTestCase {
     }
 
     @Test
+    public void testLanguageSubstitution() {
+        QueryProfile profile = new QueryProfile("myProfile");
+        profile.set("myField1", "Language: %{model.language}", null);
+        profile.set("myField2", "Locale: %{locale}", null);
+        Query q = new Query(QueryTestCase.httpEncode("/search?lang=en-us"), profile.compile(null));
+        assertEquals("Language: ENGLISH", q.properties().get("myField1"));
+        q.properties().set("locale", q.getHttpRequest().propertyMap().get("lang"));
+        assertEquals("Locale: en-us", q.properties().get("myField2"));
+    }
+
+    @Test
     public void testTimeoutInRequestOverridesQueryProfile() {
         QueryProfile profile = new QueryProfile("test");
         profile.set("timeout", 318, (QueryProfileRegistry)null);