Skip to content

Commit 9e8b3fe

Browse files
Hind-MHind-M
committed
Use data_type_to_format in get_flatbuffer_type test
1 parent 6d55743 commit 9e8b3fe

File tree

1 file changed

+40
-38
lines changed

1 file changed

+40
-38
lines changed

‎tests/test_utils.cpp‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "doctest/doctest.h"
22

3+
#include "sparrow.hpp"
4+
35
#include "utils.hpp"
46

57
namespace sparrow_ipc
@@ -20,80 +22,80 @@ namespace sparrow_ipc
2022
flatbuffers::FlatBufferBuilder builder;
2123
SUBCASE("Null and Boolean types")
2224
{
23-
CHECK_EQ(utils::get_flatbuffer_type(builder, "n").first, org::apache::arrow::flatbuf::Type::Null);
24-
CHECK_EQ(utils::get_flatbuffer_type(builder, "b").first, org::apache::arrow::flatbuf::Type::Bool);
25+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::NA)).first, org::apache::arrow::flatbuf::Type::Null);
26+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::BOOL)).first, org::apache::arrow::flatbuf::Type::Bool);
2527
}
2628

2729
SUBCASE("Integer types")
2830
{
29-
CHECK_EQ(utils::get_flatbuffer_type(builder, "c").first, org::apache::arrow::flatbuf::Type::Int); // INT8
30-
CHECK_EQ(utils::get_flatbuffer_type(builder, "C").first, org::apache::arrow::flatbuf::Type::Int); // UINT8
31-
CHECK_EQ(utils::get_flatbuffer_type(builder, "s").first, org::apache::arrow::flatbuf::Type::Int); // INT16
32-
CHECK_EQ(utils::get_flatbuffer_type(builder, "S").first, org::apache::arrow::flatbuf::Type::Int); // UINT16
33-
CHECK_EQ(utils::get_flatbuffer_type(builder, "i").first, org::apache::arrow::flatbuf::Type::Int); // INT32
34-
CHECK_EQ(utils::get_flatbuffer_type(builder, "I").first, org::apache::arrow::flatbuf::Type::Int); // UINT32
35-
CHECK_EQ(utils::get_flatbuffer_type(builder, "l").first, org::apache::arrow::flatbuf::Type::Int); // INT64
36-
CHECK_EQ(utils::get_flatbuffer_type(builder, "L").first, org::apache::arrow::flatbuf::Type::Int); // UINT64
31+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INT8)).first, org::apache::arrow::flatbuf::Type::Int); // INT8
32+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::UINT8)).first, org::apache::arrow::flatbuf::Type::Int); // UINT8
33+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INT16)).first, org::apache::arrow::flatbuf::Type::Int); // INT16
34+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::UINT16)).first, org::apache::arrow::flatbuf::Type::Int); // UINT16
35+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INT32)).first, org::apache::arrow::flatbuf::Type::Int); // INT32
36+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::UINT32)).first, org::apache::arrow::flatbuf::Type::Int); // UINT32
37+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INT64)).first, org::apache::arrow::flatbuf::Type::Int); // INT64
38+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::UINT64)).first, org::apache::arrow::flatbuf::Type::Int); // UINT64
3739
}
3840

3941
SUBCASE("Floating Point types")
4042
{
41-
CHECK_EQ(utils::get_flatbuffer_type(builder, "e").first, org::apache::arrow::flatbuf::Type::FloatingPoint); // HALF_FLOAT
42-
CHECK_EQ(utils::get_flatbuffer_type(builder, "f").first, org::apache::arrow::flatbuf::Type::FloatingPoint); // FLOAT
43-
CHECK_EQ(utils::get_flatbuffer_type(builder, "g").first, org::apache::arrow::flatbuf::Type::FloatingPoint); // DOUBLE
43+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::HALF_FLOAT)).first, org::apache::arrow::flatbuf::Type::FloatingPoint); // HALF_FLOAT
44+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::FLOAT)).first, org::apache::arrow::flatbuf::Type::FloatingPoint); // FLOAT
45+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DOUBLE)).first, org::apache::arrow::flatbuf::Type::FloatingPoint); // DOUBLE
4446
}
4547

