Expect variants with references to be output in the referer

2 files changed, 5 insertions, 11 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg
index aff71104f7a..9a1fbcb2aed 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/query-profile-variants2-configuration.cfg
@@ -28,6 +28,8 @@ queryprofile[1].reference[0].value "querybest"
 queryprofile[1].reference[0].overridable ""
 queryprofile[1].queryprofilevariant[0].fordimensionvalues[0] "love"
 queryprofile[1].queryprofilevariant[0].fordimensionvalues[1] "default"
+queryprofile[1].queryprofilevariant[0].property[0].name "model.defaultIndex"
+queryprofile[1].queryprofilevariant[0].property[0].value "default"
 queryprofile[1].queryprofilevariant[0].reference[0].name "model"
 queryprofile[1].queryprofilevariant[0].reference[0].value "querylove"
 queryprofile[1].queryprofilevariant[1].fordimensionvalues[0] "*"
@@ -47,16 +49,10 @@ queryprofile[2].property[1].value "best"
 queryprofile[2].property[1].overridable "false"
 queryprofile[3].id "querylove"
 queryprofile[3].type "model"
-queryprofile[3].dimensions[0] "myquery"
-queryprofile[3].dimensions[1] "myindex"
 queryprofile[3].property[0].name "defaultIndex"
 queryprofile[3].property[0].value "title"
 queryprofile[3].property[0].overridable ""
 queryprofile[3].property[1].name "queryString"
 queryprofile[3].property[1].value "love"
 queryprofile[3].property[1].overridable "false"
-queryprofile[3].queryprofilevariant[0].fordimensionvalues[0] "love"
-queryprofile[3].queryprofilevariant[0].fordimensionvalues[1] "default"
-queryprofile[3].queryprofilevariant[0].property[0].name "defaultIndex"
-queryprofile[3].queryprofilevariant[0].property[0].value "default"
-enableGroupingSessionCache true
\ No newline at end of file
+enableGroupingSessionCache true
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg
index 0af30a9ad5c..5dcef0e13c6 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/search/test/variants-of-explicit-compound-with-reference.cfg
@@ -5,13 +5,9 @@ queryprofile[0].property[0].value "a1.b"
 queryprofile[0].property[0].overridable ""
 queryprofile[1].id "a2"
 queryprofile[1].type ""
-queryprofile[1].dimensions[0] "x"
 queryprofile[1].property[0].name "b"
 queryprofile[1].property[0].value "a2.b"
 queryprofile[1].property[0].overridable ""
-queryprofile[1].queryprofilevariant[0].fordimensionvalues[0] "x1"
-queryprofile[1].queryprofilevariant[0].property[0].name "b"
-queryprofile[1].queryprofilevariant[0].property[0].value "a.b.x1"
 queryprofile[2].id "test"
 queryprofile[2].type ""
 queryprofile[2].dimensions[0] "x"
@@ -19,6 +15,8 @@ queryprofile[2].reference[0].name "a"
 queryprofile[2].reference[0].value "a1"
 queryprofile[2].reference[0].overridable ""
 queryprofile[2].queryprofilevariant[0].fordimensionvalues[0] "x1"
+queryprofile[2].queryprofilevariant[0].property[0].name "a.b"
+queryprofile[2].queryprofilevariant[0].property[0].value "a.b.x1"
 queryprofile[2].queryprofilevariant[0].reference[0].name "a"
 queryprofile[2].queryprofilevariant[0].reference[0].value "a2"
 queryprofile[2].queryprofilevariant[1].fordimensionvalues[0] "x2"