diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-13 15:55:47 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-13 15:55:47 +0100 |
commit | a1147a0643d2292fe00e825500becb4125d04053 (patch) | |
tree | 3fce92d09429ac40364cfec10e458adbde391e0f /config-model/src/test | |
parent | 127c4ec83e3b44b3596e58a571c2fc77a8bbcfde (diff) |
searchdefinitions -> schemas
Diffstat (limited to 'config-model/src/test')
-rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java | 8 | ||||
-rw-r--r-- | config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java index ffb2baa04ab..e0567480422 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationDeployTest.java @@ -20,7 +20,7 @@ import com.yahoo.searchdefinition.DocumentOnlySearch; import com.yahoo.vespa.config.ConfigDefinition; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.model.VespaModel; -import com.yahoo.vespa.model.search.Schemas; +import com.yahoo.vespa.model.search.NamedSchema; import org.junit.After; import org.junit.Rule; import org.junit.Test; @@ -59,9 +59,9 @@ public class ApplicationDeployTest { public void testVespaModel() throws SAXException, IOException { ApplicationPackageTester tester = ApplicationPackageTester.create(TESTDIR + "app1"); VespaModel model = new VespaModel(tester.app()); - List<Schemas> searchDefinitions = tester.getSearchDefinitions(); + List<NamedSchema> searchDefinitions = tester.getSearchDefinitions(); assertEquals(searchDefinitions.size(), 5); - for (Schemas searchDefinition : searchDefinitions) { + for (NamedSchema searchDefinition : searchDefinitions) { Search s = searchDefinition.getSearch(); switch (s.getName()) { case "music": @@ -99,7 +99,7 @@ public class ApplicationDeployTest { // Check that getFilename works ArrayList<String> sdFileNames = new ArrayList<>(); - for (Schemas sd : searchDefinitions) + for (NamedSchema sd : searchDefinitions) sdFileNames.add(sd.getFilename()); Collections.sort(sdFileNames); assertEquals("laptop.sd", sdFileNames.get(0)); diff --git a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java index 56c27e4c331..35888d39223 100644 --- a/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java +++ b/config-model/src/test/java/com/yahoo/config/model/ApplicationPackageTester.java @@ -5,7 +5,7 @@ import com.yahoo.component.Version; import com.yahoo.config.model.application.provider.ApplicationPackageXmlFilesValidator; import com.yahoo.config.model.application.provider.FilesApplicationPackage; import com.yahoo.config.model.deploy.DeployState; -import com.yahoo.vespa.model.search.Schemas; +import com.yahoo.vespa.model.search.NamedSchema; import java.io.File; import java.io.IOException; @@ -39,8 +39,8 @@ public class ApplicationPackageTester { public FilesApplicationPackage app() { return applicationPackage; } - public List<Schemas> getSearchDefinitions() { - return new DeployState.Builder().applicationPackage(app()).build().getSearchDefinitions(); + public List<NamedSchema> getSearchDefinitions() { + return new DeployState.Builder().applicationPackage(app()).build().getSchemas(); } public static ApplicationPackageTester create(String applicationPackageDir) { |