X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FEventOperation.cpp;h=f21f729b8b6870cf5fdafea024b60bba9881b179;hb=HEAD;hp=2b4248615099becb70b7b1f9e735522a85d97f0c;hpb=cef452116c2966d7eaa65ff31ee7613bf3ae1b93;p=anna.git

diff --git a/example/diameter/launcher/EventOperation.cpp b/example/diameter/launcher/EventOperation.cpp
index 2b42486..cab0e83 100644
--- a/example/diameter/launcher/EventOperation.cpp
+++ b/example/diameter/launcher/EventOperation.cpp
@@ -465,23 +465,23 @@ bool EventOperation::answermsg_action_2e(std::string &response, const std::strin
     int code = message->getId().first;
     LOGDEBUG(anna::Logger::debug("Adding a new programed 'answer to entity' to the FIFO queue corresponding to its message code ...", ANNA_FILE_LOCATION));
     response = "Added 'answer to entity' to the FIFO queue corresponding to its message code";
-    my_app.getOperatedEntity()->getReactingAnswers()->addMessage(code, message);
+    my_app.getOperatedHost()->getReactingAnswers()->addMessage(code, message);
   }
   else { // action
 
     if(diameterJson_or_action == "list") { // programmed answers FIFO's to stdout
-      response = anna::functions::encodeBase64(my_app.getOperatedEntity()->getReactingAnswers()->asString("ANSWERS TO ENTITY"));
+      response = anna::functions::encodeBase64(my_app.getOperatedHost()->getReactingAnswers()->asString("ANSWERS TO ENTITY"));
     } else if (diameterJson_or_action == "rotate") {
-      my_app.getOperatedEntity()->getReactingAnswers()->rotate(true);
+      my_app.getOperatedHost()->getReactingAnswers()->rotate(true);
       response = "rotate";
     } else if (diameterJson_or_action == "exhaust") {
-      my_app.getOperatedEntity()->getReactingAnswers()->rotate(false);
+      my_app.getOperatedHost()->getReactingAnswers()->rotate(false);
       response = "exhaust";
     } else if (diameterJson_or_action == "clear") {
-      my_app.getOperatedEntity()->getReactingAnswers()->clear();
+      my_app.getOperatedHost()->getReactingAnswers()->clear();
       response = "clear";
     } else if (diameterJson_or_action == "dump") {
-      my_app.getOperatedEntity()->getReactingAnswers()->dump("programmed_answer");
+      my_app.getOperatedHost()->getReactingAnswers()->dump("programmed_answer");
       response = "dump";
     }
   }
@@ -523,24 +523,24 @@ bool EventOperation::answermsg_action_2c(std::string &response, const std::strin
 
     int code = message->getId().first;
     LOGDEBUG(anna::Logger::debug("Adding a new programed 'answer to client' to the FIFO queue corresponding to its message code ...", ANNA_FILE_LOCATION));
-    my_app.getOperatedServer()->getReactingAnswers()->addMessage(code, message);
+    my_app.getOperatedHost()->getReactingAnswers()->addMessage(code, message);
     response = "Added 'answer to client' to the FIFO queue corresponding to its message code";
   }
   else { // action
 
     if(diameterJson_or_action == "list") { // programmed answers FIFO's to stdout
-      response = anna::functions::encodeBase64(my_app.getOperatedServer()->getReactingAnswers()->asString("ANSWERS TO CLIENT"));
+      response = anna::functions::encodeBase64(my_app.getOperatedHost()->getReactingAnswers()->asString("ANSWERS TO CLIENT"));
     } else if (diameterJson_or_action == "rotate") {
-      my_app.getOperatedServer()->getReactingAnswers()->rotate(true);
+      my_app.getOperatedHost()->getReactingAnswers()->rotate(true);
       response = "rotate";
     } else if (diameterJson_or_action == "exhaust") {
-      my_app.getOperatedServer()->getReactingAnswers()->rotate(false);
+      my_app.getOperatedHost()->getReactingAnswers()->rotate(false);
       response = "exhaust";
     } else if (diameterJson_or_action == "clear") {
-      my_app.getOperatedServer()->getReactingAnswers()->clear();
+      my_app.getOperatedHost()->getReactingAnswers()->clear();
       response = "clear";
     } else if (diameterJson_or_action == "dump") {
-      my_app.getOperatedServer()->getReactingAnswers()->dump("programmed_answer");
+      my_app.getOperatedHost()->getReactingAnswers()->dump("programmed_answer");
       response = "dump";
     }
   }
@@ -1105,12 +1105,23 @@ bool EventOperation::test__finished(std::string &response) {
   return true; // OK
 }
 
-bool EventOperation::test__clear(std::string &response) {
+bool EventOperation::test__clear(std::string &response, int id) {
 
   Launcher& my_app = static_cast <Launcher&>(anna::app::functions::getApp());
   anna::testing::TestManager &testManager = anna::testing::TestManager::instantiate();
 
-  return testManager.clearPool(response);
+  if (id == -1) {
+     return testManager.clearPool(response);
+  }
+
+  if (!testManager.findTestCase(id)) {
+      response += "cannot found test id (";
+      response += anna::functions::asString(id);
+      response += ")";
+      return false;
+  }
+
+  return testManager.clearTestCase(response, id);
 }
 
 bool EventOperation::test__junit(std::string &response, const std::string & targetFile) {