Make document types in imported fields test more generic to prepare for more tests.

11 files changed, 63 insertions, 63 deletions

diff --git a/config-model/src/test/derived/importedfields/ad.sd b/config-model/src/test/derived/importedfields/ad.sd
deleted file mode 100644
index 7c43538e501..00000000000
--- a/config-model/src/test/derived/importedfields/ad.sd
+++ /dev/null
@@ -1,18 +0,0 @@
-search ad {
-  document ad {
-    field campaign_ref type reference<campaign> { indexing: attribute }
-    field person_ref type reference<person> { indexing: attribute }
-  }
-  import field campaign_ref.budget as my_budget {}
-  import field person_ref.name as my_person_name {}
-
-  fieldset myfieldset {
-    fields: my_budget, my_person_name
-  }
-
-  document-summary mysummary {
-    summary campaign_ref type reference<campaign> {}
-    summary my_budget type int {}
-    summary my_person_name type string {}
-  }
-}
diff --git a/config-model/src/test/derived/importedfields/campaign.sd b/config-model/src/test/derived/importedfields/campaign.sd
deleted file mode 100644
index 07998e57bde..00000000000
--- a/config-model/src/test/derived/importedfields/campaign.sd
+++ /dev/null
@@ -1,7 +0,0 @@
-search campaign {
-  document campaign {
-    field budget type int {
-      indexing: attribute
-    }
-  }
-}
diff --git a/config-model/src/test/derived/importedfields/child.sd b/config-model/src/test/derived/importedfields/child.sd
new file mode 100644
index 00000000000..a7428433ca8
--- /dev/null
+++ b/config-model/src/test/derived/importedfields/child.sd
@@ -0,0 +1,18 @@
+search child {
+  document child {
+    field a_ref type reference<parent_a> { indexing: attribute }
+    field b_ref type reference<parent_b> { indexing: attribute }
+  }
+  import field a_ref.int_field as my_int_field {}
+  import field b_ref.string_field as my_string_field {}
+
+  fieldset myfieldset {
+    fields: my_int_field, my_string_field
+  }
+
+  document-summary mysummary {
+    summary a_ref type reference<parent_a> {}
+    summary my_int_field type int {}
+    summary my_string_field type string {}
+  }
+}
diff --git a/config-model/src/test/derived/importedfields/imported-fields.cfg b/config-model/src/test/derived/importedfields/imported-fields.cfg
index 6ffb7055657..63e6819ca90 100644
--- a/config-model/src/test/derived/importedfields/imported-fields.cfg
+++ b/config-model/src/test/derived/importedfields/imported-fields.cfg
@@ -1,6 +1,6 @@
-attribute[].name "my_budget"
-attribute[].referencefield "campaign_ref"
-attribute[].targetfield "budget"
-attribute[].name "my_person_name"
-attribute[].referencefield "person_ref"
-attribute[].targetfield "name"
+attribute[].name "my_int_field"
+attribute[].referencefield "a_ref"
+attribute[].targetfield "int_field"
+attribute[].name "my_string_field"
+attribute[].referencefield "b_ref"
+attribute[].targetfield "string_field"
diff --git a/config-model/src/test/derived/importedfields/index-info.cfg b/config-model/src/test/derived/importedfields/index-info.cfg
index 0295df3f3fe..d4511bcf198 100644
--- a/config-model/src/test/derived/importedfields/index-info.cfg
+++ b/config-model/src/test/derived/importedfields/index-info.cfg
@@ -1,35 +1,35 @@
-indexinfo[].name "ad"
+indexinfo[].name "child"
 indexinfo[].command[].indexname "sddocname"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "sddocname"
 indexinfo[].command[].command "word"
-indexinfo[].command[].indexname "campaign_ref"
+indexinfo[].command[].indexname "a_ref"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "campaign_ref"
+indexinfo[].command[].indexname "a_ref"
 indexinfo[].command[].command "attribute"
-indexinfo[].command[].indexname "campaign_ref"
+indexinfo[].command[].indexname "a_ref"
 indexinfo[].command[].command "word"
-indexinfo[].command[].indexname "person_ref"
+indexinfo[].command[].indexname "b_ref"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "person_ref"
+indexinfo[].command[].indexname "b_ref"
 indexinfo[].command[].command "attribute"
-indexinfo[].command[].indexname "person_ref"
+indexinfo[].command[].indexname "b_ref"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "rankfeatures"
 indexinfo[].command[].command "index"
 indexinfo[].command[].indexname "summaryfeatures"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_budget"
+indexinfo[].command[].indexname "my_int_field"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_budget"
+indexinfo[].command[].indexname "my_int_field"
 indexinfo[].command[].command "attribute"
