followup on GenSpec after review

* avoid changing layouts in-place, call cpy() first
* do cells_float() vs cells_double() more equally
* minor cosmetic fixes

1 files changed, 5 insertions, 3 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 6cf43511977..9d29d8de660 100644
--- a/eval/src/tests/eval/fast_value/fast_value_test.cpp
+++ b/eval/src/tests/eval/fast_value/fast_value_test.cpp
@@ -142,9 +142,9 @@ TEST(FastValueBuilderTest, mixed_add_subspace_robustness) {
     }
 }
 
-GenSpec G() { return GenSpec().cells_float(); }
+GenSpec G() { return GenSpec(); }
 
-std::vector<GenSpec> layouts = {
+const std::vector<GenSpec> layouts = {
     G(),
     G().idx("x", 3),
     G().idx("x", 3).idx("y", 5),
@@ -159,7 +159,9 @@ std::vector<GenSpec> layouts = {
 TEST(FastValueBuilderFactoryTest, fast_values_can_be_copied) {
     auto factory = FastValueBuilderFactory::get();
     for (const auto &layout: layouts) {
-        for (TensorSpec expect : { layout.gen(), layout.cpy().cells_double().gen() }) {
+        for (TensorSpec expect : { layout.cpy().cells_float().gen(),
+                                   layout.cpy().cells_double().gen() })
+        {
             std::unique_ptr<Value> value = value_from_spec(expect, factory);
             std::unique_ptr<Value> copy = factory.copy(*value);
             TensorSpec actual = spec_from_value(*copy);