summaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-09-10 09:27:22 +0200
committerJon Bratseth <bratseth@oath.com>2018-09-10 09:27:22 +0200
commit80476877f811f0a90cc1e692d56b5fbd11fbe76c (patch)
tree8b6451c43e3d90bc0ddf9fbcf268dcbd6d1c2a05 /config-model
parent48f9a4071b5f6f75114cd1b94eb09bec36f77061 (diff)
Use fileAcquirer
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/ModelEvaluationTest.java11
1 files changed, 9 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 96886941fe1..ad2f62b7dc3 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
@@ -4,7 +4,10 @@ package com.yahoo.config.model;
import ai.vespa.models.evaluation.Model;
import ai.vespa.models.evaluation.ModelsEvaluator;
import ai.vespa.models.evaluation.RankProfilesConfigImporter;
+import com.yahoo.config.FileReference;
import com.yahoo.config.application.api.ApplicationPackage;
+import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
+import com.yahoo.filedistribution.fileacquirer.MockFileAcquirer;
import com.yahoo.io.IOUtils;
import com.yahoo.path.Path;
import com.yahoo.tensor.Tensor;
@@ -77,7 +80,7 @@ public class ModelEvaluationTest {
assertTrue(modelNames.contains("mnist_softmax"));
assertTrue(modelNames.contains("mnist_softmax_saved"));
- ModelsEvaluator evaluator = new ModelsEvaluator(new ToleratingMissingConstantFilesRankProfilesConfigImporter()
+ ModelsEvaluator evaluator = new ModelsEvaluator(new ToleratingMissingConstantFilesRankProfilesConfigImporter(MockFileAcquirer.returnFile(null))
.importFrom(config, constantsConfig));
assertEquals(4, evaluator.models().size());
@@ -114,7 +117,11 @@ public class ModelEvaluationTest {
// We don't have function file distribution so just return empty tensor constants
private static class ToleratingMissingConstantFilesRankProfilesConfigImporter extends RankProfilesConfigImporter {
- protected Tensor readTensorFromFile(String name, TensorType type, String fileReference) {
+ public ToleratingMissingConstantFilesRankProfilesConfigImporter(FileAcquirer fileAcquirer) {
+ super(fileAcquirer);
+ }
+
+ protected Tensor readTensorFromFile(String name, TensorType type, FileReference fileReference) {
return Tensor.from(type, "{}");
}