Revert "Revert "Pass DeployState""

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 8548e50d4bc..992d770d851 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,6 +4,7 @@ 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;
@@ -49,12 +50,11 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase {
                                         ApplicationBuilder builder,
                                         DeployLogger logger) throws IOException {
         DerivedConfiguration config = new DerivedConfiguration(builder.getSchema(schemaName),
-                                                               logger,
-                                                               properties,
-                                                               builder.getRankProfileRegistry(),
-                                                               builder.getQueryProfileRegistry(),
-                                                               new ImportedMlModels(),
-                                                               new InThreadExecutorService());
+                                                               new DeployState.Builder().properties(properties)
+                                                                                        .deployLogger(logger)
+                                                                                        .rankProfileRegistry(builder.getRankProfileRegistry())
+                                                                                        .queryProfiles(builder.getQueryProfileRegistry())
+                                                                                        .build());
         return export(dirName, builder, config);
     }
 
@@ -108,10 +108,10 @@ public abstract class AbstractExportingTestCase extends AbstractSchemaTestCase {
     }
 
     protected DerivedConfiguration assertCorrectDeriving(String dirName,
-                                                         String searchDefinitionName,
+                                                         String schemaName,
                                                          TestProperties properties,
                                                          DeployLogger logger) throws IOException, ParseException {
-        DerivedConfiguration derived = derive(dirName, searchDefinitionName, properties, logger);
+        DerivedConfiguration derived = derive(dirName, schemaName, properties, logger);
         assertCorrectConfigFiles(dirName);
         return derived;
     }