variant is not primitive, change the tests accordingly

Author: zhjwpku

src/iceberg/test/type_test.cc

@@ -94,7 +94,7 @@ TEST_P(TypeTest, StdFormat) {
   ASSERT_EQ(test_case.repr, std::format("{}", *test_case.type));
 }
 
-const static std::array<TypeTestCase, 22> kPrimitiveTypes = {{
+const static std::array<TypeTestCase, 21> kPrimitiveTypes = {{
     {
         .name = "boolean",
         .type = iceberg::boolean(),
@@ -228,13 +228,6 @@ const static std::array<TypeTestCase, 22> kPrimitiveTypes = {{
         .primitive = true,
         .repr = "unknown",
     },
-    {
-        .name = "variant",
-        .type = iceberg::variant(),
-        .type_id = iceberg::TypeId::kVariant,
-        .primitive = false,
-        .repr = "variant",
-    },
     {
         .name = "geometry",
         .type = iceberg::geometry(),
@@ -251,6 +244,14 @@ const static std::array<TypeTestCase, 22> kPrimitiveTypes = {{
     },
 }};
 
+const static TypeTestCase kVariantType = {
+    .name = "variant",
+    .type = iceberg::variant(),
+    .type_id = iceberg::TypeId::kVariant,
+    .primitive = false,
+    .repr = "variant",
+};
+
 const static std::array<TypeTestCase, 4> kNestedTypes = {{
     {
         .name = "list_int",
@@ -298,6 +299,9 @@ const static std::array<TypeTestCase, 4> kNestedTypes = {{
 INSTANTIATE_TEST_SUITE_P(Primitive, TypeTest, ::testing::ValuesIn(kPrimitiveTypes),
                          TypeTestCaseToString);
 
+INSTANTIATE_TEST_SUITE_P(Variant, TypeTest, ::testing::Values(kVariantType),
+                         TypeTestCaseToString);
+
 INSTANTIATE_TEST_SUITE_P(Nested, TypeTest, ::testing::ValuesIn(kNestedTypes),
                          TypeTestCaseToString);
 
@@ -306,6 +310,7 @@ TEST(TypeTest, Equality) {
   for (const auto& test_case : kPrimitiveTypes) {
     alltypes.push_back(test_case.type);
   }
+  alltypes.push_back(kVariantType.type);
   for (const auto& test_case : kNestedTypes) {
     alltypes.push_back(test_case.type);
   }

src/iceberg/test/visit_type_test.cc

@@ -54,7 +54,7 @@ std::string TypeTestCaseToString(const ::testing::TestParamInfo<TypeTestCase>& i
   return info.param.name;
 }
 
-const static std::array<TypeTestCase, 22> kPrimitiveTypes = {{
+const static std::array<TypeTestCase, 21> kPrimitiveTypes = {{
     {
         .name = "boolean",
         .type = iceberg::boolean(),
@@ -188,13 +188,6 @@ const static std::array<TypeTestCase, 22> kPrimitiveTypes = {{
         .primitive = true,
         .repr = "unknown",
     },
-    {
-        .name = "variant",
-        .type = iceberg::variant(),
-        .type_id = iceberg::TypeId::kVariant,
-        .primitive = false,
-        .repr = "variant",
-    },
     {
         .name = "geometry",
         .type = iceberg::geometry(),
@@ -211,6 +204,14 @@ const static std::array<TypeTestCase, 22> kPrimitiveTypes = {{
     },
 }};
 
+const static TypeTestCase kVariantType = {
+    .name = "variant",
+    .type = iceberg::variant(),
+    .type_id = iceberg::TypeId::kVariant,
+    .primitive = false,
+    .repr = "variant",
+};
+
 const static std::array<TypeTestCase, 4> kNestedTypes = {{
     {
         .name = "list_int",
@@ -262,6 +263,9 @@ class VisitTypeTest : public ::testing::TestWithParam<TypeTestCase> {};
 INSTANTIATE_TEST_SUITE_P(Primitive, VisitTypeTest, ::testing::ValuesIn(kPrimitiveTypes),
                          TypeTestCaseToString);
 
+INSTANTIATE_TEST_SUITE_P(Variant, VisitTypeTest, ::testing::Values(kVariantType),
+                         TypeTestCaseToString);
+
 INSTANTIATE_TEST_SUITE_P(Nested, VisitTypeTest, ::testing::ValuesIn(kNestedTypes),
                          TypeTestCaseToString);