Skip to content

Improve string tests in FppTest #5566

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

Merged
LeStarch merged 8 commits into from
Aug 12, 2026
Merged

Improve string tests in FppTest #5566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
26726f6
Fix string truncation and variadic macro errors in FppTest struct uni…
Aug 4, 2026
19f3069
fix(fpptest): fix string truncation and variadic macro warnings in st…
Aug 4, 2026
09f0e03
fix(fpptest): fix string truncation and variadic macro warnings in st…
Aug 4, 2026
f536697
Merge remote-tracking branch 'fork/fix/fpptest-string-truncation' and…
Aug 4, 2026
a7fed2b
fix: remove trailing comma in macro and correct toString whitespace
Aug 4, 2026
9b12cde
fix(fpptest): test truncated/non-truncated toString and remove traili…
Aug 11, 2026
5ae975c
Merge remote-tracking branch 'nasa/devel' into fix/fpptest-string-tru…
bocchino Aug 11, 2026
a7b21f8
fix(fpptest): restore trailing space before closing parenthesis
Aug 12, 2026
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
11 changes: 5 additions & 6 deletions FppTestProject/FppTest/struct/NonPrimitiveTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,9 @@ TEST_F(NonPrimitiveTest, ToString) {
NonPrimitive s(testString, testEnum, testArray, testArray, testStruct, testStruct, testU32Arr, testStructArr);
std::stringstream buf1, buf2;

buf1 << s;
Fw::StringTemplate<1024> str;
s.toString(str);

@bocchino bocchino Aug 10, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is better for testing s.toString, but now it doesn't test the << method of s at all. Can we keep both tests here (the truncated and non-truncated versions)?

@karan9617 karan9617 Aug 11, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the test to explicitly verify both the truncated operator<< behavior and the non-truncated toString() output using the larger buffer

@bocchino bocchino Aug 11, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Can you apply the same change to PrimitiveTest? The two cases (PrimitiveTest, NonPrimitiveTest) should operate in the same way.

@karan9617 karan9617 Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! I've updated PrimitiveTest to follow the exact same two-case testing pattern, verifying both the truncated operator<< output and the full toString() output.

buf1 << str;

buf2 << "( "
<< "mString = " << testString << ", "
Expand All @@ -294,12 +296,9 @@ TEST_F(NonPrimitiveTest, ToString) {
<< "mAliasStruct = " << testStruct << ", "
<< "mU32Arr = [ " << testU32Arr[0] << ", " << testU32Arr[1] << ", " << testU32Arr[2] << " ], "
<< "mStructArr = [ " << testStructArr[0] << ", " << testStructArr[1] << ", " << testStructArr[2] << " ] "
Comment thread
karan9617 marked this conversation as resolved.
Outdated
<< " )";
<< ")";
Comment thread
karan9617 marked this conversation as resolved.
Outdated
Comment thread
bocchino marked this conversation as resolved.
Outdated

// Truncate string output
Fw::String s2(buf2.str().c_str());

ASSERT_STREQ(buf1.str().c_str(), s2.toChar());
ASSERT_EQ(buf1.str(), buf2.str());
}

} // namespace Struct
Expand Down
2 changes: 1 addition & 1 deletion FppTestProject/FppTest/struct/PrimitiveTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ REGISTER_TYPED_TEST_SUITE_P(PrimitiveTest,
ToString);

using PrimitiveTestImplementations = ::testing::Types<C_Primitive, SM_SMPrimitive>;
INSTANTIATE_TYPED_TEST_SUITE_P(FppTest, PrimitiveTest, PrimitiveTestImplementations);
INSTANTIATE_TYPED_TEST_SUITE_P(FppTest, PrimitiveTest, PrimitiveTestImplementations, );
Comment thread
karan9617 marked this conversation as resolved.
Outdated

} // namespace Struct

Expand Down
2 changes: 1 addition & 1 deletion FppTestProject/FppTest/struct/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
// Instantiate string tests for structs
using StringTestImplementations =
::testing::Types<Fw::StringTemplate<80>, Fw::StringTemplate<50>, Fw::StringTemplate<60> >;
INSTANTIATE_TYPED_TEST_SUITE_P(Struct, StringTest, StringTestImplementations);
INSTANTIATE_TYPED_TEST_SUITE_P(Struct, StringTest, StringTestImplementations, );
Comment thread
bocchino marked this conversation as resolved.
Outdated

int main(int argc, char* argv[]) {
::testing::InitGoogleTest(&argc, argv);
Expand Down
6 changes: 3 additions & 3 deletions FppTestProject/FppTest/struct/struct.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ module FppTest {
}

type StructAliasString = string size 30
type StructAliasStringZero = string size 0
type StructAliasStringZero = string size 1
Comment thread
karan9617 marked this conversation as resolved.
Outdated

struct MultiString {
mStr_1: string
mStr_2: string
mStr50_1: string size 50
mStr50_2: string size 50
mStr0: string size 0
mStr0: string size 1
mStrArr_1: [3] string size 60
mStrArr_2: [3] string size 60
mStrArr0: [3] string size 0
mStrArr0: [3] string size 1
mStrAlias: StructAliasString
mStrAlias_2: [3] StructAliasString
mStrAlias0: StructAliasStringZero
Expand Down
Loading