1 files changed, 4 insertions, 12 deletions
diff --git a/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp b/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp
index 5d017fdcd5c..5ac1c503b5d 100644
--- a/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp
+++ b/eval/src/tests/tensor/tensor_add_operation/tensor_add_operation_test.cpp
@@ -3,27 +3,19 @@
 #include <vespa/eval/eval/tensor_spec.h>
 #include <vespa/eval/tensor/default_tensor_engine.h>
 #include <vespa/eval/tensor/sparse/sparse_tensor.h>
+#include <vespa/eval/tensor/test/test_utils.h>
 #include <vespa/vespalib/testkit/test_kit.h>
 
 using vespalib::eval::Value;
 using vespalib::eval::TensorSpec;
+using vespalib::tensor::test::makeTensor;
 using namespace vespalib::tensor;
 
-std::unique_ptr<Tensor>
-makeTensor(const TensorSpec &spec)
-{
-    auto value = DefaultTensorEngine::ref().from_spec(spec);
-    const auto *tensor = dynamic_cast<const Tensor *>(value->as_tensor());
-    ASSERT_TRUE(tensor);
-    value.release();
-    return std::unique_ptr<Tensor>(const_cast<Tensor *>(tensor));
-}
-
 void
 assertAdd(const TensorSpec &source, const TensorSpec &arg, const TensorSpec &expected)
 {
-    auto sourceTensor = makeTensor(source);
-    auto argTensor = makeTensor(arg);
+    auto sourceTensor = makeTensor<Tensor>(source);
+    auto argTensor = makeTensor<Tensor>(arg);
     auto resultTensor = sourceTensor->add(*argTensor);
     auto actual = resultTensor->toSpec();
     EXPECT_EQUAL(actual, expected);