use GenSpec in tensor_lambda_test

1 files changed, 10 insertions, 8 deletions

diff --git a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
index 23bd16cb721..18198a75f7d 100644
--- a/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
+++ b/eval/src/tests/eval/tensor_lambda/tensor_lambda_test.cpp
@@ -8,7 +8,7 @@
 #include <vespa/eval/instruction/dense_cell_range_function.h>
 #include <vespa/eval/instruction/dense_lambda_peek_function.h>
 #include <vespa/eval/instruction/fast_rename_optimizer.h>
-#include <vespa/eval/eval/test/tensor_model.hpp>
+#include <vespa/eval/eval/test/gen_spec.h>
 #include <vespa/eval/eval/test/eval_fixture.h>
 #include <vespa/eval/eval/tensor_nodes.h>
 
@@ -23,17 +23,19 @@ using namespace vespalib::eval::tensor_function;
 const ValueBuilderFactory &simple_factory = SimpleValueBuilderFactory::get();
 const ValueBuilderFactory &prod_factory = FastValueBuilderFactory::get();
 
+TensorSpec spec(double v) { return TensorSpec("double").add({}, v); }
+
 EvalFixture::ParamRepo make_params() {
     return EvalFixture::ParamRepo()
         .add("a", spec(1))
         .add("b", spec(2))
-        .add("x3", spec({x(3)}, N()))
-        .add("x3f", spec(float_cells({x(3)}), N()))
-        .add("x3m", spec({x({"0", "1", "2"})}, N()))
-        .add("x3y5", spec({x(3), y(5)}, N()))
-        .add("x3y5f", spec(float_cells({x(3), y(5)}), N()))
-        .add("x15", spec({x(15)}, N()))
-        .add("x15f", spec(float_cells({x(15)}), N()));
+        .add("x3", GenSpec().idx("x", 3).gen())
+        .add("x3f", GenSpec().idx("x", 3).cells_float().gen())
+        .add("x3m", GenSpec().map("x", 3).gen())
+        .add("x3y5", GenSpec().idx("x", 3).idx("y", 5).gen())
+        .add("x3y5f", GenSpec().idx("x", 3).idx("y", 5).cells_float().gen())
+        .add("x15", GenSpec().idx("x", 15).gen())
+        .add("x15f", GenSpec().idx("x", 15).cells_float().gen());
 }
 EvalFixture::ParamRepo param_repo = make_params();