merge retval refactoring
This commit is contained in:
@ -35,13 +35,13 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
REQUIRE(fifo.empty());
|
||||
REQUIRE(not fifo.full());
|
||||
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(FIFOBase<Test>::FULL));
|
||||
|
||||
struct Test testptr;
|
||||
REQUIRE(fifo.peek(&testptr) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.peek(&testptr) == static_cast<int>(returnvalue::OK));
|
||||
bool equal = testptr == structOne;
|
||||
REQUIRE(equal);
|
||||
REQUIRE(fifo.size() == 3);
|
||||
@ -52,7 +52,7 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
testptr.number1 = 0;
|
||||
testptr.number2 = 0;
|
||||
testptr.number3 = 0;
|
||||
REQUIRE(fifo.retrieve(&testptr) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.retrieve(&testptr) == static_cast<int>(returnvalue::OK));
|
||||
equal = testptr == list[i];
|
||||
REQUIRE(equal);
|
||||
REQUIRE(fifo.size() == i);
|
||||
@ -66,29 +66,29 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
REQUIRE(fifo.empty());
|
||||
REQUIRE(fifo.pop() == static_cast<int>(FIFOBase<Test>::EMPTY));
|
||||
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 1);
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 2);
|
||||
REQUIRE(fifo.pop() == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.pop() == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 1);
|
||||
testptr.number1 = 0;
|
||||
testptr.number2 = 0;
|
||||
testptr.number3 = 0;
|
||||
REQUIRE(fifo.peek(&testptr) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.peek(&testptr) == static_cast<int>(returnvalue::OK));
|
||||
equal = testptr == structTwo;
|
||||
REQUIRE(equal);
|
||||
REQUIRE(fifo.pop() == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.pop() == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 0);
|
||||
REQUIRE(fifo.empty());
|
||||
// struct Test* ptr = nullptr;
|
||||
// REQUIRE(fifo.retrieve(ptr) == static_cast<int>(HasReturnvaluesIF::RETURN_FAILED));
|
||||
// REQUIRE(fifo.peek(ptr) == static_cast<int>(HasReturnvaluesIF::RETURN_FAILED));
|
||||
// REQUIRE(fifo.retrieve(ptr) == static_cast<int>(HasReturnvaluesIF::returnvalue::FAILED));
|
||||
// REQUIRE(fifo.peek(ptr) == static_cast<int>(HasReturnvaluesIF::returnvalue::FAILED));
|
||||
};
|
||||
SECTION("Copy Test") {
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 3);
|
||||
REQUIRE(fifo.full());
|
||||
REQUIRE(not fifo.empty());
|
||||
@ -100,9 +100,9 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
};
|
||||
|
||||
SECTION("Assignment Test") {
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 3);
|
||||
REQUIRE(fifo.full());
|
||||
REQUIRE(not fifo.empty());
|
||||
@ -114,7 +114,7 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
REQUIRE(not fifo2.empty());
|
||||
for (size_t i = 2; i < 3; i--) {
|
||||
struct Test testptr = {0, 0, 0};
|
||||
REQUIRE(fifo2.retrieve(&testptr) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo2.retrieve(&testptr) == static_cast<int>(returnvalue::OK));
|
||||
bool equal = testptr == list[i];
|
||||
REQUIRE(equal);
|
||||
REQUIRE(fifo2.size() == i);
|
||||
@ -122,9 +122,9 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
};
|
||||
|
||||
SECTION("Assignment Test Smaller") {
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo.insert(structOne) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structTwo) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.insert(structThree) == static_cast<int>(returnvalue::OK));
|
||||
REQUIRE(fifo.size() == 3);
|
||||
REQUIRE(fifo.full());
|
||||
REQUIRE(not fifo.empty());
|
||||
@ -136,7 +136,7 @@ TEST_CASE("Dynamic Fifo Tests", "[TestDynamicFifo]") {
|
||||
REQUIRE(not fifo2.empty());
|
||||
for (size_t i = 2; i < 3; i--) {
|
||||
struct Test testptr = {0, 0, 0};
|
||||
REQUIRE(fifo2.retrieve(&testptr) == static_cast<int>(HasReturnvaluesIF::RETURN_OK));
|
||||
REQUIRE(fifo2.retrieve(&testptr) == static_cast<int>(returnvalue::OK));
|
||||
bool equal = testptr == list[i];
|
||||
REQUIRE(equal);
|
||||
REQUIRE(fifo2.size() == i);
|
||||
|
Reference in New Issue
Block a user