-indexinfo[].command[].indexname "my_budget"
+indexinfo[].command[].indexname "my_int_field"
 indexinfo[].command[].command "numerical"
-indexinfo[].command[].indexname "my_person_name"
+indexinfo[].command[].indexname "my_string_field"
 indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "my_person_name"
+indexinfo[].command[].indexname "my_string_field"
 indexinfo[].command[].command "attribute"
-indexinfo[].command[].indexname "my_person_name"
+indexinfo[].command[].indexname "my_string_field"
 indexinfo[].command[].command "word"
 indexinfo[].command[].indexname "myfieldset"
 indexinfo[].command[].command "attribute"
diff --git a/config-model/src/test/derived/importedfields/indexschema.cfg b/config-model/src/test/derived/importedfields/indexschema.cfg
index 224d40566bc..5905de5e42e 100644
--- a/config-model/src/test/derived/importedfields/indexschema.cfg
+++ b/config-model/src/test/derived/importedfields/indexschema.cfg
@@ -1,3 +1,3 @@
 fieldset[].name "myfieldset"
-fieldset[].field[].name "my_budget"
-fieldset[].field[].name "my_person_name"
+fieldset[].field[].name "my_int_field"
+fieldset[].field[].name "my_string_field"
diff --git a/config-model/src/test/derived/importedfields/parent_a.sd b/config-model/src/test/derived/importedfields/parent_a.sd
new file mode 100644
index 00000000000..9107817f4f6
--- /dev/null
+++ b/config-model/src/test/derived/importedfields/parent_a.sd
@@ -0,0 +1,7 @@
+search parent_a {
+  document parent_a {
+    field int_field type int {
+      indexing: attribute
+    }
+  }
+}
diff --git a/config-model/src/test/derived/importedfields/parent_b.sd b/config-model/src/test/derived/importedfields/parent_b.sd
new file mode 100644
index 00000000000..3827546a4e1
--- /dev/null
+++ b/config-model/src/test/derived/importedfields/parent_b.sd
@@ -0,0 +1,7 @@
+search parent_b {
+  document parent_b {
+    field string_field type string {
+      indexing: attribute
+    }
+  }
+}
diff --git a/config-model/src/test/derived/importedfields/person.sd b/config-model/src/test/derived/importedfields/person.sd
deleted file mode 100644
index 74213fbe52f..00000000000
--- a/config-model/src/test/derived/importedfields/person.sd
+++ /dev/null
@@ -1,7 +0,0 @@
-search person {
-  document person {
-    field name type string {
-      indexing: attribute
-    }
-  }
-}
diff --git a/config-model/src/test/derived/importedfields/summary.cfg b/config-model/src/test/derived/importedfields/summary.cfg
index d0042be0e2a..19726d2e08a 100644
--- a/config-model/src/test/derived/importedfields/summary.cfg
+++ b/config-model/src/test/derived/importedfields/summary.cfg
@@ -7,13 +7,13 @@ classes[].fields[].name "summaryfeatures"
 classes[].fields[].type "featuredata"
 classes[].fields[].name "documentid"
 classes[].fields[].type "longstring"
-classes[].id 153697641
+classes[].id 2082780611
 classes[].name "mysummary"
-classes[].fields[].name "campaign_ref"
+classes[].fields[].name "a_ref"
 classes[].fields[].type "longstring"
-classes[].fields[].name "my_budget"
+classes[].fields[].name "my_int_field"
 classes[].fields[].type "integer"
-classes[].fields[].name "my_person_name"
+classes[].fields[].name "my_string_field"
 classes[].fields[].type "longstring"
 classes[].fields[].name "rankfeatures"
 classes[].fields[].type "featuredata"
diff --git a/config-model/src/test/derived/importedfields/summarymap.cfg b/config-model/src/test/derived/importedfields/summarymap.cfg
index 39408bbff5e..d0b8be1d903 100644
--- a/config-model/src/test/derived/importedfields/summarymap.cfg
+++ b/config-model/src/test/derived/importedfields/summarymap.cfg
@@ -1,13 +1,13 @@
 defaultoutputclass -1
+override[].field "my_int_field"
+override[].command "attribute"
+override[].arguments "my_int_field"
+override[].field "my_string_field"
+override[].command "attribute"
+override[].arguments "my_string_field"
 override[].field "rankfeatures"
 override[].command "rankfeatures"
 override[].arguments ""
 override[].field "summaryfeatures"
 override[].command "summaryfeatures"
 override[].arguments ""
-override[].field "my_budget"
-override[].command "attribute"
-override[].arguments "my_budget"
-override[].field "my_person_name"
-override[].command "attribute"
-override[].arguments "my_person_name"