From a71f6c236c067cb0e200427314af85f172593b49 Mon Sep 17 00:00:00 2001
From: Dimitrios Stoupis <dimitris.apple@gmail.com>
Date: Thu, 21 Mar 2019 01:12:43 +0000
Subject: [PATCH] Documentation update and function renaming
---
src/Services/TimeBasedSchedulingService.cpp | 6 +++---
test/Services/TimeBasedSchedulingService.cpp | 5 +++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/Services/TimeBasedSchedulingService.cpp b/src/Services/TimeBasedSchedulingService.cpp
index 3db87787..0d2f86b2 100644
--- a/src/Services/TimeBasedSchedulingService.cpp
+++ b/src/Services/TimeBasedSchedulingService.cpp
@@ -44,7 +44,7 @@ void TimeBasedSchedulingService::insertActivities(Message &request) {
uint16_t iterationCount = request.readUint16(); // Get the iteration count, (N)
for (std::size_t i = 0; i < iterationCount; i++) {
// todo: Get the group ID first, if groups are used
- uint32_t currentTime = TimeGetter::getUnixSeconds(); // Get the current system time
+ uint32_t currentTime = TimeGetter::getSeconds(); // Get the current system time
uint32_t releaseTime = request.readUint32(); // Get the specified release time
if ((scheduledActivities.size() >= ECSS_MAX_NUMBER_OF_TIME_SCHED_ACTIVITIES) ||
@@ -78,7 +78,7 @@ void TimeBasedSchedulingService::timeShiftAllActivities(Message &request) {
assert(request.serviceType == 11);
assert(request.messageType == 15);
- uint32_t current_time = TimeGetter::getUnixSeconds(); // Get the current system time
+ uint32_t current_time = TimeGetter::getSeconds(); // Get the current system time
// Find the earliest release time. It will be the first element of the iterator pair
const auto releaseTimes = etl::minmax_element(scheduledActivities.begin(),
@@ -108,7 +108,7 @@ void TimeBasedSchedulingService::timeShiftActivitiesByID(Message &request) {
assert(request.serviceType == 11);
assert(request.messageType == 7);
- uint32_t current_time = TimeGetter::getUnixSeconds(); // Get the current system time
+ uint32_t current_time = TimeGetter::getSeconds(); // Get the current system time
int32_t relativeOffset = request.readSint32(); // Get the offset first
diff --git a/test/Services/TimeBasedSchedulingService.cpp b/test/Services/TimeBasedSchedulingService.cpp
index 5f8a2eda..eeaca6eb 100644
--- a/test/Services/TimeBasedSchedulingService.cpp
+++ b/test/Services/TimeBasedSchedulingService.cpp
@@ -5,6 +5,11 @@
#include <ctime>
#include <vector>
+/*
+ * A namespace defined explicitly for the purposes of testing. This namespace contains a
+ * structure, which has been declared as a friend in the TimeBasedSchedulingService class, so
+ * that it can access the private members required for testing validation.
+ */
namespace unit_test {
struct Tester {
static bool executionFunctionStatus(TimeBasedSchedulingService &tmService) {
--
GitLab