4648
SUBCASE("String and Binary types")
4749
{
48-
CHECK_EQ(utils::get_flatbuffer_type(builder, "u").first, org::apache::arrow::flatbuf::Type::Utf8); // STRING
49-
CHECK_EQ(utils::get_flatbuffer_type(builder, "U").first, org::apache::arrow::flatbuf::Type::LargeUtf8); // LARGE_STRING
50-
CHECK_EQ(utils::get_flatbuffer_type(builder, "z").first, org::apache::arrow::flatbuf::Type::Binary); // BINARY
51-
CHECK_EQ(utils::get_flatbuffer_type(builder, "Z").first, org::apache::arrow::flatbuf::Type::LargeBinary); // LARGE_BINARY
50+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::STRING)).first, org::apache::arrow::flatbuf::Type::Utf8); // STRING
51+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::LARGE_STRING)).first, org::apache::arrow::flatbuf::Type::LargeUtf8); // LARGE_STRING
52+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::BINARY)).first, org::apache::arrow::flatbuf::Type::Binary); // BINARY
53+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::LARGE_BINARY)).first, org::apache::arrow::flatbuf::Type::LargeBinary); // LARGE_BINARY
5254
CHECK_EQ(utils::get_flatbuffer_type(builder, "vu").first, org::apache::arrow::flatbuf::Type::Utf8View); // STRING_VIEW
5355
CHECK_EQ(utils::get_flatbuffer_type(builder, "vz").first, org::apache::arrow::flatbuf::Type::BinaryView); // BINARY_VIEW
5456
}
5557

5658
SUBCASE("Date types")
5759
{
58-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tdD").first, org::apache::arrow::flatbuf::Type::Date); // DATE_DAYS
59-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tdm").first, org::apache::arrow::flatbuf::Type::Date); // DATE_MILLISECONDS
60+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DATE_DAYS)).first, org::apache::arrow::flatbuf::Type::Date); // DATE_DAYS
61+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DATE_MILLISECONDS)).first, org::apache::arrow::flatbuf::Type::Date); // DATE_MILLISECONDS
6062
}
6163

6264
SUBCASE("Timestamp types")
6365
{
64-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tss:").first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_SECONDS
65-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tsm:").first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_MILLISECONDS
66-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tsu:").first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_MICROSECONDS
67-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tsn:").first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_NANOSECONDS
66+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIMESTAMP_SECONDS)).first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_SECONDS
67+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIMESTAMP_MILLISECONDS)).first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_MILLISECONDS
68+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIMESTAMP_MICROSECONDS)).first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_MICROSECONDS
69+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIMESTAMP_NANOSECONDS)).first, org::apache::arrow::flatbuf::Type::Timestamp); // TIMESTAMP_NANOSECONDS
6870
}
6971

7072
SUBCASE("Duration types")
7173
{
72-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tDs").first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_SECONDS
73-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tDm").first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_MILLISECONDS
74-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tDu").first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_MICROSECONDS
75-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tDn").first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_NANOSECONDS
74+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DURATION_SECONDS)).first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_SECONDS
75+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DURATION_MILLISECONDS)).first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_MILLISECONDS
76+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DURATION_MICROSECONDS)).first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_MICROSECONDS
77+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::DURATION_NANOSECONDS)).first, org::apache::arrow::flatbuf::Type::Duration); // DURATION_NANOSECONDS
7678
}
7779

