Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a unit test for odd-sized small structs (for #8117) #8363

Merged
merged 4 commits into from
Aug 20, 2024
Merged

Add a unit test for odd-sized small structs (for #8117) #8363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d60dc1d
add an odd sized test
nolen777 Jul 24, 2024
fe26ae5
formatting
nolen777 Jul 24, 2024
1040769
Merge branch 'master' into odd-test
nolen777 Jul 24, 2024
8cc858c
Merge branch 'master' into odd-test
dbaileychess Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions tests/alignment_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,18 @@ void AlignmentTest() {

// creating 5 structs with 2 bytes each
// 10 bytes in total for Vector data is needed
std::vector<JustSmallStruct> small_vector = {
{ 2, 1 }, { 3, 1 }, { 4, 1 }
};
std::vector<EvenSmallStruct> even_vector = { { 2, 1 }, { 3, 1 }, { 4, 1 } };
std::vector<OddSmallStruct> odd_vector = { { 6, 5, 4 },
{ 9, 8, 7 },
{ 1, 2, 3 } };
// CreateVectorOfStructs is used in the generated CreateSmallStructsDirect()
// method, but we test it directly
Offset<Vector<const JustSmallStruct *>> small_structs_offset =
builder.CreateVectorOfStructs<JustSmallStruct>(small_vector);
Offset<Vector<const EvenSmallStruct *>> even_structs_offset =
builder.CreateVectorOfStructs<EvenSmallStruct>(even_vector);
Offset<Vector<const OddSmallStruct *>> odd_structs_offset =
builder.CreateVectorOfStructs<OddSmallStruct>(odd_vector);
Offset<SmallStructs> small_structs_root =
CreateSmallStructs(builder, small_structs_offset);
CreateSmallStructs(builder, even_structs_offset, odd_structs_offset);

builder.Finish(small_structs_root);

Expand All @@ -62,13 +65,17 @@ void AlignmentTest() {
auto root_msg =
flatbuffers::GetRoot<SmallStructs>(builder.GetBufferPointer());

TEST_EQ(root_msg->small_structs()->size(), small_vector.size());
for (flatbuffers::uoffset_t i = 0; i < root_msg->small_structs()->size();
TEST_EQ(root_msg->even_structs()->size(), even_vector.size());
for (flatbuffers::uoffset_t i = 0; i < root_msg->even_structs()->size();
++i) {
TEST_EQ(small_vector[i].var_0(),
root_msg->small_structs()->Get(i)->var_0());
TEST_EQ(small_vector[i].var_1(),
root_msg->small_structs()->Get(i)->var_1());
TEST_EQ(even_vector[i].var_0(), root_msg->even_structs()->Get(i)->var_0());
TEST_EQ(even_vector[i].var_1(), root_msg->even_structs()->Get(i)->var_1());
}

TEST_EQ(root_msg->odd_structs()->size(), even_vector.size());
for (flatbuffers::uoffset_t i = 0; i < root_msg->odd_structs()->size(); ++i) {
TEST_EQ(odd_vector[i].var_0(), root_msg->odd_structs()->Get(i)->var_0());
TEST_EQ(odd_vector[i].var_1(), root_msg->odd_structs()->Get(i)->var_1());
}
}

Expand Down
17 changes: 13 additions & 4 deletions tests/alignment_test.fbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,24 @@ table BadAlignmentRoot {
small: [BadAlignmentSmall];
}

// sizeof(JustSmallStruct) == 2
// alignof(JustSmallStruct) == 1
struct JustSmallStruct {
// sizeof(EvenSmallStruct) == 2
// alignof(EvenSmallStruct) == 1
struct EvenSmallStruct {
var_0: uint8;
var_1: uint8;
}

// sizeof(OddSmallStruct) == 3
// alignof(OddSmallStruct) == 1
struct OddSmallStruct {
var_0: uint8;
var_1: uint8;
var_2: uint8;
}

table SmallStructs {
small_structs: [JustSmallStruct];
even_structs: [EvenSmallStruct];
odd_structs: [OddSmallStruct];
}

root_type SmallStructs;
Loading