From 031abfdd0049036f69e77defb8422837de26de03 Mon Sep 17 00:00:00 2001
From: Dimitrios Stoupis <dimitris.apple@gmail.com>
Date: Wed, 20 Mar 2019 11:31:27 +0000
Subject: [PATCH] Made tests independant of each other (fingers crossed for the
pipeline)
---
test/Services/TimeBasedSchedulingService.cpp | 283 +++++++++++--------
1 file changed, 160 insertions(+), 123 deletions(-)
diff --git a/test/Services/TimeBasedSchedulingService.cpp b/test/Services/TimeBasedSchedulingService.cpp
index 4238896c..d02a55ed 100644
--- a/test/Services/TimeBasedSchedulingService.cpp
+++ b/test/Services/TimeBasedSchedulingService.cpp
@@ -22,79 +22,91 @@ namespace unit_test {
};
}
-
Message testMessage1, testMessage2, testMessage3, testMessage4;
-TimeBasedSchedulingService timeSchedulingService;
MessageParser msgParser;
-
auto currentTime = static_cast<uint32_t >(time(nullptr)); // Get the current system time
-
-
-TEST_CASE("TC(11,1) Enable Schedule Execution", "[service][st11]") {
- Message receivedMessage(11, 1, Message::TC, 1);
-
- timeSchedulingService.enableScheduleExecution(receivedMessage);
- CHECK(unit_test::Tester::executionFunctionStatus(timeSchedulingService));
-}
-
-TEST_CASE("TC(11,2) Disable Schedule Execution", "[service][st11]") {
- Message receivedMessage(11, 2, Message::TC, 1);
-
- timeSchedulingService.disableScheduleExecution(receivedMessage);
- CHECK(not unit_test::Tester::executionFunctionStatus(timeSchedulingService));
-}
-
-TEST_CASE("TC(11,4) Activity Insertion", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
-
- // Initialize the test messages
- testMessage1.serviceType = 6;
- testMessage1.messageType = 5;
- testMessage1.packetType = Message::TC;
- testMessage1.applicationId = 8; // todo: Remove the dummy application ID
-
- testMessage2.serviceType = 4;
- testMessage2.messageType = 5;
- testMessage2.packetType = Message::TC;
- testMessage2.applicationId = 4; // todo: Remove the dummy application ID
-
- testMessage3.serviceType = 3;
- testMessage3.messageType = 2;
- testMessage3.packetType = Message::TC;
-
- testMessage4.serviceType = 12;
- testMessage4.messageType = 23;
- testMessage4.packetType = Message::TC;
+bool messagesPopulated = false; // Indicate whether the test messages are initialized
+
+// Run this function to set the service up before moving on with further testing
+auto activityInsertion(TimeBasedSchedulingService &timeService) {
+ auto scheduledActivities = unit_test::Tester::scheduledActivities(timeService);
+
+ if (not messagesPopulated) {
+ // Initialize the test messages
+ testMessage1.serviceType = 6;
+ testMessage1.messageType = 5;
+ testMessage1.packetType = Message::TC;
+ testMessage1.applicationId = 8; // todo: Remove the dummy application ID
+ testMessage1.appendUint16(4253); // Append dummy data
+
+ testMessage2.serviceType = 4;
+ testMessage2.messageType = 5;
+ testMessage2.packetType = Message::TC;
+ testMessage2.applicationId = 4; // todo: Remove the dummy application ID
+ testMessage2.appendUint16(45667); // Append dummy data
+
+ testMessage3.serviceType = 3;
+ testMessage3.messageType = 2;
+ testMessage3.packetType = Message::TC;
+ testMessage3.appendUint16(456); // Append dummy data
+
+ testMessage4.serviceType = 12;
+ testMessage4.messageType = 23;
+ testMessage4.packetType = Message::TC;
+ testMessage4.appendUint16(934); // Append dummy data
+
+ messagesPopulated = true; // Indicate initialized test messages
+ }
Message receivedMessage(11, 4, Message::TC, 1);
receivedMessage.appendUint16(4); // Total number of requests
// Test activity 1
- testMessage1.appendUint16(4253); // Append dummy data
receivedMessage.appendUint32(currentTime + 1556435);
receivedMessage.appendString(msgParser.convertTCToStr(testMessage1));
// Test activity 2
- testMessage2.appendUint16(45667); // Append dummy data
receivedMessage.appendUint32(currentTime + 1957232);
receivedMessage.appendString(msgParser.convertTCToStr(testMessage2));
// Test activity 3
- testMessage3.appendUint16(456); // Append dummy data
receivedMessage.appendUint32(currentTime + 1726435);
receivedMessage.appendString(msgParser.convertTCToStr(testMessage3));
// Test activity 4
- testMessage4.appendUint16(934); // Append dummy data
receivedMessage.appendUint32(currentTime + 17248435);
receivedMessage.appendString(msgParser.convertTCToStr(testMessage4));
// Insert activities in the schedule. They have to be inserted sorted
- timeSchedulingService.insertActivities(receivedMessage);
+ timeService.insertActivities(receivedMessage);
+
+ return scheduledActivities; // Return the activities vector
+}
+
+
+TEST_CASE("TC[11,1] Enable Schedule Execution", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ Message receivedMessage(11, 1, Message::TC, 1);
+
+ timeService.enableScheduleExecution(receivedMessage);
+ CHECK(unit_test::Tester::executionFunctionStatus(timeService));
+}
+
+TEST_CASE("TC[11,2] Disable Schedule Execution", "[service][st11]") {
+ Message receivedMessage(11, 2, Message::TC, 1);
+ TimeBasedSchedulingService timeService;
+
+ timeService.disableScheduleExecution(receivedMessage);
+ CHECK(not unit_test::Tester::executionFunctionStatus(timeService));
+}
+
+TEST_CASE("TC[11,4] Activity Insertion", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
CHECK(scheduledActivities->size() == 4);
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
REQUIRE(scheduledActivities->at(0).requestReleaseTime == currentTime + 1556435);
REQUIRE(scheduledActivities->at(1).requestReleaseTime == currentTime + 1726435);
REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232);
@@ -103,92 +115,103 @@ TEST_CASE("TC(11,4) Activity Insertion", "[service][st11]") {
REQUIRE(scheduledActivities->at(1).request == testMessage3);
REQUIRE(scheduledActivities->at(2).request == testMessage2);
REQUIRE(scheduledActivities->at(3).request == testMessage4);
-
- scheduledActivities->at(0).requestID.applicationID = 8; // Append a dummy application ID
- scheduledActivities->at(2).requestID.applicationID = 4; // Append a dummy application ID
}
TEST_CASE("TC[11,15] Time shift all scheduled activities (Positive shift)", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
const int32_t timeShift = 6789;
- SECTION("Positive Shift") {
- Message receivedMessage(11, 15, Message::TC, 1);
- receivedMessage.appendSint32(timeShift);
+ Message receivedMessage(11, 15, Message::TC, 1);
+ receivedMessage.appendSint32(timeShift);
- CHECK(scheduledActivities->size() == 4);
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 4);
- timeSchedulingService.timeShiftAllActivities(receivedMessage);
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ timeService.timeShiftAllActivities(receivedMessage);
- REQUIRE(scheduledActivities->at(0).requestReleaseTime == currentTime + 1556435 + timeShift);
- REQUIRE(scheduledActivities->at(1).requestReleaseTime == currentTime + 1726435 + timeShift);
- REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232 + timeShift);
- REQUIRE(
- scheduledActivities->at(3).requestReleaseTime == currentTime + 17248435 + timeShift);
- }
+ REQUIRE(scheduledActivities->at(0).requestReleaseTime == currentTime + 1556435 + timeShift);
+ REQUIRE(scheduledActivities->at(1).requestReleaseTime == currentTime + 1726435 + timeShift);
+ REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232 + timeShift);
+ REQUIRE(scheduledActivities->at(3).requestReleaseTime == currentTime + 17248435 + timeShift);
+}
- SECTION("Negative Shift") {
- Message receivedMessage(11, 15, Message::TC, 1);
- receivedMessage.appendSint32(-timeShift);
+TEST_CASE("TC[11,15] Time shift all scheduled activities (Negative shift)", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
+ const int32_t timeShift = 6789;
- CHECK(scheduledActivities->size() == 4);
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 4);
- timeSchedulingService.timeShiftAllActivities(receivedMessage);
+ Message receivedMessage(11, 15, Message::TC, 1);
+ receivedMessage.appendSint32(-timeShift);
+
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ timeService.timeShiftAllActivities(receivedMessage);
+
+ REQUIRE(scheduledActivities->at(0).requestReleaseTime == currentTime + 1556435 - timeShift);
+ REQUIRE(scheduledActivities->at(1).requestReleaseTime == currentTime + 1726435 - timeShift);
+ REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232 - timeShift);
+ REQUIRE(scheduledActivities->at(3).requestReleaseTime == currentTime + 17248435 - timeShift);
- REQUIRE(scheduledActivities->at(0).requestReleaseTime == currentTime + 1556435);
- REQUIRE(scheduledActivities->at(1).requestReleaseTime == currentTime + 1726435);
- REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232);
- REQUIRE(scheduledActivities->at(3).requestReleaseTime == currentTime + 17248435);
- }
}
-TEST_CASE("TC[11,7] Time shift activities by ID", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+TEST_CASE("TC[11,7] Time shift activities by ID (Positive Shift)", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
const int32_t timeShift = 6789; // Relative time-shift value
- SECTION("Positive Shift") {
- // Verify that everything is in place
- CHECK(scheduledActivities->size() == 4);
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 4);
+ // Verify that everything is in place
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ scheduledActivities->at(2).requestID.applicationID = 4; // Append a dummy application ID
- Message receivedMessage(11, 7, Message::TC, 1);
- receivedMessage.appendSint32(timeShift); // Time-shift value
- receivedMessage.appendUint16(1); // Just one instruction to time-shift an activity
- receivedMessage.appendUint8(0); // Source ID is not implemented
- receivedMessage.appendUint16(testMessage2.applicationId); // todo: Remove the dummy app ID
- receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
+ Message receivedMessage(11, 7, Message::TC, 1);
+ receivedMessage.appendSint32(timeShift); // Time-shift value
+ receivedMessage.appendUint16(1); // Just one instruction to time-shift an activity
+ receivedMessage.appendUint8(0); // Source ID is not implemented
+ receivedMessage.appendUint16(testMessage2.applicationId); // todo: Remove the dummy app ID
+ receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
- timeSchedulingService.timeShiftActivitiesByID(receivedMessage);
+ timeService.timeShiftActivitiesByID(receivedMessage);
- REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232 + timeShift);
- REQUIRE(scheduledActivities->at(2).request == testMessage2);
- }
+ REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232 + timeShift);
+ REQUIRE(scheduledActivities->at(2).request == testMessage2);
+}
- SECTION("Negative Shift") {
- // Verify that everything is in place
- CHECK(scheduledActivities->size() == 4);
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 4);
+TEST_CASE("TC[11,7] Time shift activities by ID (Negative Shift)", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
+ const int32_t timeShift = 6789; // Relative time-shift value
+
+ // Verify that everything is in place
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ scheduledActivities->at(2).requestID.applicationID = 4; // Append a dummy application ID
- Message receivedMessage(11, 7, Message::TC, 1);
- receivedMessage.appendSint32(-timeShift); // Time-shift value
- receivedMessage.appendUint16(1); // Just one instruction to time-shift an activity
- receivedMessage.appendUint8(0); // Source ID is not implemented
- receivedMessage.appendUint16(testMessage2.applicationId); // todo: Remove the dummy app ID
- receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
+ Message receivedMessage(11, 7, Message::TC, 1);
+ receivedMessage.appendSint32(-timeShift); // Time-shift value
+ receivedMessage.appendUint16(1); // Just one instruction to time-shift an activity
+ receivedMessage.appendUint8(0); // Source ID is not implemented
+ receivedMessage.appendUint16(testMessage2.applicationId); // todo: Remove the dummy app ID
+ receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
- timeSchedulingService.timeShiftActivitiesByID(receivedMessage);
+ timeService.timeShiftActivitiesByID(receivedMessage);
- REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232);
- REQUIRE(scheduledActivities->at(2).request == testMessage2);
- }
+ REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 1957232 - timeShift);
+ REQUIRE(scheduledActivities->at(2).request == testMessage2);
}
TEST_CASE("TC[11,9] Detail report scheduled activities by ID", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
+ // Verify that everything is in place
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ scheduledActivities->at(0).requestID.applicationID = 8; // Append a dummy application ID
+ scheduledActivities->at(2).requestID.applicationID = 4; // Append a dummy application ID
Message receivedMessage(11, 9, Message::TC, 1);
receivedMessage.appendUint16(2); // Two instructions in the request
@@ -200,7 +223,7 @@ TEST_CASE("TC[11,9] Detail report scheduled activities by ID", "[service][st11]"
receivedMessage.appendUint16(testMessage1.applicationId); // todo: Remove the dummy app ID
receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
- timeSchedulingService.detailReportActivitiesByID(receivedMessage);
+ timeService.detailReportActivitiesByID(receivedMessage);
REQUIRE(ServiceTests::hasOneMessage());
Message response = ServiceTests::get(0);
@@ -227,8 +250,14 @@ TEST_CASE("TC[11,9] Detail report scheduled activities by ID", "[service][st11]"
}
TEST_CASE("TC[11,12] Summary report scheduled activities by ID", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
+ // Verify that everything is in place
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ scheduledActivities->at(0).requestID.applicationID = 8; // Append a dummy application ID
+ scheduledActivities->at(2).requestID.applicationID = 4; // Append a dummy application ID
Message receivedMessage(11, 12, Message::TC, 1);
receivedMessage.appendUint16(2); // Two instructions in the request
@@ -240,7 +269,7 @@ TEST_CASE("TC[11,12] Summary report scheduled activities by ID", "[service][st11
receivedMessage.appendUint16(testMessage1.applicationId); // todo: Remove the dummy app ID
receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
- timeSchedulingService.summaryReportActivitiesByID(receivedMessage);
+ timeService.summaryReportActivitiesByID(receivedMessage);
REQUIRE(ServiceTests::hasOneMessage());
Message response = ServiceTests::get(0);
@@ -269,10 +298,11 @@ TEST_CASE("TC[11,12] Summary report scheduled activities by ID", "[service][st11
}
TEST_CASE("TC[11,16] Detail report all scheduled activities", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
Message receivedMessage(11, 16, Message::TC, 1);
- timeSchedulingService.detailReportAllActivities(receivedMessage);
+ timeService.detailReportAllActivities(receivedMessage);
REQUIRE(ServiceTests::hasOneMessage());
Message response = ServiceTests::get(0);
@@ -281,7 +311,7 @@ TEST_CASE("TC[11,16] Detail report all scheduled activities", "[service][st11]")
uint16_t iterationCount = response.readUint16();
REQUIRE(iterationCount == scheduledActivities->size());
- REQUIRE(iterationCount == *unit_test::Tester::currentNumberOfActivities(timeSchedulingService));
+ REQUIRE(iterationCount == *unit_test::Tester::currentNumberOfActivities(timeService));
for (uint16_t i = 0; i < iterationCount; i++) {
uint32_t receivedReleaseTime = response.readUint32();
@@ -295,33 +325,40 @@ TEST_CASE("TC[11,16] Detail report all scheduled activities", "[service][st11]")
REQUIRE(receivedTCPacket == scheduledActivities->at(i).request);
}
}
-/*
-TEST_CASE("TC[12,5] Activity deletion by ID", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+
+TEST_CASE("TC[11,5] Activity deletion by ID", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
+
+ // Verify that everything is in place
+ CHECK(scheduledActivities->size() == 4);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ scheduledActivities->at(2).requestID.applicationID = 4; // Append a dummy application ID
Message receivedMessage(11, 5, Message::TC, 1);
receivedMessage.appendUint16(1); // Just one instruction to delete an activity
receivedMessage.appendUint8(0); // Source ID is not implemented
- receivedMessage.appendUint16(4); // todo: Remove the dummy ID when implemented
+ receivedMessage.appendUint16(testMessage2.applicationId); // todo: Remove the dummy app ID
receivedMessage.appendUint16(0); // todo: Remove the dummy sequence count
CHECK(scheduledActivities->size() == 4);
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 4);
- timeSchedulingService.deleteActivitiesByID(receivedMessage);
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 4);
+ timeService.deleteActivitiesByID(receivedMessage);
- CHECK(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 3);
+ CHECK(*unit_test::Tester::currentNumberOfActivities(timeService) == 3);
REQUIRE(scheduledActivities->size() == 3);
REQUIRE(scheduledActivities->at(2).requestReleaseTime == currentTime + 17248435);
REQUIRE(scheduledActivities->at(2).request == testMessage4);
}
-*/
-TEST_CASE("TC(11,3) Reset schedule", "[service][st11]") {
- auto scheduledActivities = unit_test::Tester::scheduledActivities(timeSchedulingService);
+
+TEST_CASE("TC[11,3] Reset schedule", "[service][st11]") {
+ TimeBasedSchedulingService timeService;
+ auto scheduledActivities = activityInsertion(timeService);
Message receivedMessage(11, 3, Message::TC, 1);
- timeSchedulingService.resetSchedule(receivedMessage);
+ timeService.resetSchedule(receivedMessage);
REQUIRE(scheduledActivities->empty());
- REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeSchedulingService) == 0);
- REQUIRE(not unit_test::Tester::executionFunctionStatus(timeSchedulingService));
+ REQUIRE(*unit_test::Tester::currentNumberOfActivities(timeService) == 0);
+ REQUIRE(not unit_test::Tester::executionFunctionStatus(timeService));
}
--
GitLab