From d607c943515b12c8fbcd89b7ab4bb73db5be4869 Mon Sep 17 00:00:00 2001
From: athatheo <vostidi@hotmail.com>
Date: Fri, 8 Mar 2019 15:18:35 +0200
Subject: [PATCH] Changed check values for the delete event action definition
and some test values that were wrong --- Ready to merge
---
src/Services/EventActionService.cpp | 2 +-
test/Services/EventActionService.cpp | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/Services/EventActionService.cpp b/src/Services/EventActionService.cpp
index 5b5fd201..34cd3783 100644
--- a/src/Services/EventActionService.cpp
+++ b/src/Services/EventActionService.cpp
@@ -59,7 +59,7 @@ void EventActionService::deleteEventActionDefinitions(Message message) {
for (uint16_t index = 0; index < ECSS_EVENT_ACTION_STRUCT_ARRAY_SIZE; index++) {
if (eventActionDefinitionArray[index].applicationId == applicationID &&
eventActionDefinitionArray[index].eventDefinitionID == eventDefinitionID &&
- eventActionDefinitionArray[index].enabled == false) {
+ eventActionDefinitionArray[index].enabled == true) {
eventActionDefinitionArray[index].empty = true;
eventActionDefinitionArray[index].eventDefinitionID = 65535;
eventActionDefinitionArray[index].request = "";
diff --git a/test/Services/EventActionService.cpp b/test/Services/EventActionService.cpp
index be585f18..a9d6ac01 100644
--- a/test/Services/EventActionService.cpp
+++ b/test/Services/EventActionService.cpp
@@ -169,14 +169,16 @@ TEST_CASE("Enable event-action definitions TC[19,4]", "[service][st09]") {
eventActionService.addEventActionDefinitions(message0);
Message message1(19, 1, Message::TC, 0);
message1.appendEnum16(1);
- message1.appendEnum16(0);
+ message1.appendEnum16(1);
data = "00";
message1.appendString(data);
eventActionService.addEventActionDefinitions(message1);
Message message2(19, 4, Message::TC, 0);
- message2.appendUint16(1);
+ message2.appendUint16(2);
message2.appendEnum16(1);
message2.appendEnum16(0);
+ message2.appendEnum16(1);
+ message2.appendEnum16(1);
eventActionService.enableEventActionDefinitions(message2);
CHECK(eventActionService.eventActionDefinitionArray[0].enabled == 1);
CHECK(eventActionService.eventActionDefinitionArray[1].enabled == 1);
--
GitLab