From 62d174c24e315de6f58105e11126f9977112cec9 Mon Sep 17 00:00:00 2001
From: kongr45gpen <electrovesta@gmail.com>
Date: Fri, 5 Apr 2019 02:27:31 +0300
Subject: [PATCH] Clean up of the code to fix the build
---
inc/Services/TimeBasedSchedulingService.hpp | 4 ++--
src/Helpers/TimeAndDate.cpp | 6 +++---
src/Helpers/TimeHelper.cpp | 8 ++++----
src/Service.cpp | 2 +-
test/Services/MemoryManagementService.cpp | 2 --
test/Services/TimeBasedSchedulingService.cpp | 13 ++++++++-----
6 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/inc/Services/TimeBasedSchedulingService.hpp b/inc/Services/TimeBasedSchedulingService.hpp
index 8323e732..6f6ab971 100644
--- a/inc/Services/TimeBasedSchedulingService.hpp
+++ b/inc/Services/TimeBasedSchedulingService.hpp
@@ -109,9 +109,9 @@ private:
inline void sortActivitiesReleaseTime(etl::list<ScheduledActivity,
ECSS_MAX_NUMBER_OF_TIME_SCHED_ACTIVITIES> &schedActivities) {
schedActivities.sort([](ScheduledActivity const &leftSide, ScheduledActivity const
- &rightSide) {
+ &rightSide) {
// cppcheck-suppress
- return leftSide.requestReleaseTime < rightSide.requestReleaseTime;
+ return leftSide.requestReleaseTime < rightSide.requestReleaseTime;
});
}
diff --git a/src/Helpers/TimeAndDate.cpp b/src/Helpers/TimeAndDate.cpp
index 798fd221..5fd9f0fa 100644
--- a/src/Helpers/TimeAndDate.cpp
+++ b/src/Helpers/TimeAndDate.cpp
@@ -17,9 +17,9 @@ TimeAndDate::TimeAndDate(uint16_t year, uint8_t month, uint8_t day, uint8_t hour
ASSERT_INTERNAL(2019 <= year, ErrorHandler::InternalErrorType::InvalidDate);
ASSERT_INTERNAL((1 <= month) && (month <= 12), ErrorHandler::InternalErrorType::InvalidDate);
ASSERT_INTERNAL((1 <= day) && (day <= 31), ErrorHandler::InternalErrorType::InvalidDate);
- ASSERT_INTERNAL((0 <= hour) && (hour <= 24), ErrorHandler::InternalErrorType::InvalidDate);
- ASSERT_INTERNAL((0 <= minute) && (minute <= 60), ErrorHandler::InternalErrorType::InvalidDate);
- ASSERT_INTERNAL((0 <= second) && (second <= 60), ErrorHandler::InternalErrorType::InvalidDate);
+ ASSERT_INTERNAL(hour <= 24, ErrorHandler::InternalErrorType::InvalidDate);
+ ASSERT_INTERNAL(minute <= 60, ErrorHandler::InternalErrorType::InvalidDate);
+ ASSERT_INTERNAL(second <= 60, ErrorHandler::InternalErrorType::InvalidDate);
this->year = year;
this->month = month;
diff --git a/src/Helpers/TimeHelper.cpp b/src/Helpers/TimeHelper.cpp
index 5a72e2f9..84beb4ac 100644
--- a/src/Helpers/TimeHelper.cpp
+++ b/src/Helpers/TimeHelper.cpp
@@ -18,11 +18,11 @@ uint32_t TimeHelper::utcToSeconds(TimeAndDate &TimeInfo) {
ErrorHandler::InternalErrorType::InvalidDate);
ASSERT_INTERNAL((1 <= TimeInfo.day) && (TimeInfo.day <= 31),
ErrorHandler::InternalErrorType::InvalidDate);
- ASSERT_INTERNAL((0 <= TimeInfo.hour) && (TimeInfo.hour <= 24),
+ ASSERT_INTERNAL(TimeInfo.hour <= 24,
ErrorHandler::InternalErrorType::InvalidDate);
- ASSERT_INTERNAL((0 <= TimeInfo.minute) && (TimeInfo.minute <= 60),
+ ASSERT_INTERNAL(TimeInfo.minute <= 60,
ErrorHandler::InternalErrorType::InvalidDate);
- ASSERT_INTERNAL((0 <= TimeInfo.second) && (TimeInfo.second <= 60),
+ ASSERT_INTERNAL(TimeInfo.second <= 60,
ErrorHandler::InternalErrorType::InvalidDate);
uint32_t secs = 1546300800; // elapsed seconds from Unix epoch until 1/1/2019 00:00:00 (UTC)
@@ -30,7 +30,7 @@ uint32_t TimeHelper::utcToSeconds(TimeAndDate &TimeInfo) {
secs += (IsLeapYear(y) ? 366 : 365) * SECONDS_PER_DAY;
}
for (uint16_t m = 1; m < TimeInfo.month; ++m) {
- secs += DaysOfMonth[m - 1] * SECONDS_PER_DAY;
+ secs += DaysOfMonth[m - 1u] * SECONDS_PER_DAY;
if ((m == 2u) && IsLeapYear(TimeInfo.year)) {
secs += SECONDS_PER_DAY;
}
diff --git a/src/Service.cpp b/src/Service.cpp
index 061053b1..559315bd 100644
--- a/src/Service.cpp
+++ b/src/Service.cpp
@@ -1,3 +1,3 @@
#include "Service.hpp"
-// Nothing exists here yet
\ No newline at end of file
+// Nothing exists here yet
diff --git a/test/Services/MemoryManagementService.cpp b/test/Services/MemoryManagementService.cpp
index ec1ef2d5..781aa17f 100644
--- a/test/Services/MemoryManagementService.cpp
+++ b/test/Services/MemoryManagementService.cpp
@@ -38,7 +38,6 @@ TEST_CASE("TM[6,5]", "[service][st06]") {
uint8_t checkString[ECSS_MAX_STRING_SIZE];
uint16_t readSize = 0, checksum = 0;
- MemoryManagementService memMangService;
Message receivedPacket = Message(6, 5, Message::TC, 1);
receivedPacket.appendEnum8(MemoryManagementService::MemoryID::EXTERNAL); // Memory ID
receivedPacket.appendUint16(3); // Iteration count (Equal to 3 test strings)
@@ -100,7 +99,6 @@ TEST_CASE("TM[6,9]", "[service][st06]") {
uint8_t testString_2[8] = "SecStrT";
uint16_t readSize = 0, checksum = 0;
- MemoryManagementService memMangService;
Message receivedPacket = Message(6, 9, Message::TC, 1);
receivedPacket.appendEnum8(MemoryManagementService::MemoryID::EXTERNAL); // Memory ID
receivedPacket.appendUint16(2); // Iteration count
diff --git a/test/Services/TimeBasedSchedulingService.cpp b/test/Services/TimeBasedSchedulingService.cpp
index bfa87832..daee588c 100644
--- a/test/Services/TimeBasedSchedulingService.cpp
+++ b/test/Services/TimeBasedSchedulingService.cpp
@@ -23,9 +23,12 @@ namespace unit_test {
static auto scheduledActivities(TimeBasedSchedulingService &tmService) {
std::vector<TimeBasedSchedulingService::ScheduledActivity*>listElements;
- for (auto &element : tmService.scheduledActivities) {
- listElements.push_back(&element);
- }
+ std::transform(tmService.scheduledActivities.begin(),
+ tmService.scheduledActivities.end(),
+ std::back_inserter(listElements),
+ [](auto & activity) -> auto { return &activity; }
+ );
+
return listElements; // Return the list elements
}
};
@@ -427,12 +430,12 @@ TEST_CASE("TC[11,5] Activity deletion by ID", "[service][st11]") {
TEST_CASE("TC[11,3] Reset schedule", "[service][st11]") {
TimeBasedSchedulingService timeService;
- auto scheduledActivities = activityInsertion(timeService);
+ activityInsertion(timeService);
Message receivedMessage(11, 3, Message::TC, 1);
timeService.resetSchedule(receivedMessage);
- scheduledActivities = unit_test::Tester::scheduledActivities(timeService); // Get the new list
+ auto scheduledActivities = unit_test::Tester::scheduledActivities(timeService); // Get the new list
REQUIRE(scheduledActivities.empty());
REQUIRE(not unit_test::Tester::executionFunctionStatus(timeService));
--
GitLab