simpler and more regular handling of file acquirer mocking

18 files changed, 19 insertions, 17 deletions

diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java
index ab2f53db863..3cc01ac2414 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/ModelTester.java
@@ -37,7 +37,7 @@ public class ModelTester {
         OnnxModelsConfig onnxModelsConfig = ConfigGetter.getConfig(OnnxModelsConfig.class, fileConfigId(path, "onnx-models.cfg"));
 
 
-        return new RankProfilesConfigImporterWithMockedConstants(Path.fromString(path).append("constants"), MockFileAcquirer.returnFile(null))
+        return new RankProfilesConfigImporterWithMockedConstants(Path.fromString(path), MockFileAcquirer.returnFile(null))
                        .importFrom(config, constantsConfig, expressionsConfig, onnxModelsConfig);
     }
 
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 3cd04db8edd..126d3492039 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
@@ -142,7 +142,7 @@ public class ModelsEvaluatorTest {
         RankingExpressionsConfig expressionsConfig = ConfigGetter.getConfig(RankingExpressionsConfig.class, fileConfigId("ranking-expressions.cfg"));
         OnnxModelsConfig onnxModelsConfig = ConfigGetter.getConfig(OnnxModelsConfig.class, fileConfigId("onnx-models.cfg"));
 
-        return new ModelsEvaluator(new RankProfilesConfigImporterWithMockedConstants(Path.fromString(CONFIG_DIR).append("constants"), MockFileAcquirer.returnFile(null)),
+        return new ModelsEvaluator(new RankProfilesConfigImporterWithMockedConstants(Path.fromString(CONFIG_DIR), MockFileAcquirer.returnFile(null)),
                 config, constantsConfig, expressionsConfig, onnxModelsConfig);
     }
 
diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfilesConfigImporterWithMockedConstants.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfilesConfigImporterWithMockedConstants.java
index 0dd3bd29a2c..c166128549f 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfilesConfigImporterWithMockedConstants.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfilesConfigImporterWithMockedConstants.java
@@ -32,8 +32,10 @@ public class RankProfilesConfigImporterWithMockedConstants extends RankProfilesC
     @Override
     protected Tensor readTensorFromFile(String name, TensorType type, FileReference fileReference) {
         try {
+            var path = constantsPath.append(fileReference.value());
+            var file = path.toFile();
             return TypedBinaryFormat.decode(Optional.of(type),
-                    GrowableByteBuffer.wrap(IOUtils.readFileBytes(constantsPath.append(name).toFile())));
+                                            GrowableByteBuffer.wrap(IOUtils.readFileBytes(file)));
         }
         catch (IOException e) {
             log.warning("Missing a mocked tensor constant for '" + name + "': " + e.getMessage() +
diff --git a/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java b/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java
index 14da15f60d0..8b6cad1914f 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/handler/ModelsEvaluationHandlerTest.java
@@ -349,7 +349,7 @@ public class ModelsEvaluationHandlerTest {
         RankingExpressionsConfig expressionsConfig = ConfigGetter.getConfig(RankingExpressionsConfig.class, fileConfigId("ranking-expressions.cfg"));
         OnnxModelsConfig onnxModelsConfig = ConfigGetter.getConfig(OnnxModelsConfig.class, fileConfigId("onnx-models.cfg"));
 
-        return new ModelsEvaluator(new RankProfilesConfigImporterWithMockedConstants(Path.fromString(MODELS_DIR).append("constants"), MockFileAcquirer.returnFile(null)),
+        return new ModelsEvaluator(new RankProfilesConfigImporterWithMockedConstants(Path.fromString(MODELS_DIR), MockFileAcquirer.returnFile(null)),
                 config, constantsConfig, expressionsConfig, onnxModelsConfig);
     }
 
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read.tbf
index bac75f7b1e7..bac75f7b1e7 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_bias_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read.tbf
index bd3f05be826..bd3f05be826 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden1_weights_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read.tbf
index fca7c76df3f..fca7c76df3f 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_bias_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read.tbf
index 396dea8f4bc..396dea8f4bc 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_hidden2_weights_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read.tbf
index 42f85478c10..42f85478c10 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_bias_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read.tbf
index a3cc7d765f6..a3cc7d765f6 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_saved_dnn_outputs_weights_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable.tbf
index e768328bff5..e768328bff5 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1 b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1.tbf
index 4fa0eadb0d3..4fa0eadb0d3 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_Variable_1.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read.tbf
index 4fa0eadb0d3..4fa0eadb0d3 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_1_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read.tbf
index e768328bff5..e768328bff5 100644
--- a/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read
+++ b/model-evaluation/src/test/resources/config/models/constants/mnist_softmax_saved_layer_Variable_read.tbf
diff --git a/model-evaluation/src/test/resources/config/models/ranking-constants.cfg b/model-evaluation/src/test/resources/config/models/ranking-constants.cfg
index 2b7495ace5e..335a7ec526b 100644
--- a/model-evaluation/src/test/resources/config/models/ranking-constants.cfg
+++ b/model-evaluation/src/test/resources/config/models/ranking-constants.cfg
@@ -1,30 +1,30 @@
 constant[0].name "mnist_saved_dnn_hidden1_weights_read"
-constant[0].fileref ""
+constant[0].fileref "constants/mnist_saved_dnn_hidden1_weights_read.tbf"
 constant[0].type "tensor(d3[300],d4[784])"
 constant[1].name "mnist_saved_dnn_hidden2_weights_read"
-constant[1].fileref ""
+constant[1].fileref "constants/mnist_saved_dnn_hidden2_weights_read.tbf"
 constant[1].type "tensor(d2[100],d3[300])"
 constant[2].name "mnist_softmax_saved_layer_Variable_1_read"
-constant[2].fileref ""
+constant[2].fileref "constants/mnist_softmax_saved_layer_Variable_1_read.tbf"
 constant[2].type "tensor(d1[10])"
 constant[3].name "mnist_saved_dnn_hidden1_bias_read"
-constant[3].fileref ""
+constant[3].fileref "constants/mnist_saved_dnn_hidden1_bias_read.tbf"
 constant[3].type "tensor(d3[300])"
 constant[4].name "mnist_saved_dnn_hidden2_bias_read"
-constant[4].fileref ""
+constant[4].fileref "constants/mnist_saved_dnn_hidden2_bias_read.tbf"
 constant[4].type "tensor(d2[100])"
 constant[5].name "mnist_softmax_Variable"
-constant[5].fileref ""
+constant[5].fileref "constants/mnist_softmax_Variable.tbf"
 constant[5].type "tensor(d1[10],d2[784])"
 constant[6].name "mnist_saved_dnn_outputs_weights_read"
-constant[6].fileref ""
+constant[6].fileref "constants/mnist_saved_dnn_outputs_weights_read.tbf"
 constant[6].type "tensor(d1[10],d2[100])"
 constant[7].name "mnist_softmax_saved_layer_Variable_read"
-constant[7].fileref ""
+constant[7].fileref "constants/mnist_softmax_saved_layer_Variable_read.tbf"
 constant[7].type "tensor(d1[10],d2[784])"
 constant[8].name "mnist_softmax_Variable_1"
-constant[8].fileref ""
+constant[8].fileref "constants/mnist_softmax_Variable_1.tbf"
 constant[8].type "tensor(d1[10])"
 constant[9].name "mnist_saved_dnn_outputs_bias_read"
-constant[9].fileref ""
-constant[9].type "tensor(d1[10])"
\ No newline at end of file
+constant[9].fileref "constants/mnist_saved_dnn_outputs_bias_read.tbf"
+constant[9].type "tensor(d1[10])"
diff --git a/model-evaluation/src/test/resources/config/rankexpression/constants/overflow.firstphase.expr b/model-evaluation/src/test/resources/config/rankexpression/expressions/overflow.firstphase.expr
index 70a3a2eb6cc..70a3a2eb6cc 100644
--- a/model-evaluation/src/test/resources/config/rankexpression/constants/overflow.firstphase.expr
+++ b/model-evaluation/src/test/resources/config/rankexpression/expressions/overflow.firstphase.expr
diff --git a/model-evaluation/src/test/resources/config/rankexpression/constants/overflow.firstphase.expr.lz4 b/model-evaluation/src/test/resources/config/rankexpression/expressions/overflow.firstphase.expr.lz4
index 30f23b963db..30f23b963db 100644
--- a/model-evaluation/src/test/resources/config/rankexpression/constants/overflow.firstphase.expr.lz4
+++ b/model-evaluation/src/test/resources/config/rankexpression/expressions/overflow.firstphase.expr.lz4
diff --git a/model-evaluation/src/test/resources/config/rankexpression/ranking-expressions.cfg b/model-evaluation/src/test/resources/config/rankexpression/ranking-expressions.cfg
index 8cb02567538..e8fde6fafb2 100644
--- a/model-evaluation/src/test/resources/config/rankexpression/ranking-expressions.cfg
+++ b/model-evaluation/src/test/resources/config/rankexpression/ranking-expressions.cfg
@@ -1,4 +1,4 @@
 expression[0].name "overflow.firstphase"
-expression[0].fileref "overflow.firstphase.expr"
+expression[0].fileref "expressions/overflow.firstphase.expr"
 expression[1].name "overflow.secondphase"
-expression[1].fileref "overflow.firstphase.expr.lz4"
+expression[1].fileref "expressions/overflow.firstphase.expr.lz4"