summaryrefslogtreecommitdiffstats
path: root/vespalib/src
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2016-09-14 08:30:21 +0200
committerArne H Juul <arnej@yahoo-inc.com>2016-09-14 08:30:21 +0200
commit5d47b422163151754d587a2e91a19973f5bcef13 (patch)
tree318b18b2f6f393390cc52c6d374253c8df4d46a7 /vespalib/src
parent4c6aa1d90a7564ba4cf06394a7dbf840243156d4 (diff)
rename some helper functions
Diffstat (limited to 'vespalib/src')
-rw-r--r--vespalib/src/tests/eval/value_cache/tensor_loader_test.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/vespalib/src/tests/eval/value_cache/tensor_loader_test.cpp b/vespalib/src/tests/eval/value_cache/tensor_loader_test.cpp
index d9b1b577af2..8725eab597b 100644
--- a/vespalib/src/tests/eval/value_cache/tensor_loader_test.cpp
+++ b/vespalib/src/tests/eval/value_cache/tensor_loader_test.cpp
@@ -6,12 +6,12 @@
using namespace vespalib::eval;
-std::unique_ptr<Tensor> make_empty_tensor() {
+std::unique_ptr<Tensor> dense_tensor_nocells() {
return SimpleTensorEngine::ref()
.create(TensorSpec("tensor(x[2],y[2])"));
}
-std::unique_ptr<Tensor> make_double_tensor() {
+std::unique_ptr<Tensor> make_nodim_tensor() {
return SimpleTensorEngine::ref()
.create(TensorSpec("double"));
}
@@ -47,15 +47,15 @@ void verify_tensor(std::unique_ptr<Tensor> expect, ConstantValue::UP actual) {
}
TEST_F("require that invalid types loads an empty double", ConstantTensorLoader(SimpleTensorEngine::ref())) {
- TEST_DO(verify_tensor(make_double_tensor(), f1.create(TEST_PATH("dense.json"), "invalid type spec")));
+ TEST_DO(verify_tensor(make_nodim_tensor(), f1.create(TEST_PATH("dense.json"), "invalid type spec")));
}
TEST_F("require that invalid file name loads an empty tensor", ConstantTensorLoader(SimpleTensorEngine::ref())) {
- TEST_DO(verify_tensor(make_empty_tensor(), f1.create(TEST_PATH("missing_file.json"), "tensor(x[2],y[2])")));
+ TEST_DO(verify_tensor(dense_tensor_nocells(), f1.create(TEST_PATH("missing_file.json"), "tensor(x[2],y[2])")));
}
TEST_F("require that invalid json loads an empty tensor", ConstantTensorLoader(SimpleTensorEngine::ref())) {
- TEST_DO(verify_tensor(make_empty_tensor(), f1.create(TEST_PATH("invalid.json"), "tensor(x[2],y[2])")));
+ TEST_DO(verify_tensor(dense_tensor_nocells(), f1.create(TEST_PATH("invalid.json"), "tensor(x[2],y[2])")));
}
TEST_F("require that dense tensors can be loaded", ConstantTensorLoader(SimpleTensorEngine::ref())) {