aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-01-25 09:50:28 +0100
committerJon Bratseth <bratseth@gmail.com>2022-01-25 09:50:28 +0100
commitb7a8165a120311fdafe2f09a1cd39d8621c8891b (patch)
tree56b823acbea42edd5d2650b2aff4cbd04971040f /config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java
parent46be850bd8ecd8b38b4d54fa5f4bbeeef0997a2a (diff)
Simplify
Diffstat (limited to 'config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java')
-rw-r--r--config-model/src/test/java/com/yahoo/searchdefinition/derived/InheritanceTestCase.java24
1 files changed, 12 insertions, 12 deletions
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 13de3f95fa5..fcc2d116690 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
@@ -42,8 +42,8 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
public void requireThatIndexedStructFieldCanBeInherited() throws IOException, ParseException {
String dir = "src/test/derived/inheritstruct/";
ApplicationBuilder builder = new ApplicationBuilder();
- builder.addSchemaFile(dir + "parent.sd");
- builder.addSchemaFile(dir + "child.sd");
+ builder.add(dir + "parent.sd");
+ builder.add(dir + "child.sd");
builder.build();
derive("inheritstruct", builder, builder.getSchema("child"));
assertCorrectConfigFiles("inheritstruct");
@@ -67,7 +67,7 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
ApplicationBuilder builder = new ApplicationBuilder();
for (int fileIdx = startIdx; fileIdx < startIdx + files.size(); ++fileIdx) {
String fileName = files.get(fileIdx % files.size());
- builder.addSchemaFile(dir + fileName);
+ builder.add(dir + fileName);
}
builder.build();
DocumentmanagerConfig.Builder b = new DocumentmanagerConfig.Builder();
@@ -112,8 +112,8 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
public void requireThatStructTypesAreInheritedFromParent() throws IOException, ParseException {
String dir = "src/test/derived/inheritfromparent/";
ApplicationBuilder builder = new ApplicationBuilder();
- builder.addSchemaFile(dir + "parent.sd");
- builder.addSchemaFile(dir + "child.sd");
+ builder.add(dir + "parent.sd");
+ builder.add(dir + "child.sd");
builder.build();
derive("inheritfromparent", builder, builder.getSchema("child"));
assertCorrectConfigFiles("inheritfromparent");
@@ -123,9 +123,9 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
public void requireThatStructTypesAreInheritedFromGrandParent() throws IOException, ParseException {
String dir = "src/test/derived/inheritfromgrandparent/";
ApplicationBuilder builder = new ApplicationBuilder();
- builder.addSchemaFile(dir + "grandparent.sd");
- builder.addSchemaFile(dir + "parent.sd");
- builder.addSchemaFile(dir + "child.sd");
+ builder.add(dir + "grandparent.sd");
+ builder.add(dir + "parent.sd");
+ builder.add(dir + "child.sd");
builder.build();
derive("inheritfromgrandparent", builder, builder.getSchema("child"));
assertCorrectConfigFiles("inheritfromgrandparent");
@@ -135,10 +135,10 @@ public class InheritanceTestCase extends AbstractExportingTestCase {
public void testInheritance() throws IOException, ParseException {
String dir = "src/test/derived/inheritance/";
ApplicationBuilder builder = new ApplicationBuilder();
- builder.addSchemaFile(dir + "grandparent.sd");
- builder.addSchemaFile(dir + "father.sd");
- builder.addSchemaFile(dir + "mother.sd");
- builder.addSchemaFile(dir + "child.sd");
+ builder.add(dir + "grandparent.sd");
+ builder.add(dir + "father.sd");
+ builder.add(dir + "mother.sd");
+ builder.add(dir + "child.sd");
builder.build();
derive("inheritance", builder, builder.getSchema("child"));
assertCorrectConfigFiles("inheritance");