summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-03-23 12:21:33 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-03-23 12:21:33 +0100
commitdbcbcb0ca1c1b5b3aaea6e5ee55c7abf98569536 (patch)
treec8cf50fc2f123b474729a352764502a6519badf4 /config-model
parent49512deb96d4daa6d0be7ad652d3436a4985887c (diff)
Remove phrase-segmenting flag test
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java7
-rw-r--r--config-model/src/test/derived/fieldset2/index-info.cfg41
-rw-r--r--config-model/src/test/derived/fieldset2/test.sd20
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/ExportingTestCase.java7
4 files changed, 0 insertions, 75 deletions
diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 802fdcc1dda..e37b0b07746 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -43,7 +43,6 @@ public class TestProperties implements ModelContext.Properties {
private double defaultTermwiseLimit = 1.0;
private Optional<EndpointCertificateSecrets> endpointCertificateSecrets = Optional.empty();
private boolean useNewAthenzFilter = false;
- private boolean usePhraseSegmenting = false;
private boolean useDedicatedNodesWhenUnspecified = false;
private AthenzDomain athenzDomain;
@@ -66,7 +65,6 @@ public class TestProperties implements ModelContext.Properties {
@Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; }
@Override public boolean useBucketSpaceMetric() { return true; }
@Override public boolean useNewAthenzFilter() { return useNewAthenzFilter; }
- @Override public boolean usePhraseSegmenting() { return usePhraseSegmenting; }
@Override public boolean useDedicatedNodesWhenUnspecified() { return useDedicatedNodesWhenUnspecified; }
@Override public Optional<AthenzDomain> athenzDomain() { return Optional.ofNullable(athenzDomain); }
@@ -120,11 +118,6 @@ public class TestProperties implements ModelContext.Properties {
return this;
}
- public TestProperties setUsePhraseSegmenting(boolean phraseSegmenting) {
- this.usePhraseSegmenting = phraseSegmenting;
- return this;
- }
-
public TestProperties setUseDedicatedNodesWhenUnspecified(boolean useDedicatedNodesWhenUnspecified) {
this.useDedicatedNodesWhenUnspecified = useDedicatedNodesWhenUnspecified;
return this;
diff --git a/config-model/src/test/derived/fieldset2/index-info.cfg b/config-model/src/test/derived/fieldset2/index-info.cfg
deleted file mode 100644
index 56cc53b4628..00000000000
--- a/config-model/src/test/derived/fieldset2/index-info.cfg
+++ /dev/null
@@ -1,41 +0,0 @@
-indexinfo[].name "test"
-indexinfo[].command[].indexname "sddocname"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "sddocname"
-indexinfo[].command[].command "word"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "lowercase"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "stem:BEST"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "normalize"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "plain-tokens"
-indexinfo[].command[].indexname "field1"
-indexinfo[].command[].command "phrase-segmenting"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "lowercase"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "stem:BEST"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "normalize"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "plain-tokens"
-indexinfo[].command[].indexname "field2"
-indexinfo[].command[].command "phrase-segmenting"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "phrase-segmenting false"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "lowercase"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "index"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "plain-tokens"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "stem:BEST"
-indexinfo[].command[].indexname "default"
-indexinfo[].command[].command "normalize"
diff --git a/config-model/src/test/derived/fieldset2/test.sd b/config-model/src/test/derived/fieldset2/test.sd
deleted file mode 100644
index 7606a5d16b2..00000000000
--- a/config-model/src/test/derived/fieldset2/test.sd
+++ /dev/null
@@ -1,20 +0,0 @@
-search test {
-
- document test {
-
- field field1 type string {
- indexing: index
- }
-
- field field2 type string {
- indexing: index
- }
-
- }
-
- fieldset default {
- fields: field1, field2
- query-command: "phrase-segmenting false"
- }
-
-}
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 08d915c35ca..3c55aa808b5 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
@@ -121,13 +121,6 @@ public class ExportingTestCase extends AbstractExportingTestCase {
}
@Test
- public void testFieldSet2() throws IOException, ParseException {
- TestProperties properties = new TestProperties();
- properties.setUsePhraseSegmenting(true);
- assertCorrectDeriving("fieldset2", null, properties);
- }
-
- @Test
public void testIndexinfoFieldsets() throws IOException, ParseException {
assertCorrectDeriving("indexinfo_fieldsets");
}