diff options
Diffstat (limited to 'tests/gtests/functions/FN_spans_test.cc')
-rw-r--r-- | tests/gtests/functions/FN_spans_test.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/gtests/functions/FN_spans_test.cc b/tests/gtests/functions/FN_spans_test.cc index 8968d49c082..3172cdc7170 100644 --- a/tests/gtests/functions/FN_spans_test.cc +++ b/tests/gtests/functions/FN_spans_test.cc @@ -2,14 +2,13 @@ #include "testing/testing.h" -#include "FN_cpp_types.hh" #include "FN_spans.hh" namespace blender::fn { TEST(generic_span, TypeConstructor) { - GSpan span(CPPType_float); + GSpan span(CPPType::get<float>()); EXPECT_EQ(span.size(), 0); EXPECT_EQ(span.typed<float>().size(), 0); EXPECT_TRUE(span.is_empty()); @@ -19,7 +18,7 @@ TEST(generic_span, BufferAndSizeConstructor) { int values[4] = {6, 7, 3, 2}; void *buffer = (void *)values; - GSpan span(CPPType_int32, buffer, 4); + GSpan span(CPPType::get<int32_t>(), buffer, 4); EXPECT_EQ(span.size(), 4); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span.typed<int>().size(), 4); @@ -31,7 +30,7 @@ TEST(generic_span, BufferAndSizeConstructor) TEST(generic_mutable_span, TypeConstructor) { - GMutableSpan span(CPPType_int32); + GMutableSpan span(CPPType::get<int32_t>()); EXPECT_EQ(span.size(), 0); EXPECT_TRUE(span.is_empty()); } @@ -40,7 +39,7 @@ TEST(generic_mutable_span, BufferAndSizeConstructor) { int values[4] = {4, 7, 3, 5}; void *buffer = (void *)values; - GMutableSpan span(CPPType_int32, buffer, 4); + GMutableSpan span(CPPType::get<int32_t>(), buffer, 4); EXPECT_EQ(span.size(), 4); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span.typed<int>().size(), 4); @@ -127,7 +126,7 @@ TEST(virtual_span, SingleConstructor) TEST(generic_virtual_span, TypeConstructor) { - GVSpan span(CPPType_int32); + GVSpan span(CPPType::get<int32_t>()); EXPECT_EQ(span.size(), 0); EXPECT_TRUE(span.is_empty()); EXPECT_FALSE(span.is_single_element()); @@ -139,7 +138,7 @@ TEST(generic_virtual_span, TypeConstructor) TEST(generic_virtual_span, GenericSpanConstructor) { int values[4] = {3, 4, 5, 6}; - GVSpan span{GSpan(CPPType_int32, values, 4)}; + GVSpan span{GSpan(CPPType::get<int32_t>(), values, 4)}; EXPECT_EQ(span.size(), 4); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span[0], &values[0]); @@ -167,7 +166,7 @@ TEST(generic_virtual_span, SpanConstructor) { std::array<int, 3> values = {6, 7, 8}; GVSpan span{Span<int>(values)}; - EXPECT_EQ(span.type(), CPPType_int32); + EXPECT_EQ(span.type(), CPPType::get<int32_t>()); EXPECT_EQ(span.size(), 3); EXPECT_EQ(span[0], &values[0]); EXPECT_EQ(span[1], &values[1]); @@ -190,7 +189,7 @@ TEST(generic_virtual_span, SpanConstructor) TEST(generic_virtual_span, SingleConstructor) { int value = 5; - GVSpan span = GVSpan::FromSingle(CPPType_int32, &value, 3); + GVSpan span = GVSpan::FromSingle(CPPType::get<int32_t>(), &value, 3); EXPECT_EQ(span.size(), 3); EXPECT_FALSE(span.is_empty()); EXPECT_EQ(span[0], &value); |