diff --git a/inc/Services/RequestVerificationService.hpp b/inc/Services/RequestVerificationService.hpp index 6a8f720e22eac20a986f87a61910ce8f138dc31b..8b854dce20e134a90fbc8f2db1496c1695877120 100644 --- a/inc/Services/RequestVerificationService.hpp +++ b/inc/Services/RequestVerificationService.hpp @@ -125,7 +125,7 @@ public: * @todo execute() needs to be redefined. The /p message isn't enough to call some * subservices. More arguments are needed. */ - //void execute(const Message &message); + void execute(const Message &message); /** * The purpose of this instance is to access the execute function of this service when a diff --git a/src/MessageParser.cpp b/src/MessageParser.cpp index 540738e55be43bb02b4e30cc5b4e5cf2e60d6d8b..50c5f1ce77b1d8522892dd25d95768d53d30aef4 100644 --- a/src/MessageParser.cpp +++ b/src/MessageParser.cpp @@ -10,9 +10,9 @@ RequestVerificationService RequestVerificationService::instance; void MessageParser::execute(Message &message) { switch (message.serviceType) { - //case 1: - //RequestVerificationService::instance.execute(message); - //break; + case 1: + RequestVerificationService::instance.execute(message); + break; case 17: TestService::instance.execute(message); break; diff --git a/src/Services/RequestVerificationService.cpp b/src/Services/RequestVerificationService.cpp index c936c5822624b044a953de7a96a61b14ed5b6a9f..6a76a194415ec28a5b84bc9064c49653275ad02b 100644 --- a/src/Services/RequestVerificationService.cpp +++ b/src/Services/RequestVerificationService.cpp @@ -152,39 +152,39 @@ RequestVerificationService::failRoutingVerification(const Message &request, storeMessage(report); } -/* + void RequestVerificationService::execute(const Message &message) { switch (message.messageType) { case 1: successAcceptanceVerification(message); break; - case 2: - failAcceptanceVerification(message); - break; + //case 2: + //failAcceptanceVerification(message); + //break; case 3: successStartExecutionVerification(message); break; - case 4: - failStartExecutionVerification(message); - break; - case 5: - successProgressExecutionVerification(message); - break; - case 6: - failProgressExecutionVerification(message); - break; + //case 4: + //failStartExecutionVerification(message); + //break; + //case 5: + //successProgressExecutionVerification(message); + //break; + //case 6: + //failProgressExecutionVerification(message); + //break; case 7: successCompletionExecutionVerification(message); break; - case 8: - failCompletionExecutionVerification(message); - break; - case 10: - failRoutingVerification(message); - break; + //case 8: + //failCompletionExecutionVerification(message); + //break; + //case 10: + //failRoutingVerification(message); + //break; default: ErrorHandler::reportInternalError(ErrorHandler::UnknownMessageType); break; } } - */ + diff --git a/src/main.cpp b/src/main.cpp index cbc21f0e58fcc41033afd2a92bcd3348f2281620..435d7d03a5f374287adca1ea275827cddd99a93a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -168,12 +168,20 @@ int main() { messageParser.execute(message); // ST[01] test - //message = Message(1, 1, Message::TC, 3); - //messageParser.execute(message); + message = Message(1, 1, Message::TC, 3); + messageParser.execute(message); //message = Message(1, 2, Message::TC, 3); //messageParser.execute(message); - //message = Message(1, 7, Message::TC, 3); + message = Message(1, 3, Message::TC, 3); + messageParser.execute(message); + //message = Message(1, 4, Message::TC, 3); + //messageParser.execute(message); + //message = Message(1, 5, Message::TC, 3) + //messageParser.execute(message); + //message = Message(1, 6, Message::TC, 3) //messageParser.execute(message); + message = Message(1, 7, Message::TC, 3); + messageParser.execute(message); //message = Message(1, 8, Message::TC, 3); //messageParser.execute(message); //message = Message(1, 10, Message::TC, 3); diff --git a/test/MessageParser.cpp b/test/MessageParser.cpp index 80883eac397fedb56edf8fa9c90defa38cdf9d09..0705802571c96a7fff1367304ccfcfe060f3a857 100644 --- a/test/MessageParser.cpp +++ b/test/MessageParser.cpp @@ -5,7 +5,7 @@ #include <cstring> #include "MessageParser.hpp" #include "Services/ServiceTests.hpp" -/* + TEST_CASE("ST[01] message execution", "[MessageParser][st01]") { MessageParser messageParser; @@ -16,13 +16,41 @@ TEST_CASE("ST[01] message execution", "[MessageParser][st01]") { CHECK(response.messageType == 1); CHECK(response.packetType == Message::TM); - message = Message(1, 2, Message::TC, 2); + //message = Message(1, 2, Message::TC, 2); + //messageParser.execute(message); + //response = ServiceTests::get(1); + //CHECK(response.serviceType == 1); + //CHECK(response.messageType == 2); + //CHECK(response.packetType == Message::TM); + + message = Message(1, 3, Message::TC, 2); messageParser.execute(message); response = ServiceTests::get(1); CHECK(response.serviceType == 1); - CHECK(response.messageType == 2); + CHECK(response.messageType == 3); CHECK(response.packetType == Message::TM); + + //message = Message(1, 4, Message::TC, 2); + //messageParser.execute(message); + //response = ServiceTests::get(2); + //CHECK(response.serviceType == 1); + //CHECK(response.messageType == 4); + //CHECK(response.packetType == Message::TM); + + //message = Message(1, 5, Message::TC, 2); + //messageParser.execute(message); + //response = ServiceTests::get(2); + //CHECK(response.serviceType == 1); + //CHECK(response.messageType == 5); + //CHECK(response.packetType == Message::TM); + //message = Message(1, 6, Message::TC, 2); + //messageParser.execute(message); + //response = ServiceTests::get(2); + //CHECK(response.serviceType == 1); + //CHECK(response.messageType == 6); + //CHECK(response.packetType == Message::TM); + message = Message(1, 7, Message::TC, 2); messageParser.execute(message); response = ServiceTests::get(2); @@ -30,21 +58,21 @@ TEST_CASE("ST[01] message execution", "[MessageParser][st01]") { CHECK(response.messageType == 7); CHECK(response.packetType == Message::TM); - message = Message(1, 8, Message::TC, 2); - messageParser.execute(message); - response = ServiceTests::get(3); - CHECK(response.serviceType == 1); - CHECK(response.messageType == 8); - CHECK(response.packetType == Message::TM); + //message = Message(1, 8, Message::TC, 2); + //messageParser.execute(message); + //response = ServiceTests::get(3); + //CHECK(response.serviceType == 1); + //CHECK(response.messageType == 8); + //CHECK(response.packetType == Message::TM); - message = Message(1, 10, Message::TC, 2); - messageParser.execute(message); - response = ServiceTests::get(4); - CHECK(response.serviceType == 1); - CHECK(response.messageType == 10); - CHECK(response.packetType == Message::TM); + //message = Message(1, 10, Message::TC, 2); + //messageParser.execute(message); + //response = ServiceTests::get(4); + //CHECK(response.serviceType == 1); + //CHECK(response.messageType == 10); + //CHECK(response.packetType == Message::TM); } -*/ + TEST_CASE("ST[17] message execution", "[MessageParser][st17]") { MessageParser messageParser;