diff options
Diffstat (limited to 'config-model/src/test/java')
17 files changed, 47 insertions, 192 deletions
diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java index f3c15937d24..25de24a4315 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/AnnotationReferenceTestCase.java @@ -5,9 +5,7 @@ import com.yahoo.document.DataType; import com.yahoo.document.StructDataType; import com.yahoo.document.Field; import com.yahoo.document.annotation.AnnotationReferenceDataType; -import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.document.SDDocumentType; -import com.yahoo.searchdefinition.document.SDField; import com.yahoo.config.model.deploy.TestProperties; import org.junit.Test; @@ -43,30 +41,25 @@ public class AnnotationReferenceTestCase { @Test public void noAnnotationReferenceInDocument() throws Exception { - var builder = new ApplicationBuilder(new TestProperties().setExperimentalSdParsing(true)); + var builder = new ApplicationBuilder(new TestProperties()); builder.addSchema(sd); builder.build(true); var doc = builder.getSchema().getDocument(); checkForAnnRef(doc); var complex = doc.findAnnotation("complex"); - System.err.println("annotation: "+complex); var dt = complex.getDataType(); - System.err.println("associated datatype: "+dt); assertTrue(dt instanceof StructDataType); var struct = (StructDataType)dt; var field = struct.getField("owner"); - System.err.println("owner field: "+field); assertTrue(field.getDataType() instanceof AnnotationReferenceDataType); } void checkForAnnRef(SDDocumentType doc) { for (var child : doc.getTypes()) { - System.err.println("Check child ["+child+"] of parent "+doc); checkForAnnRef(child); } for (Field field : doc.fieldSet()) { DataType fieldType = field.getDataType(); - System.err.println("datatype "+fieldType+" in field "+field+" in doc "+doc); assertFalse(fieldType instanceof AnnotationReferenceDataType); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java index 1bf07aff9d5..317b860d7d2 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/MultipleSummariesTestCase.java @@ -16,8 +16,9 @@ public class MultipleSummariesTestCase extends AbstractSchemaTestCase { @Test public void testArrayImporting() throws IOException, ParseException { - var builder = new ApplicationBuilder(new TestProperties().setExperimentalSdParsing(true)); + var builder = new ApplicationBuilder(new TestProperties()); builder.addSchemaFile("src/test/examples/multiplesummaries.sd"); builder.build(true); } + } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java index b89a2e09c76..03b504bb821 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankProfileTestCase.java @@ -393,15 +393,8 @@ public class RankProfileTestCase extends AbstractSchemaTestCase { } private void verifyApproximateNearestNeighborThresholdSettings(Double postFilterThreshold, Double approximateThreshold) throws ParseException { - verifyApproximateNearestNeighborThresholdSettings(postFilterThreshold, approximateThreshold, false); - verifyApproximateNearestNeighborThresholdSettings(postFilterThreshold, approximateThreshold, true); - } - - private void verifyApproximateNearestNeighborThresholdSettings(Double postFilterThreshold, Double approximateThreshold, - boolean experimentalSdParsing) throws ParseException { var rankProfileRegistry = new RankProfileRegistry(); var props = new TestProperties(); - props.setExperimentalSdParsing(experimentalSdParsing); var queryProfileRegistry = new QueryProfileRegistry(); var builder = new ApplicationBuilder(rankProfileRegistry, queryProfileRegistry, props); builder.addSchema(createSDWithRankProfileThresholds(postFilterThreshold, approximateThreshold)); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java index 76cb956ecdc..fd35c19906d 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/RankingExpressionInliningTestCase.java @@ -192,17 +192,12 @@ public class RankingExpressionInliningTestCase extends AbstractSchemaTestCase { @Test public void testFunctionInliningWithReplacement() throws ParseException { - checkFunctionReplacement(false); - checkFunctionReplacement(true); - } - - public void checkFunctionReplacement(boolean useXPP) throws ParseException { RankProfileRegistry rankProfileRegistry = new RankProfileRegistry(); MockDeployLogger deployLogger = new MockDeployLogger(); ApplicationBuilder builder = new ApplicationBuilder(MockApplicationPackage.createEmpty(), new MockFileRegistry(), deployLogger, - new TestProperties().setExperimentalSdParsing(useXPP), + new TestProperties(), rankProfileRegistry, new QueryProfileRegistry()); builder.addSchema( diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java index 32f82f44ad0..078eccc166f 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/StructTestCase.java @@ -2,7 +2,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.searchdefinition; -import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; import com.yahoo.searchdefinition.derived.Deriver; @@ -22,7 +21,7 @@ public class StructTestCase extends AbstractSchemaTestCase { @Test public void testStruct() throws IOException { assertConfigFile("src/test/examples/structresult.cfg", - new DocumentmanagerConfig(Deriver.getDocumentManagerConfig("src/test/examples/struct.sd")).toString() + "\n"); + new DocumentmanagerConfig(Deriver.getDocumentManagerConfig("src/test/examples/struct.sd")) + "\n"); } @Test @@ -49,21 +48,11 @@ public class StructTestCase extends AbstractSchemaTestCase { } /** - * Declaring a struct before a document will fail, no doc type to add it to. - */ - @Test(expected = IllegalArgumentException.class) - public void testStructOutsideDocumentIllegal() throws IOException, ParseException { - var builder = new ApplicationBuilder(new TestProperties().setExperimentalSdParsing(false)); - builder.addSchemaFile("src/test/examples/structoutsideofdocument.sd"); - } - - /** * Declaring a struct before a document should work */ @Test public void testStructOutsideDocumentLegal() throws IOException, ParseException { - var builder = new ApplicationBuilder(new TestProperties().setExperimentalSdParsing(true)); - builder.addSchemaFile("src/test/examples/structoutsideofdocument.sd"); + new ApplicationBuilder().addSchemaFile("src/test/examples/structoutsideofdocument.sd"); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java index 86895460dce..bfbf539074c 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/AnnotationsTestCase.java @@ -1,7 +1,6 @@ // 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.parser.ParseException; import org.junit.Test; @@ -14,81 +13,47 @@ public class AnnotationsTestCase extends AbstractExportingTestCase { @Test public void requireThatStructRegistersIfOnlyUsedByAnnotation() throws IOException, ParseException { - assertCorrectDeriving("annotationsstruct", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationsstruct", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationsstruct"); } @Test public void requireThatStructRegistersIfOnlyUsedAsArrayByAnnotation() throws IOException, ParseException { - assertCorrectDeriving("annotationsstructarray", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationsstructarray", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationsstructarray"); } @Test public void testSimpleAnnotationDeriving() throws IOException, ParseException { - assertCorrectDeriving("annotationssimple", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationssimple", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationssimple"); } @Test public void testAnnotationDerivingWithImplicitStruct() throws IOException, ParseException { - assertCorrectDeriving("annotationsimplicitstruct", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationsimplicitstruct", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationsimplicitstruct"); } @Test public void testAnnotationDerivingInheritance() throws IOException, ParseException { - assertCorrectDeriving("annotationsinheritance", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationsinheritance", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationsinheritance"); } @Test public void testAnnotationDerivingInheritance2() throws IOException, ParseException { - assertCorrectDeriving("annotationsinheritance2", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationsinheritance2", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationsinheritance2"); } @Test public void testSimpleReference() throws IOException, ParseException { - assertCorrectDeriving("annotationsreference", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationsreference", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationsreference"); } @Test public void testAdvancedReference() throws IOException, ParseException { - assertCorrectDeriving("annotationsreference2", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("annotationsreference2"); } @Test public void testAnnotationsPolymorphy() throws IOException, ParseException { - assertCorrectDeriving("annotationspolymorphy", - new TestProperties().setExperimentalSdParsing(true)); - assertCorrectDeriving("annotationspolymorphy", - new TestProperties().setExperimentalSdParsing(false)); - } - - /** - * An annotation declared before document {} won't work, no doc type to add it to. - */ - @Test(expected = IllegalArgumentException.class) - public void testAnnotationOutsideOfDocumentOld() throws IOException, ParseException { - assertCorrectDeriving("annotationsoutsideofdocument", - new TestProperties().setExperimentalSdParsing(false)); + assertCorrectDeriving("annotationspolymorphy"); } /** @@ -96,7 +61,6 @@ public class AnnotationsTestCase extends AbstractExportingTestCase { */ @Test public void testAnnotationOutsideOfDocumentNew() throws IOException, ParseException { - assertCorrectDeriving("annotationsoutsideofdocument", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("annotationsoutsideofdocument"); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java index 0695a3de922..ff68e47a1e9 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/DuplicateStructTestCase.java @@ -12,16 +12,8 @@ public class DuplicateStructTestCase extends AbstractExportingTestCase { @Test public void exact_duplicate_struct_works() throws Exception { assertCorrectDeriving("duplicate_struct", "foobar", - new TestProperties() - .setExperimentalSdParsing(false), + new TestProperties(), new TestableDeployLogger()); } - @Test - public void exact_duplicate_struct_works_new() throws Exception { - assertCorrectDeriving("duplicate_struct", "foobar", - new TestProperties() - .setExperimentalSdParsing(true), - new TestableDeployLogger()); - } } 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 412206d34ed..ac97863b7a7 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 @@ -25,7 +25,7 @@ public class ExportingTestCase extends AbstractExportingTestCase { @Test public void testPositionArray() throws IOException, ParseException { assertCorrectDeriving("position_array", - new TestProperties().setExperimentalSdParsing(true).setUseV8GeoPositions(true)); + new TestProperties().setUseV8GeoPositions(true)); } @Test @@ -49,7 +49,7 @@ public class ExportingTestCase extends AbstractExportingTestCase { @Test public void testPositionSummary() throws IOException, ParseException { assertCorrectDeriving("position_summary", - new TestProperties().setExperimentalSdParsing(true).setUseV8GeoPositions(true)); + new TestProperties().setUseV8GeoPositions(true)); } @Test @@ -115,7 +115,7 @@ public class ExportingTestCase extends AbstractExportingTestCase { @Test public void testAvoidRenamingRankingExpression() throws IOException, ParseException { assertCorrectDeriving("renamedfeatures", "foo", - new TestProperties().setExperimentalSdParsing(true).setAvoidRenamingSummaryFeatures(true), + new TestProperties().setAvoidRenamingSummaryFeatures(true), new TestableDeployLogger()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java index 5dcb9e4ca01..5eeae347c88 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ImportedFieldsTestCase.java @@ -20,14 +20,7 @@ public class ImportedFieldsTestCase extends AbstractExportingTestCase { @Test public void configs_for_imported_struct_fields_are_derived() throws IOException, ParseException { assertCorrectDeriving("imported_struct_fields", "child", - new TestProperties().setExperimentalSdParsing(false), - new TestableDeployLogger()); - } - - @Test - public void configs_for_imported_struct_fields_are_derived_new() throws IOException, ParseException { - assertCorrectDeriving("imported_struct_fields", "child", - new TestProperties().setExperimentalSdParsing(true), + new TestProperties(), new TestableDeployLogger()); } @@ -45,4 +38,5 @@ public class ImportedFieldsTestCase extends AbstractExportingTestCase { public void derives_configs_for_imported_fields_when_reference_fields_are_inherited() throws IOException, ParseException { assertCorrectDeriving("imported_fields_inherited_reference", "child_c", new TestableDeployLogger()); } + } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java index 851a9e616cd..9f691be2956 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java @@ -72,8 +72,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase { List<String> files = Arrays.asList("grandparent.sd", "mother.sd", "father.sd", "child.sd"); File outDir = tmpDir.newFolder("out"); for (int startIdx = 0; startIdx < files.size(); ++startIdx) { - var builder = new ApplicationBuilder - (new TestProperties().setExperimentalSdParsing(true)); + var builder = new ApplicationBuilder(new TestProperties()); for (int fileIdx = startIdx; fileIdx < startIdx + files.size(); ++fileIdx) { String fileName = files.get(fileIdx % files.size()); builder.addSchemaFile(dir + fileName); @@ -181,8 +180,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase { public void testInheritStructDiamondNew() throws IOException, ParseException { String dir = "src/test/derived/declstruct/"; List<String> files = Arrays.asList("common.sd", "foo.sd", "bar.sd", "foobar.sd"); - var builder = new ApplicationBuilder - (new TestProperties().setExperimentalSdParsing(true)); + var builder = new ApplicationBuilder(new TestProperties()); for (String fileName : files) { builder.addSchemaFile(dir + fileName); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java index 95e63b90e62..259a7ab8804 100755 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MatchSettingsResolvingTestCase.java @@ -14,75 +14,49 @@ public class MatchSettingsResolvingTestCase extends AbstractExportingTestCase { @Test public void testSimpleDefaults() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_simple_def", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_simple_def", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_simple_def", new TestProperties()); } @Test public void testSimpleWithStructSettings() throws IOException, ParseException { assertCorrectDeriving("matchsettings_simple_wss", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_simple_wss", - new TestProperties().setExperimentalSdParsing(true)); + new TestProperties()); } @Test public void testSimpleWithFieldSettings() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_simple_wfs", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_simple_wfs", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_simple_wfs", new TestProperties()); } @Test public void testSimpleStructAndFieldSettings() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_simple_wss_wfs", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_simple_wss_wfs", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_simple_wss_wfs", new TestProperties()); } @Test public void testMapDefaults() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_map_def", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_map_def", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_map_def", new TestProperties()); } @Test public void testMapWithStructSettings() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_map_wss", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_map_wss", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_map_wss", new TestProperties()); } @Test public void testMapWithFieldSettings() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_map_wfs", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_map_wfs", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_map_wfs", new TestProperties()); } @Test public void testMapAfter() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_map_after", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_map_after", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_map_after", new TestProperties()); } @Test public void testMapInStruct() throws IOException, ParseException { - assertCorrectDeriving("matchsettings_map_in_struct", - new TestProperties().setExperimentalSdParsing(false)); - assertCorrectDeriving("matchsettings_map_in_struct", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("matchsettings_map_in_struct", new TestProperties()); } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java index fd7cdb9c95c..4afbb4c5436 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultiStructTestCase.java @@ -17,7 +17,7 @@ public class MultiStructTestCase extends AbstractExportingTestCase { @Test public void testDocTypeConfigs() throws Exception { var logger = new TestableDeployLogger(); - var props = new TestProperties().setExperimentalSdParsing(false); + var props = new TestProperties(); ApplicationBuilder builder = ApplicationBuilder.createFromDirectory ("src/test/derived/multi_struct/", new MockFileRegistry(), logger, props); derive("multi_struct", builder, builder.getSchema("shop")); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java index b13e88f5f1f..245049fd4bc 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/MultipleSummariesTestCase.java @@ -13,15 +13,10 @@ import java.io.IOException; * @author bratseth */ public class MultipleSummariesTestCase extends AbstractExportingTestCase { - @Test - public void testMultipleSummaries() throws IOException, ParseException { - assertCorrectDeriving("multiplesummaries", - new TestProperties().setExperimentalSdParsing(false)); - } @Test public void testMultipleSummariesNew() throws IOException, ParseException { - assertCorrectDeriving("multiplesummaries", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("multiplesummaries", new TestProperties()); } + } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java index 15cf553f80e..c8df63e1028 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/NameCollisionTestCase.java @@ -20,14 +20,9 @@ public class NameCollisionTestCase extends AbstractExportingTestCase { @Test public void testNameCollision() throws Exception { assertCorrectDeriving("namecollision", "collisionstruct", - new TestProperties().setExperimentalSdParsing(false), + new TestProperties(), new TestableDeployLogger()); - var docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg"); - - assertCorrectDeriving("namecollision", "collisionstruct", - new TestProperties().setExperimentalSdParsing(true), - new TestableDeployLogger()); - docman = DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg"); + DocumentTypeManager.fromFile("temp/namecollision/documentmanager.cfg"); } } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java index 480b72d78d6..dbbe1497ffe 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/ReferenceFromSeveralTestCase.java @@ -17,7 +17,7 @@ public class ReferenceFromSeveralTestCase extends AbstractExportingTestCase { @Test public void testDocManConfigs() throws Exception { var logger = new TestableDeployLogger(); - var props = new TestProperties().setExperimentalSdParsing(false); + var props = new TestProperties(); ApplicationBuilder builder = ApplicationBuilder.createFromDirectory ("src/test/derived/reference_from_several/", new MockFileRegistry(), logger, props); derive("reference_from_several", builder, builder.getSchema("foo")); diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java index 1e4556c0de1..2516b1b0d9a 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/derived/SortingTestCase.java @@ -13,15 +13,10 @@ import java.io.IOException; * @author baldersheim */ public class SortingTestCase extends AbstractExportingTestCase { - @Test - public void testDocumentDeriving() throws IOException, ParseException { - assertCorrectDeriving("sorting", - new TestProperties().setExperimentalSdParsing(false)); - } @Test public void testDocumentDerivingNewParser() throws IOException, ParseException { - assertCorrectDeriving("sorting", - new TestProperties().setExperimentalSdParsing(true)); + assertCorrectDeriving("sorting", new TestProperties()); } + } diff --git a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java index bfd87580dbe..780e87b01f0 100644 --- a/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java +++ b/config-model/src/test/java/com/yahoo/searchdefinition/processing/ReferenceFieldTestCase.java @@ -5,7 +5,6 @@ import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.DataType; import com.yahoo.document.Field; import com.yahoo.documentmodel.NewDocumentReferenceDataType; -import com.yahoo.searchdefinition.DocumentGraphValidator; import com.yahoo.searchdefinition.Schema; import com.yahoo.searchdefinition.ApplicationBuilder; import com.yahoo.searchdefinition.document.SDDocumentType; @@ -31,17 +30,17 @@ public class ReferenceFieldTestCase { public void reference_fields_are_parsed_from_search_definition() throws ParseException { ApplicationBuilder builder = new ApplicationBuilder(); String campaignSdContent = - "search campaign {\n" + + "schema campaign {\n" + " document campaign {\n" + " }\n" + "}"; String salespersonSdContent = - "search salesperson {\n" + + "schema salesperson {\n" + " document salesperson {\n" + " }\n" + "}"; String adSdContent = - "search ad {\n" + + "schema ad {\n" + " document ad {\n" + " field campaign_ref type reference<campaign> { indexing: attribute }\n" + " field salesperson_ref type reference<salesperson> { indexing: attribute }\n" + @@ -58,37 +57,15 @@ public class ReferenceFieldTestCase { @Test public void cyclic_document_dependencies_are_detected() throws ParseException { - var builder = new ApplicationBuilder(new TestProperties().setExperimentalSdParsing(false)); + var builder = new ApplicationBuilder(new TestProperties()); String campaignSdContent = - "search campaign {\n" + + "schema campaign {\n" + " document campaign {\n" + " field ad_ref type reference<ad> { indexing: attribute }\n" + " }\n" + "}"; String adSdContent = - "search ad {\n" + - " document ad {\n" + - " field campaign_ref type reference<campaign> { indexing: attribute }\n" + - " }\n" + - "}"; - builder.addSchema(campaignSdContent); - builder.addSchema(adSdContent); - exceptionRule.expect(DocumentGraphValidator.DocumentGraphException.class); - exceptionRule.expectMessage("Document dependency cycle detected: campaign->ad->campaign."); - builder.build(true); - } - - @Test - public void cyclic_document_dependencies_are_detected_new_parser() throws ParseException { - var builder = new ApplicationBuilder(new TestProperties().setExperimentalSdParsing(true)); - String campaignSdContent = - "search campaign {\n" + - " document campaign {\n" + - " field ad_ref type reference<ad> { indexing: attribute }\n" + - " }\n" + - "}"; - String adSdContent = - "search ad {\n" + + "schema ad {\n" + " document ad {\n" + " field campaign_ref type reference<campaign> { indexing: attribute }\n" + " }\n" + |