diff options
author | Harald Musum <musum@verizonmedia.com> | 2022-05-11 23:52:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-11 23:52:58 +0200 |
commit | 5097fe4d8a1e526dfebcddcca7f5c9bc02377119 (patch) | |
tree | ed0ef6db7f9b348da7279dfb93234f19ec6d73e5 /config-model/src/test/java | |
parent | f055594f402631c216241a123144bbe171c61e4b (diff) | |
parent | cd75d7bd21d5e5d084c17d2831c43a14dbff8efa (diff) |
Merge pull request #22555 from vespa-engine/revert-22550-bratseth/deploy-state
Revert "Pass DeployState"
Diffstat (limited to 'config-model/src/test/java')
-rw-r--r-- | config-model/src/test/java/com/yahoo/searchdefinition/derived/AbstractExportingTestCase.java | 16 |
1 files changed, 8 insertions, 8 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 992d770d851..8548e50d4bc 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 @@ -4,7 +4,6 @@ package com.yahoo.searchdefinition.derived; import com.yahoo.concurrent.InThreadExecutorService; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.model.application.provider.MockFileRegistry; -import com.yahoo.config.model.deploy.DeployState; import com.yahoo.config.model.deploy.TestProperties; import com.yahoo.document.config.DocumenttypesConfig; import com.yahoo.document.config.DocumentmanagerConfig; @@ -50,11 +49,12 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase { ApplicationBuilder builder, DeployLogger logger) throws IOException { DerivedConfiguration config = new DerivedConfiguration(builder.getSchema(schemaName), - new DeployState.Builder().properties(properties) - .deployLogger(logger) - .rankProfileRegistry(builder.getRankProfileRegistry()) - .queryProfiles(builder.getQueryProfileRegistry()) - .build()); + logger, + properties, + builder.getRankProfileRegistry(), + builder.getQueryProfileRegistry(), + new ImportedMlModels(), + new InThreadExecutorService()); return export(dirName, builder, config); } @@ -108,10 +108,10 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase { } protected DerivedConfiguration assertCorrectDeriving(String dirName, - String schemaName, + String searchDefinitionName, TestProperties properties, DeployLogger logger) throws IOException, ParseException { - DerivedConfiguration derived = derive(dirName, schemaName, properties, logger); + DerivedConfiguration derived = derive(dirName, searchDefinitionName, properties, logger); assertCorrectConfigFiles(dirName); return derived; } |