1 files changed, 13 insertions, 9 deletions
diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java
index 60cf0d25ded..d94e5b2af1b 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelsEvaluatorTest.java
@@ -3,8 +3,10 @@ package ai.vespa.models.evaluation;
 
 import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.config.subscription.FileSource;
+import com.yahoo.path.Path;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
+import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import org.junit.Test;
 
 import java.io.File;
@@ -18,15 +20,9 @@ public class ModelsEvaluatorTest {
 
     private static final double delta = 0.00000000001;
 
-    private ModelsEvaluator createModels() {
-        String configPath = "src/test/resources/config/rankexpression/rank-profiles.cfg";
-        RankProfilesConfig config = new ConfigGetter<>(new FileSource(new File(configPath)), RankProfilesConfig.class).getConfig("");
-        return new ModelsEvaluator(config);
-    }
-
     @Test
     public void testTensorEvaluation() {
-        ModelsEvaluator models = createModels();
+        ModelsEvaluator models = createModels("src/test/resources/config/rankexpression/");
         FunctionEvaluator function = models.evaluatorOf("macros", "fourtimessum");
         function.bind("var1", Tensor.from("{{x:0}:3,{x:1}:5}"));
         function.bind("var2", Tensor.from("{{x:0}:7,{x:1}:11}"));
@@ -35,7 +31,7 @@ public class ModelsEvaluatorTest {
 
     @Test
     public void testEvaluationDependingOnMacroTakingArguments() {
-        ModelsEvaluator models = createModels();
+        ModelsEvaluator models = createModels("src/test/resources/config/rankexpression/");
         FunctionEvaluator function = models.evaluatorOf("macros", "secondphase");
         function.bind("match", 3);
         function.bind("rankBoost", 5);
@@ -46,6 +42,14 @@ public class ModelsEvaluatorTest {
     // TODO: Test that binding nonexisting variable doesn't work
     // TODO: Test that rebinding doesn't work
     // TODO: Test with nested macros
-    // TODO: Test TF/ONNX model
+
+    private ModelsEvaluator createModels(String path) {
+        Path configDir = Path.fromString(path);
+        RankProfilesConfig config = new ConfigGetter<>(new FileSource(configDir.append("rank-profiles.cfg").toFile()),
+                                                       RankProfilesConfig.class).getConfig("");
+        RankingConstantsConfig constantsConfig = new ConfigGetter<>(new FileSource(configDir.append("ranking-constants.cfg").toFile()),
+                                                                    RankingConstantsConfig.class).getConfig("");
+        return new ModelsEvaluator(config, constantsConfig);
+    }
 
 }