Read and resolve constants in model evaluation

1 files changed, 8 insertions, 2 deletions

diff --git a/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java b/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
index 32a1d9b53ed..57d16f24f03 100644
--- a/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java
@@ -6,6 +6,7 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
+import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import com.yahoo.vespa.model.VespaModel;
 import com.yahoo.vespa.model.container.ContainerCluster;
 import org.junit.After;
@@ -56,17 +57,22 @@ public class ModelEvaluationTest {
 
     private void assertHasMlModels(VespaModel model) {
         ContainerCluster cluster = model.getContainerClusters().get("container");
+
         RankProfilesConfig.Builder b = new RankProfilesConfig.Builder();
         cluster.getConfig(b);
         RankProfilesConfig config = new RankProfilesConfig(b);
-        System.out.println(config);
+
+        RankingConstantsConfig.Builder cb = new RankingConstantsConfig.Builder();
+        cluster.getConfig(cb);
+        RankingConstantsConfig constantsConfig = new RankingConstantsConfig(cb);
+
         assertEquals(4, config.rankprofile().size());
         Set<String> modelNames = config.rankprofile().stream().map(v -> v.name()).collect(Collectors.toSet());
         assertTrue(modelNames.contains("xgboost_2_2"));
         assertTrue(modelNames.contains("mnist_softmax"));
         assertTrue(modelNames.contains("mnist_softmax_saved"));
 
-        ModelsEvaluator evaluator = new ModelsEvaluator(config);
+        ModelsEvaluator evaluator = new ModelsEvaluator(config, constantsConfig);
 
         assertEquals(4, evaluator.models().size());
         Model xgboost = evaluator.models().get("xgboost_2_2");