merge retval refactoring
This commit is contained in:
@ -44,8 +44,7 @@ TEST_CASE("CCSDS Packet ID", "[ccsds-packet-id]") {
|
||||
packetId.packetType = ccsds::PacketType::TM;
|
||||
size_t serLen = 0;
|
||||
REQUIRE(packetId.raw() == 0x1ff);
|
||||
REQUIRE(packetId.SerializeIF::serializeBe(buf.data(), serLen, buf.size()) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(packetId.SerializeIF::serializeBe(buf.data(), serLen, buf.size()) == returnvalue::OK);
|
||||
CHECK(buf[0] == 0x1);
|
||||
CHECK(buf[1] == 0xff);
|
||||
}
|
||||
@ -78,7 +77,7 @@ TEST_CASE("CCSDS Packet ID", "[ccsds-packet-id]") {
|
||||
buf[1] = 0xff;
|
||||
size_t deserLen = 0xff;
|
||||
REQUIRE(packetId.deSerialize(buf.data(), deserLen, buf.size(),
|
||||
SerializeIF::Endianness::NETWORK) == HasReturnvaluesIF::RETURN_OK);
|
||||
SerializeIF::Endianness::NETWORK) == returnvalue::OK);
|
||||
CHECK(packetId.apid == 0x2ff);
|
||||
CHECK(deserLen == 2);
|
||||
CHECK(packetId.packetType == ccsds::PacketType::TC);
|
||||
@ -94,8 +93,7 @@ TEST_CASE("CCSDS Packet Seq Ctrl", "[ccsds-packet-seq-ctrl]") {
|
||||
psc.seqFlags = ccsds::SequenceFlags::FIRST_SEGMENT;
|
||||
psc.seqCount = static_cast<uint16_t>(std::round(std::pow(2, 14) - 1));
|
||||
REQUIRE(psc.raw() == 0x7fff);
|
||||
REQUIRE(psc.SerializeIF::serializeBe(buf.data(), serLen, buf.size()) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(psc.SerializeIF::serializeBe(buf.data(), serLen, buf.size()) == returnvalue::OK);
|
||||
CHECK(buf[0] == 0x7f);
|
||||
CHECK(buf[1] == 0xff);
|
||||
CHECK(serLen == 2);
|
||||
@ -114,7 +112,7 @@ TEST_CASE("CCSDS Packet Seq Ctrl", "[ccsds-packet-seq-ctrl]") {
|
||||
buf[1] = 0xfe;
|
||||
size_t deserLen = 0xff;
|
||||
REQUIRE(psc.deSerialize(buf.data(), deserLen, buf.size(), SerializeIF::Endianness::NETWORK) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
returnvalue::OK);
|
||||
CHECK(psc.seqFlags == ccsds::SequenceFlags::LAST_SEGMENT);
|
||||
CHECK(deserLen == 2);
|
||||
CHECK(psc.seqCount == static_cast<uint16_t>(std::round(std::pow(2, 14) - 2)));
|
||||
|
@ -40,11 +40,11 @@ TEST_CASE("CCSDS Creator", "[ccsds-creator]") {
|
||||
serLen = 6;
|
||||
const uint8_t* readOnlyPtr = buf.data();
|
||||
REQUIRE(base.deSerialize(&readOnlyPtr, &serLen, SerializeIF::Endianness::BIG) ==
|
||||
HasReturnvaluesIF::RETURN_FAILED);
|
||||
returnvalue::FAILED);
|
||||
}
|
||||
|
||||
SECTION("Raw Output") {
|
||||
REQUIRE(base.serializeBe(&bufPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(base.serializeBe(&bufPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
// TC, and secondary header flag is set -> 0b0001100 -> 0x18
|
||||
CHECK(buf[0] == 0x18);
|
||||
// APID 0x02
|
||||
@ -66,7 +66,7 @@ TEST_CASE("CCSDS Creator", "[ccsds-creator]") {
|
||||
base.setSeqFlags(ccsds::SequenceFlags::UNSEGMENTED);
|
||||
base.setDataLen(static_cast<int>(std::pow(2, 16)) - 1);
|
||||
REQUIRE(base.isValid());
|
||||
REQUIRE(base.serializeBe(&bufPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(base.serializeBe(&bufPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
CHECK(buf[0] == 0x1F);
|
||||
CHECK(buf[1] == 0xFF);
|
||||
CHECK(buf[2] == 0xFF);
|
||||
@ -80,14 +80,14 @@ TEST_CASE("CCSDS Creator", "[ccsds-creator]") {
|
||||
ccsds::PacketType::TC, true, 0xFFFF, ccsds::SequenceFlags::FIRST_SEGMENT, 0x34, 0x16);
|
||||
REQUIRE(not creator.isValid());
|
||||
REQUIRE(not creator);
|
||||
REQUIRE(creator.serializeBe(&bufPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_FAILED);
|
||||
REQUIRE(creator.serializeBe(&bufPtr, &serLen, buf.size()) == returnvalue::FAILED);
|
||||
}
|
||||
|
||||
SECTION("Invalid Seq Count") {
|
||||
SpacePacketCreator invalid = SpacePacketCreator(
|
||||
ccsds::PacketType::TC, true, 0x02, ccsds::SequenceFlags::FIRST_SEGMENT, 0xFFFF, 0x16);
|
||||
REQUIRE(not invalid.isValid());
|
||||
REQUIRE(invalid.serializeBe(&bufPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_FAILED);
|
||||
REQUIRE(invalid.serializeBe(&bufPtr, &serLen, buf.size()) == returnvalue::FAILED);
|
||||
}
|
||||
|
||||
SECTION("Invalid Buf Size 1") {
|
||||
|
@ -36,12 +36,12 @@ TEST_CASE("CCSDS Reader", "[ccsds-reader]") {
|
||||
SECTION("Empty Reader") {
|
||||
REQUIRE(SpacePacketIF::getHeaderLen() == 6);
|
||||
REQUIRE(reader.isNull());
|
||||
REQUIRE(reader.checkSize() == HasReturnvaluesIF::RETURN_FAILED);
|
||||
REQUIRE(reader.checkSize() == returnvalue::FAILED);
|
||||
}
|
||||
|
||||
SECTION("Basic Read") {
|
||||
REQUIRE(base.serialize(&bufPtr, &serLen, buf.size(), SerializeIF::Endianness::NETWORK) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
returnvalue::OK);
|
||||
SECTION("Setter") {
|
||||
reader.setReadOnlyData(buf.data(), SpacePacketIF::getHeaderLen());
|
||||
checkReader(reader);
|
||||
@ -54,8 +54,8 @@ TEST_CASE("CCSDS Reader", "[ccsds-reader]") {
|
||||
|
||||
SECTION("Read with additional data") {
|
||||
REQUIRE(base.serialize(&bufPtr, &serLen, buf.size(), SerializeIF::Endianness::NETWORK) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
returnvalue::OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.getBufSize() == buf.size());
|
||||
REQUIRE(reader.getFullPacketLen() == FULL_PACKET_LEN);
|
||||
REQUIRE(reader.getPacketData() == buf.data() + SpacePacketIF::getHeaderLen());
|
||||
|
@ -34,7 +34,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
|
||||
}
|
||||
|
||||
SECTION("Serialized") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(serLen == 13);
|
||||
REQUIRE(buf[0] == 0x18);
|
||||
REQUIRE(buf[1] == 0x02);
|
||||
@ -64,7 +64,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
|
||||
auto& params = creator.getPusParams();
|
||||
params.sourceId = 0x5ff;
|
||||
REQUIRE(creator.getSourceId() == 0x5ff);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(((buf[9] << 8) | buf[10]) == 0x5ff);
|
||||
}
|
||||
|
||||
@ -76,7 +76,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
|
||||
REQUIRE(creator.getSerializedSize() == 13);
|
||||
creator.updateSpLengthField();
|
||||
REQUIRE(creator.getSerializedSize() == 16);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(serLen == 16);
|
||||
REQUIRE(buf[11] == 1);
|
||||
REQUIRE(buf[12] == 2);
|
||||
@ -88,7 +88,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
|
||||
auto simpleSer = SimpleSerializable();
|
||||
creator.setSerializableUserData(simpleSer);
|
||||
REQUIRE(creator.getSerializedSize() == 16);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(serLen == 16);
|
||||
REQUIRE(buf[11] == 1);
|
||||
REQUIRE(buf[12] == 2);
|
||||
@ -100,7 +100,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
|
||||
auto simpleSer = SimpleSerializable();
|
||||
creator.setSerializableUserData(simpleSer);
|
||||
REQUIRE(creator.getSerializedSize() == 16);
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(serLen == 16);
|
||||
REQUIRE(buf[11] == 1);
|
||||
REQUIRE(buf[12] == 2);
|
||||
@ -112,7 +112,7 @@ TEST_CASE("PUS TC Creator", "[pus-tc-creator]") {
|
||||
size_t deserLen = buf.size();
|
||||
const uint8_t* roPtr = buf.data();
|
||||
REQUIRE(deser.deSerialize(&roPtr, &deserLen, SerializeIF::Endianness::NETWORK) ==
|
||||
HasReturnvaluesIF::RETURN_FAILED);
|
||||
returnvalue::FAILED);
|
||||
}
|
||||
|
||||
SECTION("Serialize with invalid buffer length") {
|
||||
|
@ -16,21 +16,21 @@ TEST_CASE("PUS TC Reader", "[pus-tc-reader]") {
|
||||
PusTcReader reader;
|
||||
|
||||
SECTION("State") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.isNull());
|
||||
REQUIRE(not reader);
|
||||
PusTcReader* readerPtr = nullptr;
|
||||
bool callDelete = false;
|
||||
SECTION("Setter") {
|
||||
readerPtr = &reader;
|
||||
REQUIRE(readerPtr->setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(readerPtr->parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(readerPtr->setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
REQUIRE(readerPtr->parseDataWithCrcCheck() == returnvalue::OK);
|
||||
}
|
||||
SECTION("Directly Constructed") {
|
||||
callDelete = true;
|
||||
readerPtr = new PusTcReader(buf.data(), serLen);
|
||||
REQUIRE(not readerPtr->isNull());
|
||||
REQUIRE(readerPtr->parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(readerPtr->parseDataWithCrcCheck() == returnvalue::OK);
|
||||
}
|
||||
REQUIRE(not readerPtr->isNull());
|
||||
REQUIRE(*readerPtr);
|
||||
@ -55,26 +55,26 @@ TEST_CASE("PUS TC Reader", "[pus-tc-reader]") {
|
||||
}
|
||||
|
||||
SECTION("Invalid CRC") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
buf[11] = 0x00;
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == PusIF::INVALID_CRC_16);
|
||||
}
|
||||
|
||||
SECTION("Invalid CRC but no check") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
buf[11] = 0x00;
|
||||
REQUIRE(reader.parseDataWithoutCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.parseDataWithoutCrcCheck() == returnvalue::OK);
|
||||
}
|
||||
|
||||
SECTION("With application data") {
|
||||
auto& params = creator.getPusParams();
|
||||
std::array<uint8_t, 3> data{1, 2, 3};
|
||||
creator.setRawUserData(data.data(), data.size());
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == returnvalue::OK);
|
||||
const uint8_t* userDataPtr = reader.getUserData();
|
||||
REQUIRE(userDataPtr != nullptr);
|
||||
REQUIRE(reader.getUserDataLen() == 3);
|
||||
|
@ -45,8 +45,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
|
||||
}
|
||||
|
||||
SECTION("Serialization") {
|
||||
REQUIRE(creator.SerializeIF::serializeBe(&dataPtr, &serLen, buf.size()) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.SerializeIF::serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(buf[0] == 0x08);
|
||||
REQUIRE(buf[1] == 0xef);
|
||||
// Unsegmented is the default
|
||||
@ -90,7 +89,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
|
||||
REQUIRE(creator.getApid() == 0x3ff);
|
||||
REQUIRE(creator.getDestId() == 0xfff);
|
||||
REQUIRE(creator.getMessageTypeCounter() == 0x313);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
// Message Sequence Count
|
||||
REQUIRE(((buf[9] << 8) | buf[10]) == 0x313);
|
||||
// Destination ID
|
||||
@ -101,14 +100,14 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
|
||||
SerializeIF& deser = creator;
|
||||
const uint8_t* roDataPtr = nullptr;
|
||||
REQUIRE(deser.deSerialize(&roDataPtr, &serLen, SerializeIF::Endianness::NETWORK) ==
|
||||
HasReturnvaluesIF::RETURN_FAILED);
|
||||
returnvalue::FAILED);
|
||||
}
|
||||
|
||||
SECTION("Serialize with Raw Data") {
|
||||
std::array<uint8_t, 3> data{1, 2, 3};
|
||||
creator.setRawUserData(data.data(), data.size());
|
||||
REQUIRE(creator.getFullPacketLen() == 25);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(buf[20] == 1);
|
||||
REQUIRE(buf[21] == 2);
|
||||
REQUIRE(buf[22] == 3);
|
||||
@ -119,7 +118,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
|
||||
creator.setSerializableUserData(simpleSer);
|
||||
REQUIRE(creator.getFullPacketLen() == 25);
|
||||
REQUIRE(creator.serialize(&dataPtr, &serLen, buf.size(), SerializeIF::Endianness::NETWORK) ==
|
||||
HasReturnvaluesIF::RETURN_OK);
|
||||
returnvalue::OK);
|
||||
REQUIRE(buf[20] == 1);
|
||||
REQUIRE(buf[21] == 2);
|
||||
REQUIRE(buf[22] == 3);
|
||||
@ -151,7 +150,7 @@ TEST_CASE("PUS TM Creator", "[pus-tm-creator]") {
|
||||
SECTION("No CRC Generation") {
|
||||
creator.disableCrcCalculation();
|
||||
REQUIRE(not creator.crcCalculationEnabled());
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(serLen == 22);
|
||||
REQUIRE(buf[20] == 0x00);
|
||||
REQUIRE(buf[21] == 0x00);
|
||||
|
@ -22,12 +22,12 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
|
||||
bool deleteReader = false;
|
||||
dataPtr = buf.data();
|
||||
serLen = 0;
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(not(*readerPtr));
|
||||
REQUIRE(readerPtr->isNull());
|
||||
|
||||
SECTION("Setter") {
|
||||
REQUIRE(readerPtr->setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(readerPtr->setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
}
|
||||
SECTION("Full Construction") {
|
||||
readerPtr = new PusTmReader(&timeStamperAndReader, buf.data(), serLen);
|
||||
@ -40,7 +40,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
|
||||
}
|
||||
REQUIRE(not *readerPtr);
|
||||
REQUIRE(readerPtr->isNull());
|
||||
REQUIRE(readerPtr->parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(readerPtr->parseDataWithCrcCheck() == returnvalue::OK);
|
||||
REQUIRE(not readerPtr->isNull());
|
||||
REQUIRE(readerPtr->getService() == 17);
|
||||
REQUIRE(readerPtr->getSubService() == 2);
|
||||
@ -62,9 +62,9 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
|
||||
}
|
||||
|
||||
SECTION("Invalid CRC") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
buf[20] = 0;
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == PusIF::INVALID_CRC_16);
|
||||
}
|
||||
|
||||
@ -74,18 +74,18 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
|
||||
}
|
||||
|
||||
SECTION("Invalid CRC ignored") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
buf[20] = 0;
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.parseDataWithoutCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
REQUIRE(reader.parseDataWithoutCrcCheck() == returnvalue::OK);
|
||||
}
|
||||
|
||||
SECTION("Read with source data") {
|
||||
std::array<uint8_t, 3> data{1, 2, 3};
|
||||
creator.setRawUserData(data.data(), data.size());
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == returnvalue::OK);
|
||||
REQUIRE(reader.getUserDataLen() == 3);
|
||||
const uint8_t* roData = reader.getUserData();
|
||||
REQUIRE(roData[0] == 1);
|
||||
@ -94,7 +94,7 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
|
||||
}
|
||||
|
||||
SECTION("Invalid stream lengths") {
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
for (size_t i = 0; i < serLen - 1; i++) {
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), i) == SerializeIF::STREAM_TOO_SHORT);
|
||||
}
|
||||
@ -102,8 +102,8 @@ TEST_CASE("PUS TM Reader", "[pus-tm-reader]") {
|
||||
|
||||
SECTION("Reading timestamp fails") {
|
||||
timeStamperAndReader.nextDeserFails = true;
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == HasReturnvaluesIF::RETURN_OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == HasReturnvaluesIF::RETURN_FAILED);
|
||||
REQUIRE(creator.serializeBe(&dataPtr, &serLen, buf.size()) == returnvalue::OK);
|
||||
REQUIRE(reader.setReadOnlyData(buf.data(), serLen) == returnvalue::OK);
|
||||
REQUIRE(reader.parseDataWithCrcCheck() == returnvalue::FAILED);
|
||||
}
|
||||
}
|
@ -18,7 +18,7 @@ TEST_CASE("TM ZC Helper", "[tm-zc-helper]") {
|
||||
size_t serLen = 0;
|
||||
|
||||
SECTION("No Crash For Uninitialized Object") {
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == result::OK);
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == returnvalue::OK);
|
||||
PusTmZeroCopyWriter writer(timeStamper, dataPtr, serLen);
|
||||
REQUIRE(writer.getSequenceCount() == 22);
|
||||
writer.setSequenceCount(23);
|
||||
@ -28,9 +28,9 @@ TEST_CASE("TM ZC Helper", "[tm-zc-helper]") {
|
||||
}
|
||||
|
||||
SECTION("Basic") {
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == result::OK);
|
||||
REQUIRE(creator.serializeBe(dataPtr, serLen, buf.size()) == returnvalue::OK);
|
||||
PusTmZeroCopyWriter writer(timeStamper, dataPtr, serLen);
|
||||
REQUIRE(writer.parseDataWithoutCrcCheck() == result::OK);
|
||||
REQUIRE(writer.parseDataWithoutCrcCheck() == returnvalue::OK);
|
||||
REQUIRE(writer.getSequenceCount() == 22);
|
||||
writer.setSequenceCount(23);
|
||||
REQUIRE(writer.getSequenceCount() == 23);
|
||||
|
Reference in New Issue
Block a user