Revert "Merge pull request #6859 from vespa-engine/revert-6855-bratseth/test-with-constants"

This reverts commit 68708408abd1d47bb8f5e5a1d80855739b717c2f, reversing
changes made to 56591420e8cb8c6a9085d7327b977c3c5b1971b1.

4 files changed, 20 insertions, 25 deletions

diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java
index a823f16d727..716965784e3 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/MlModelsImportingTest.java
@@ -1,25 +1,11 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 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.searchlib.rankingexpression.ExpressionFunction;
-import com.yahoo.tensor.Tensor;
-import com.yahoo.tensor.TensorType;
-import com.yahoo.vespa.config.search.RankProfilesConfig;
-import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import org.junit.Test;
 
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
 
 /**
  * Tests instantiating models from rank-profiles configs.
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 63e17e37bde..0a400f7126f 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
@@ -3,15 +3,19 @@ package ai.vespa.models.evaluation;
 
 import com.yahoo.config.subscription.ConfigGetter;
 import com.yahoo.config.subscription.FileSource;
+import com.yahoo.io.GrowableByteBuffer;
+import com.yahoo.io.IOUtils;
 import com.yahoo.path.Path;
 import com.yahoo.searchlib.rankingexpression.ExpressionFunction;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
+import com.yahoo.tensor.serialization.TypedBinaryFormat;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 
-import java.util.HashMap;
+import java.io.IOException;
 import java.util.Map;
+import java.util.Optional;
 import java.util.logging.Logger;
 
 import static org.junit.Assert.assertEquals;
@@ -38,7 +42,8 @@ public class ModelTester {
                                                        RankProfilesConfig.class).getConfig("");
         RankingConstantsConfig constantsConfig = new ConfigGetter<>(new FileSource(configDir.append("ranking-constants.cfg").toFile()),
                                                                     RankingConstantsConfig.class).getConfig("");
-        return new RankProfilesConfigImporterWithMockedConstants().importFrom(config, constantsConfig);
+        return new RankProfilesConfigImporterWithMockedConstants(Path.fromString(path).append("constants"))
+                       .importFrom(config, constantsConfig);
     }
 
     public void assertFunction(String name, String expression, Model model) {
@@ -61,15 +66,23 @@ public class ModelTester {
 
         private static final Logger log = Logger.getLogger(RankProfilesConfigImporterWithMockedConstants.class.getName());
 
-        Map<String, Tensor> constants = new HashMap<>();
+        private final Path constantsPath;
+
+        public RankProfilesConfigImporterWithMockedConstants(Path constantsPath) {
+            this.constantsPath = constantsPath;
+        }
 
         @Override
-        Tensor readTensorFromFile(String name, TensorType type, String fileReference) {
-            if ( ! constants.containsKey(name)) {
-                log.warning("Missing a mocked tensor constant for '" + name + "': Returning an empty tensor");
+        protected Tensor readTensorFromFile(String name, TensorType type, String fileReference) {
+            try {
+                return TypedBinaryFormat.decode(Optional.of(type),
+                                                GrowableByteBuffer.wrap(IOUtils.readFileBytes(constantsPath.append(name).toFile())));
+            }
+            catch (IOException e) {
+                log.warning("Missing a mocked tensor constant for '" + name + "': " + e.getMessage() +
+                            ". Returning an empty tensor");
                 return Tensor.from(type, "{}");
             }
-            return constants.get(name);
         }
 
     }
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 d94e5b2af1b..0708d872ff6 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
@@ -9,8 +9,6 @@ import com.yahoo.vespa.config.search.RankProfilesConfig;
 import com.yahoo.vespa.config.search.core.RankingConstantsConfig;
 import org.junit.Test;
 
-import java.io.File;
-
 import static org.junit.Assert.assertEquals;
 
 /**
diff --git a/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java b/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java
index 210ffb823b2..20abd9c0fb0 100644
--- a/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java
+++ b/model-evaluation/src/test/java/ai/vespa/models/evaluation/RankProfileImportingTest.java
@@ -3,8 +3,6 @@ package ai.vespa.models.evaluation;
 
 import org.junit.Test;
 
-import java.util.Map;
-
 import static org.junit.Assert.assertEquals;
 
 /**