eive/fsfw
eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed another issue of time checks

Browse Source
This commit is contained in:
Steffen Gaisser 2022-03-07 18:33:24 +01:00
parent 8b1af232c3
commit a4f97a7ba7
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/src/fsfw_tests/unit/datapoollocal/LocalPoolManagerTest.cpp
View File

@ -94,10 +94,8 @@ TEST_CASE("LocalPoolManagerTest", "[LocManTest]") {
poolOwner->dataset.setChanged(true); poolOwner->dataset.setChanged(true);
/* Store current time, we are going to check the (approximate) time equality later */ /* Store current time, we are going to check the (approximate) time equality later */
CCSDSTime::CDS_short timeCdsNow;
timeval now; timeval now;
Clock::getClock_timeval(&now); Clock::getClock_timeval(&now);
CCSDSTime::convertToCcsds(&timeCdsNow, &now);
/* Trigger generation of snapshot */ /* Trigger generation of snapshot */
REQUIRE(poolOwner->poolManager.performHkOperation() == retval::CATCH_OK); REQUIRE(poolOwner->poolManager.performHkOperation() == retval::CATCH_OK);
@ -132,13 +130,11 @@ TEST_CASE("LocalPoolManagerTest", "[LocManTest]") {
CHECK(newSet.localPoolUint16Vec.value[2] == 42932); CHECK(newSet.localPoolUint16Vec.value[2] == 42932);
/* Now we check that both times are equal */ /* Now we check that both times are equal */
CHECK(cdsShort.pField == timeCdsNow.pField); timeval timeFromHK;
CHECK(cdsShort.dayLSB == Catch::Approx(timeCdsNow.dayLSB).margin(1)); auto result = CCSDSTime::convertFromCDS(&timeFromHK, &cdsShort);
CHECK(cdsShort.dayMSB == Catch::Approx(timeCdsNow.dayMSB).margin(1)); CHECK(result == HasReturnvaluesIF::RETURN_OK);
CHECK(cdsShort.msDay_h == Catch::Approx(timeCdsNow.msDay_h).margin(1)); timeval difference = timeFromHK - now;
CHECK(cdsShort.msDay_hh == Catch::Approx(timeCdsNow.msDay_hh).margin(1)); CHECK(timevalOperations::toDouble(difference) < 1.0);
CHECK(cdsShort.msDay_l == Catch::Approx(timeCdsNow.msDay_l).margin(1));
CHECK(cdsShort.msDay_ll == Catch::Approx(timeCdsNow.msDay_ll).margin(5));
} }
SECTION("VariableSnapshotTest") { SECTION("VariableSnapshotTest") {
@ -190,10 +186,10 @@ TEST_CASE("LocalPoolManagerTest", "[LocManTest]") {
SerializeIF::Endianness::MACHINE) == retval::CATCH_OK); SerializeIF::Endianness::MACHINE) == retval::CATCH_OK);
CHECK(varCopy.value == 25); CHECK(varCopy.value == 25);
/* Now we check that both times are equal */
timeval timeFromHK; timeval timeFromHK;
auto result = CCSDSTime::convertFromCDS(&timeFromHK, &cdsShort); auto result = CCSDSTime::convertFromCDS(&timeFromHK, &cdsShort);
CHECK(result == HasReturnvaluesIF::RETURN_OK); CHECK(result == HasReturnvaluesIF::RETURN_OK);
/// timeval* to, const uint8_t* from, size_t* foundLength,size_t maxLength)
timeval difference = timeFromHK - now; timeval difference = timeFromHK - now;
CHECK(timevalOperations::toDouble(difference) < 1.0); CHECK(timevalOperations::toDouble(difference) < 1.0);
} }