drop old summary fields in v8 mode

* the extra summary fields with .position and .distance will
  only be added in v7-geo-positions legacy mode on Vespa 8.

2 files changed, 16 insertions, 5 deletions

diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
index a88ad929e80..456efdb08ae 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java
@@ -100,6 +100,11 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase {
                                                          DeployLogger logger) throws IOException, ParseException {
         return assertCorrectDeriving(dirName, searchDefinitionName, new TestProperties(), logger);
     }
+    protected DerivedConfiguration assertCorrectDeriving(String dirName,
+                                                         TestProperties properties) throws IOException, ParseException
+    {
+        return assertCorrectDeriving(dirName, null, properties, new TestableDeployLogger());
+    }
 
     protected DerivedConfiguration assertCorrectDeriving(String dirName,
                                                          String searchDefinitionName,
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
index ddb627216b7..27ba4e906a1 100644
--- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
+++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition.derived;
 
+import com.yahoo.config.model.deploy.TestProperties;
 import com.yahoo.searchdefinition.ApplicationBuilder;
 import com.yahoo.searchdefinition.parser.ParseException;
 import org.junit.Test;
@@ -23,27 +24,32 @@ public class ExportingTestCase extends AbstractExportingTestCase {
 
     @Test
     public void testPositionArray() throws IOException, ParseException {
-        assertCorrectDeriving("position_array");
+        assertCorrectDeriving("position_array",
+                              new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
     public void testPositionAttribute() throws IOException, ParseException {
-        assertCorrectDeriving("position_attribute");
+        assertCorrectDeriving("position_attribute",
+                              new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
     public void testPositionExtra() throws IOException, ParseException {
-        assertCorrectDeriving("position_extra");
+        assertCorrectDeriving("position_extra",
+                              new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
     public void testPositionNoSummary() throws IOException, ParseException {
-        assertCorrectDeriving("position_nosummary");
+        assertCorrectDeriving("position_nosummary",
+                              new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test
     public void testPositionSummary() throws IOException, ParseException {
-        assertCorrectDeriving("position_summary");
+        assertCorrectDeriving("position_summary",
+                              new TestProperties().setUseV8GeoPositions(true));
     }
 
     @Test