split tests

1 files changed, 27 insertions, 21 deletions

diff --git a/eval/src/tests/eval/fast_value/fast_value_test.cpp b/eval/src/tests/eval/fast_value/fast_value_test.cpp
index 7b06f02a569..03658d8351b 100644
--- a/eval/src/tests/eval/fast_value/fast_value_test.cpp
+++ b/eval/src/tests/eval/fast_value/fast_value_test.cpp
@@ -60,7 +60,7 @@ TEST(FastCellsTest, add_cells_works) {
 
 using SA = std::vector<vespalib::stringref>;
 
-TEST(FastValueTest, add_subspace_robustness) {
+TEST(FastValueBuilderTest, dense_add_subspace_robustness) {
     auto factory = FastValueBuilderFactory::get();
     ValueType type = ValueType::from_spec("tensor(x[2])");
     auto builder = factory.create_value_builder<double>(type);
@@ -75,39 +75,45 @@ TEST(FastValueTest, add_subspace_robustness) {
                     add({{"x", 0}}, 17.0).
                     add({{"x", 1}}, 42.0);
     EXPECT_EQ(actual, expected);    
+}
 
-    type = ValueType::from_spec("tensor(x{})");
-    builder = factory.create_value_builder<double>(type);
-    subspace = builder->add_subspace(SA{"foo"});
+TEST(FastValueBuilderTest, sparse_add_subspace_robustness) {
+    auto factory = FastValueBuilderFactory::get();
+    ValueType type = ValueType::from_spec("tensor(x{})");
+    auto builder = factory.create_value_builder<double>(type);
+    auto subspace = builder->add_subspace(SA{"foo"});
     subspace[0] = 17.0;
     subspace = builder->add_subspace(SA{"bar"});
     subspace[0] = 18.0;
-    other = builder->add_subspace(SA{"foo"});
+    auto other = builder->add_subspace(SA{"foo"});
     other[0] = 42.0;
-    value = builder->build(std::move(builder));
-    actual = spec_from_value(*value);
-    expected = TensorSpec("tensor(x{})").
-               add({{"x", "bar"}}, 18.0).
-               add({{"x", "foo"}}, 42.0);
+    auto value = builder->build(std::move(builder));
+    auto actual = spec_from_value(*value);
+    auto expected = TensorSpec("tensor(x{})").
+                    add({{"x", "bar"}}, 18.0).
+                    add({{"x", "foo"}}, 42.0);
     EXPECT_EQ(actual, expected);    
+}
 
-    type = ValueType::from_spec("tensor(x{},y[2])");
-    builder = factory.create_value_builder<double>(type);
-    subspace = builder->add_subspace(SA{"foo"});
+TEST(FastValueBuilderTest, mixed_add_subspace_robustness) {
+    auto factory = FastValueBuilderFactory::get();
+    ValueType type = ValueType::from_spec("tensor(x{},y[2])");
+    auto builder = factory.create_value_builder<double>(type);
+    auto subspace = builder->add_subspace(SA{"foo"});
     subspace[0] = 17.0;
     subspace[1] = 666;
     subspace = builder->add_subspace(SA{"bar"});
     subspace[0] = 18.0;
     subspace[1] = 19.0;
-    other = builder->add_subspace(SA{"foo"});
+    auto other = builder->add_subspace(SA{"foo"});
     other[1] = 42.0;
-    value = builder->build(std::move(builder));
-    actual = spec_from_value(*value);
-    expected = TensorSpec("tensor(x{},y[2])").
-               add({{"x", "foo"}, {"y", 0}}, 17.0).
-               add({{"x", "bar"}, {"y", 0}}, 18.0).
-               add({{"x", "bar"}, {"y", 1}}, 19.0).
-               add({{"x", "foo"}, {"y", 1}}, 42.0);
+    auto value = builder->build(std::move(builder));
+    auto actual = spec_from_value(*value);
+    auto expected = TensorSpec("tensor(x{},y[2])").
+                    add({{"x", "foo"}, {"y", 0}}, 17.0).
+                    add({{"x", "bar"}, {"y", 0}}, 18.0).
+                    add({{"x", "bar"}, {"y", 1}}, 19.0).
+                    add({{"x", "foo"}, {"y", 1}}, 42.0);
     EXPECT_EQ(actual, expected);    
 }