1 files changed, 7 insertions, 8 deletions
diff --git a/tests/gtests/functions/FN_generic_vector_array_test.cc b/tests/gtests/functions/FN_generic_vector_array_test.cc
index 7ce7b543218..cfca678ad27 100644
--- a/tests/gtests/functions/FN_generic_vector_array_test.cc
+++ b/tests/gtests/functions/FN_generic_vector_array_test.cc
@@ -1,6 +1,5 @@
 /* Apache License, Version 2.0 */
 
-#include "FN_cpp_types.hh"
 #include "FN_generic_vector_array.hh"
 
 #include "testing/testing.h"
@@ -9,19 +8,19 @@ namespace blender::fn {
 
 TEST(generic_vector_array, Constructor)
 {
-  GVectorArray vectors{CPPType_int32, 3};
+  GVectorArray vectors{CPPType::get<int32_t>(), 3};
   EXPECT_EQ(vectors.size(), 3);
   EXPECT_EQ(vectors.lengths().size(), 3);
   EXPECT_EQ(vectors.starts().size(), 3);
   EXPECT_EQ(vectors.lengths()[0], 0);
   EXPECT_EQ(vectors.lengths()[1], 0);
   EXPECT_EQ(vectors.lengths()[2], 0);
-  EXPECT_EQ(vectors.type(), CPPType_int32);
+  EXPECT_EQ(vectors.type(), CPPType::get<int32_t>());
 }
 
 TEST(generic_vector_array, Append)
 {
-  GVectorArray vectors{CPPType_string, 3};
+  GVectorArray vectors{CPPType::get<std::string>(), 3};
   std::string value = "hello";
   vectors.append(0, &value);
   value = "world";
@@ -39,7 +38,7 @@ TEST(generic_vector_array, Append)
 
 TEST(generic_vector_array, AsArraySpan)
 {
-  GVectorArray vectors{CPPType_int32, 3};
+  GVectorArray vectors{CPPType::get<int32_t>(), 3};
   int value = 3;
   vectors.append(0, &value);
   vectors.append(0, &value);
@@ -49,7 +48,7 @@ TEST(generic_vector_array, AsArraySpan)
   vectors.append(2, &value);
 
   GVArraySpan span = vectors;
-  EXPECT_EQ(span.type(), CPPType_int32);
+  EXPECT_EQ(span.type(), CPPType::get<int32_t>());
   EXPECT_EQ(span.size(), 3);
   EXPECT_EQ(span[0].size(), 2);
   EXPECT_EQ(span[1].size(), 0);
@@ -60,7 +59,7 @@ TEST(generic_vector_array, AsArraySpan)
 
 TEST(generic_vector_array, TypedRef)
 {
-  GVectorArray vectors{CPPType_int32, 4};
+  GVectorArray vectors{CPPType::get<int32_t>(), 4};
   GVectorArrayRef<int> ref = vectors.typed<int>();
   ref.append(0, 2);
   ref.append(0, 6);
@@ -84,7 +83,7 @@ TEST(generic_vector_array, TypedRef)
 
 TEST(generic_vector_array, Extend)
 {
-  GVectorArray vectors{CPPType_int32, 3};
+  GVectorArray vectors{CPPType::get<int32_t>(), 3};
   GVectorArrayRef<int> ref = vectors;
 
   ref.extend(1, {5, 6, 7});