7880
SUBCASE("Interval types")
7981
{
80-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tiM").first, org::apache::arrow::flatbuf::Type::Interval); // INTERVAL_MONTHS
81-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tiD").first, org::apache::arrow::flatbuf::Type::Interval); // INTERVAL_DAYS_TIME
82-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tin").first, org::apache::arrow::flatbuf::Type::Interval); // INTERVAL_MONTHS_DAYS_NANOSECONDS
82+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INTERVAL_MONTHS)).first, org::apache::arrow::flatbuf::Type::Interval); // INTERVAL_MONTHS
83+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INTERVAL_DAYS_TIME)).first, org::apache::arrow::flatbuf::Type::Interval); // INTERVAL_DAYS_TIME
84+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::INTERVAL_MONTHS_DAYS_NANOSECONDS)).first, org::apache::arrow::flatbuf::Type::Interval); // INTERVAL_MONTHS_DAYS_NANOSECONDS
8385
}
8486

8587
SUBCASE("Time types")
8688
{
87-
CHECK_EQ(utils::get_flatbuffer_type(builder, "tts").first, org::apache::arrow::flatbuf::Type::Time); // TIME_SECONDS
88-
CHECK_EQ(utils::get_flatbuffer_type(builder, "ttm").first, org::apache::arrow::flatbuf::Type::Time); // TIME_MILLISECONDS
89-
CHECK_EQ(utils::get_flatbuffer_type(builder, "ttu").first, org::apache::arrow::flatbuf::Type::Time); // TIME_MICROSECONDS
90-
CHECK_EQ(utils::get_flatbuffer_type(builder, "ttn").first, org::apache::arrow::flatbuf::Type::Time); // TIME_NANOSECONDS
89+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIME_SECONDS)).first, org::apache::arrow::flatbuf::Type::Time); // TIME_SECONDS
90+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIME_MILLISECONDS)).first, org::apache::arrow::flatbuf::Type::Time); // TIME_MILLISECONDS
91+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIME_MICROSECONDS)).first, org::apache::arrow::flatbuf::Type::Time); // TIME_MICROSECONDS
92+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::TIME_NANOSECONDS)).first, org::apache::arrow::flatbuf::Type::Time); // TIME_NANOSECONDS
9193
}
9294

9395
SUBCASE("List types")
9496
{
95-
CHECK_EQ(utils::get_flatbuffer_type(builder, "+l").first, org::apache::arrow::flatbuf::Type::List); // LIST
96-
CHECK_EQ(utils::get_flatbuffer_type(builder, "+L").first, org::apache::arrow::flatbuf::Type::LargeList); // LARGE_LIST
97+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::LIST)).first, org::apache::arrow::flatbuf::Type::List); // LIST
98+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::LARGE_LIST)).first, org::apache::arrow::flatbuf::Type::LargeList); // LARGE_LIST
9799
CHECK_EQ(utils::get_flatbuffer_type(builder, "+vl").first, org::apache::arrow::flatbuf::Type::ListView); // LIST_VIEW
98100
CHECK_EQ(utils::get_flatbuffer_type(builder, "+vL").first, org::apache::arrow::flatbuf::Type::LargeListView); // LARGE_LIST_VIEW
99101
CHECK_EQ(utils::get_flatbuffer_type(builder, "+w:16").first, org::apache::arrow::flatbuf::Type::FixedSizeList); // FIXED_SIZED_LIST
@@ -102,8 +104,8 @@ namespace sparrow_ipc
102104

103105
SUBCASE("Struct and Map types")
104106
{
105-
CHECK_EQ(utils::get_flatbuffer_type(builder, "+s").first, org::apache::arrow::flatbuf::Type::Struct_); // STRUCT
106-
CHECK_EQ(utils::get_flatbuffer_type(builder, "+m").first, org::apache::arrow::flatbuf::Type::Map); // MAP
107+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::STRUCT)).first, org::apache::arrow::flatbuf::Type::Struct_); // STRUCT
108+
CHECK_EQ(utils::get_flatbuffer_type(builder, sparrow::data_type_to_format(sparrow::data_type::MAP)).first, org::apache::arrow::flatbuf::Type::Map); // MAP
107109
}
108110

109111
SUBCASE("Union types")

0 commit comments

Comments
 (0)