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

Fix issues in FppTest #2494

Merged
merged 2 commits into from
Jan 24, 2024
Merged

Fix issues in FppTest #2494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0112485
Fix bug in FppTest
bocchino Jan 19, 2024
8484821
Avoid array size zero
bocchino Jan 19, 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
41 changes: 21 additions & 20 deletions FppTest/struct/NonPrimitiveStructTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ class NonPrimitiveStructTest : public ::testing::Test {
protected:
void SetUp() override {
char buf[testString.getCapacity()];
FppTest::Utils::setString(buf, sizeof(buf));
// Test string must be non-empty
FppTest::Utils::setString(buf, sizeof(buf), 1);
testString = buf;

testEnum = static_cast<StructEnum::T>(STest::Pick::startLength(
Expand Down Expand Up @@ -106,7 +107,7 @@ TEST_F(NonPrimitiveStructTest, Default) {
// Constants
ASSERT_EQ(
NonPrimitive::SERIALIZED_SIZE,
NonPrimitive::StringSize80::SERIALIZED_SIZE
NonPrimitive::StringSize80::SERIALIZED_SIZE
+ StructEnum::SERIALIZED_SIZE
+ StructArray::SERIALIZED_SIZE
+ Primitive::SERIALIZED_SIZE
Expand All @@ -131,12 +132,12 @@ TEST_F(NonPrimitiveStructTest, Default) {
// Test struct constructors
TEST_F(NonPrimitiveStructTest, Constructors) {
// Member constructor
NonPrimitive s1(testString, testEnum, testArray,
NonPrimitive s1(testString, testEnum, testArray,
testStruct, testU32Arr, testStructArr);
assertStructMembers(s1);

// Scalar member constructor
NonPrimitive s2(testString, testEnum, testArray,
NonPrimitive s2(testString, testEnum, testArray,
testStruct, testU32Arr[0], testStructArr[0]);

ASSERT_EQ(s2.getmString(), testString);
Expand All @@ -159,7 +160,7 @@ TEST_F(NonPrimitiveStructTest, Constructors) {
// Test struct assignment operator
TEST_F(NonPrimitiveStructTest, AssignmentOp) {
NonPrimitive s1;
NonPrimitive s2(testString, testEnum, testArray,
NonPrimitive s2(testString, testEnum, testArray,
testStruct, testU32Arr, testStructArr);

// Copy assignment
Expand Down Expand Up @@ -225,7 +226,7 @@ TEST_F(NonPrimitiveStructTest, GetterSetterFunctions) {
NonPrimitive s1, s2;

// Set all members
s1.set(testString, testEnum, testArray,
s1.set(testString, testEnum, testArray,
testStruct, testU32Arr, testStructArr);
assertStructMembers(s1);

Expand Down Expand Up @@ -259,7 +260,7 @@ TEST_F(NonPrimitiveStructTest, GetterSetterFunctions) {

// Test struct serialization and deserialization
TEST_F(NonPrimitiveStructTest, Serialization) {
NonPrimitive s(testString, testEnum, testArray,
NonPrimitive s(testString, testEnum, testArray,
testStruct, testU32Arr, testStructArr);
NonPrimitive sCopy;

Expand Down Expand Up @@ -287,22 +288,22 @@ TEST_F(NonPrimitiveStructTest, Serialization) {

// Test unsuccessful serialization
assertUnsuccessfulSerialization(s, stringSerializedSize - 1);
assertUnsuccessfulSerialization(s, stringSerializedSize
assertUnsuccessfulSerialization(s, stringSerializedSize
+ StructEnum::SERIALIZED_SIZE - 1);
assertUnsuccessfulSerialization(s, stringSerializedSize
assertUnsuccessfulSerialization(s, stringSerializedSize
+ StructEnum::SERIALIZED_SIZE + StructArray::SERIALIZED_SIZE - 1);
assertUnsuccessfulSerialization(s, stringSerializedSize
+ StructEnum::SERIALIZED_SIZE + StructArray::SERIALIZED_SIZE
assertUnsuccessfulSerialization(s, stringSerializedSize
+ StructEnum::SERIALIZED_SIZE + StructArray::SERIALIZED_SIZE
+ Primitive::SERIALIZED_SIZE - 1);
assertUnsuccessfulSerialization(s, stringSerializedSize
+ StructEnum::SERIALIZED_SIZE + StructArray::SERIALIZED_SIZE
assertUnsuccessfulSerialization(s, stringSerializedSize
+ StructEnum::SERIALIZED_SIZE + StructArray::SERIALIZED_SIZE
+ Primitive::SERIALIZED_SIZE + (3 * sizeof(U32)) - 1);
assertUnsuccessfulSerialization(s, serializedSize - 1);
}

// Test struct toString() and ostream operator functions
TEST_F(NonPrimitiveStructTest, ToString) {
NonPrimitive s(testString, testEnum, testArray,
NonPrimitive s(testString, testEnum, testArray,
testStruct, testU32Arr, testStructArr);
std::stringstream buf1, buf2;

Expand All @@ -311,21 +312,21 @@ TEST_F(NonPrimitiveStructTest, ToString) {
buf2 << "( "
<< "mString = " << testString << ", "
<< "mEnum = " << testEnum << ", "
<< "mArray = " << testArray << ", "
<< "mStruct = " << testStruct << ", "
<< "mU32Arr = [ "
<< "mArray = " << testArray << ", "
<< "mStruct = " << testStruct << ", "
<< "mU32Arr = [ "
<< testU32Arr[0] << ", "
<< testU32Arr[1] << ", "
<< testU32Arr[2] << " ], "
<< "mStructArr = [ "
<< "mStructArr = [ "
<< testStructArr[0] << ", "
<< testStructArr[1] << ", "
<< testStructArr[2] << " ] "
<< " )";

// Truncate string output
char buf2Str[FW_SERIALIZABLE_TO_STRING_BUFFER_SIZE];
Fw::StringUtils::string_copy(buf2Str, buf2.str().c_str(),
char buf2Str[FW_SERIALIZABLE_TO_STRING_BUFFER_SIZE];
Fw::StringUtils::string_copy(buf2Str, buf2.str().c_str(),
FW_SERIALIZABLE_TO_STRING_BUFFER_SIZE);

ASSERT_STREQ(buf1.str().c_str(), buf2Str);
Expand Down
5 changes: 3 additions & 2 deletions FppTest/struct/PrimitiveStructTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ class PrimitiveStructTest : public ::testing::Test {
}

void assertUnsuccessfulSerialization(Primitive& s, U32 bufSize) {
U8 data[bufSize];
Fw::SerialBuffer buf(data, sizeof(data));
// Avoid creating an array of size zero
U8 data[bufSize + 1];
Fw::SerialBuffer buf(data, bufSize);
LeStarch marked this conversation as resolved.
Show resolved Hide resolved
Fw::SerializeStatus status;

// Serialize
Expand Down
31 changes: 17 additions & 14 deletions FppTest/utils/Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
//
// ======================================================================

#include "STest/Pick/Pick.hpp"

#include <string>
#include <limits>
#include <iostream>

#include "Fw/Types/Assert.hpp"
#include "STest/Pick/Pick.hpp"

namespace FppTest {

namespace Utils {

U8 getNonzeroU8() {
return static_cast<U8>(STest::Pick::lowerUpper(
1,
Expand All @@ -38,21 +39,23 @@ namespace FppTest {
return static_cast<char>(STest::Pick::lowerUpper(32, 127));
}

void setString(char* buf, U32 size) {
U32 length = STest::Pick::lowerUpper(1, size);

if (length == 0) {
buf[0] = 0;
return;
}
void setString(char* buf, FwSizeType capacity, FwSizeType minLength) {
FW_ASSERT(buf != nullptr);
// capacity must be able to hold a null-terminated string
FW_ASSERT(capacity > 0);
// min length must fit within capacity
FW_ASSERT(minLength < capacity);
U32 length = STest::Pick::lowerUpper(minLength, capacity - 1);

for (U32 i = 0; i < length - 1; i++) {
for (U32 i = 0; i < length; i++) {
FW_ASSERT(i < capacity);
buf[i] = getChar();
}

buf[length-1] = 0;
FW_ASSERT(length < capacity);
buf[length] = 0;
}

} // namespace Utils

} // namespace FppTest
10 changes: 8 additions & 2 deletions FppTest/utils/Utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,14 @@ namespace FppTest {
// Returns a random non-null char
char getChar();

// Populates buf with a random nonempty string of random length with max length size
void setString(char *buf, U32 size);
// Populates buf with a random string of random length that fits
// within capacity, including the null terminator (i.e., length + 1 <= capacity)
void setString(
char *buf, //!< The buffer pointer
FwSizeType capacity, //!< The buffer capacity
FwSizeType minLength = 0 //!< The minimum string length, not including the null terminator
//!< minLength + 1 must be <= capacity
);

} // namespace Utils

Expand Down
Loading