all retval replacements
This commit is contained in:
@ -40,14 +40,14 @@ TEST_CASE("CFDP Other TLVs", "[cfdp][tlv]") {
|
||||
std::array<uint8_t, 128> serBuf = {};
|
||||
result = response.convertToTlv(rawResponse, serBuf.data(), serBuf.size(),
|
||||
SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
REQUIRE(rawResponse.getType() == cfdp::TlvTypes::FILESTORE_RESPONSE);
|
||||
cfdp::StringLv emptyMsg;
|
||||
cfdp::StringLv emptySecondName;
|
||||
FilestoreResponseTlv emptyTlv(firstName, &emptyMsg);
|
||||
emptyTlv.setSecondFileName(&emptySecondName);
|
||||
result = emptyTlv.deSerialize(rawResponse, SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
REQUIRE(emptyTlv.getActionCode() == cfdp::FilestoreActionCode::APPEND_FILE);
|
||||
REQUIRE(emptyTlv.getStatusCode() == cfdp::FSR_SUCCESS);
|
||||
size_t firstNameLen = 0;
|
||||
@ -81,26 +81,26 @@ TEST_CASE("CFDP Other TLVs", "[cfdp][tlv]") {
|
||||
REQUIRE(expectedSz == 10 + 11 + 1);
|
||||
REQUIRE(request.getSerializedSize() == expectedSz + 2);
|
||||
result = request.serialize(&ptr, &sz, serBuf.size(), SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
REQUIRE(sz == expectedSz + 2);
|
||||
|
||||
FilestoreRequestTlv emptyRequest(firstName);
|
||||
emptyRequest.setSecondFileName(&secondName);
|
||||
const uint8_t* constptr = serBuf.data();
|
||||
result = emptyRequest.deSerialize(&constptr, &sz, SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
|
||||
cfdp::Tlv rawRequest;
|
||||
ptr = serBuf.data();
|
||||
sz = 0;
|
||||
result = request.convertToTlv(rawRequest, serBuf.data(), serBuf.size(),
|
||||
SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
REQUIRE(rawRequest.getType() == cfdp::TlvTypes::FILESTORE_REQUEST);
|
||||
|
||||
emptyRequest.setActionCode(cfdp::FilestoreActionCode::DELETE_FILE);
|
||||
result = emptyRequest.deSerialize(rawRequest, SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
REQUIRE(emptyRequest.getType() == cfdp::TlvTypes::FILESTORE_REQUEST);
|
||||
REQUIRE(emptyRequest.getActionCode() == cfdp::FilestoreActionCode::APPEND_FILE);
|
||||
}
|
||||
@ -117,11 +117,11 @@ TEST_CASE("CFDP Other TLVs", "[cfdp][tlv]") {
|
||||
faultOverrideTlv.serialize(&serPtr, &sz, rawBuf.size(), SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(faultOverrideTlv.getSerializedSize() == 3);
|
||||
REQUIRE(sz == 3);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
|
||||
FaultHandlerOverrideTlv emptyOverrideTlv;
|
||||
result = emptyOverrideTlv.deSerialize(&deserPtr, &sz, SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
|
||||
EntityId entId(cfdp::WidthInBytes::TWO_BYTES, 0x42);
|
||||
EntityId emptyId;
|
||||
@ -129,9 +129,9 @@ TEST_CASE("CFDP Other TLVs", "[cfdp][tlv]") {
|
||||
serPtr = rawBuf.data();
|
||||
result = idTlv.serialize(&serPtr, &deserSize, rawBuf.size(), SerializeIF::Endianness::NETWORK);
|
||||
cfdp::Tlv rawTlv(cfdp::TlvTypes::ENTITY_ID, rawBuf.data() + 2, 2);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
deserPtr = rawBuf.data();
|
||||
result = idTlv.deSerialize(rawTlv, SerializeIF::Endianness::NETWORK);
|
||||
REQUIRE(result == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(result == returnvalue::OK);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user