Remove header and body from search definitions

Remove from .sd files used in tests, add test that checks that
header and body still is allowed

4 files changed, 19 insertions, 10 deletions

diff --git a/config-model/src/test/examples/header_body.sd b/config-model/src/test/examples/header_body.sd
new file mode 100644
index 00000000000..65d6937b65c
--- /dev/null
+++ b/config-model/src/test/examples/header_body.sd
@@ -0,0 +1,18 @@
+# Copyright 2019 Verizon Media Inc.. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+# Search definition with (ignored) header and body statements
+# TODO: Remove in Vespa 8
+search header_body {
+
+  document header_body {
+
+    field title type string {
+      indexing: summary | index
+      header
+    }
+
+    field description type string {
+      indexing: summary | index
+      body
+    }
+  }
+}
diff --git a/config-model/src/test/examples/rankpropvars.sd b/config-model/src/test/examples/rankpropvars.sd
index 28959edbc09..bac02ea8316 100644
--- a/config-model/src/test/examples/rankpropvars.sd
+++ b/config-model/src/test/examples/rankpropvars.sd
@@ -52,28 +52,22 @@ document music {
 
     field title type string {
       indexing: index | summary
-      body
     }
 
     field artist type string {
       ## index-to: a
       indexing: index | summary
-      body
     }
 
     field year type int {
       indexing: attribute | summary
       ## index-to: y
-      body
     }
 
-    field url type uri {
-      body
-    }
+    field url type uri {}
 
     field Popularity type string {
       indexing: attribute | summary
-      body
     }
 }
 
diff --git a/config-model/src/test/examples/simple.sd b/config-model/src/test/examples/simple.sd
index 0435ea439df..8a97db6afa2 100644
--- a/config-model/src/test/examples/simple.sd
+++ b/config-model/src/test/examples/simple.sd
@@ -47,7 +47,6 @@ search simple {
       rank-type: tags
       stemming: none
       normalizing: none
-      header
     }
 
     field popularity type int {
@@ -81,7 +80,6 @@ search simple {
 
   field categories type string {
     indexing: input categories_src | lowercase | normalize | index
-    body
   }
 
   field categoriesagain type string {
diff --git a/config-model/src/test/examples/structoutsideofdocument.sd b/config-model/src/test/examples/structoutsideofdocument.sd
index 4c52a248bf5..5c062ef19a6 100644
--- a/config-model/src/test/examples/structoutsideofdocument.sd
+++ b/config-model/src/test/examples/structoutsideofdocument.sd
@@ -11,6 +11,5 @@ search structoutsideofdocument {
 
    field nallestruct type array<nalle> {
      indexing: summary
-     body
    }
   }