From 9ec374517954efc1b34694c7ed801231f035d7f7 Mon Sep 17 00:00:00 2001
From: Eduardo Ramos Testillano <eduardo.ramos.testillano@ericsson.com>
Date: Sun, 22 Nov 2015 17:49:10 +0100
Subject: [PATCH] turns Failed and Success on failed and success for report
 operation

---
 example/diameter/launcher/DEPLOY.sh    | 16 ++++++++--------
 example/diameter/launcher/Launcher.cpp | 12 ++++++------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/example/diameter/launcher/DEPLOY.sh b/example/diameter/launcher/DEPLOY.sh
index 360f1bb..93754ac 100755
--- a/example/diameter/launcher/DEPLOY.sh
+++ b/example/diameter/launcher/DEPLOY.sh
@@ -41,10 +41,10 @@ usage () {
   echo "          non-existent path directory."
   echo
   echo "       For example:"
-  echo "          $0 b $HOME/ADML/basicServer"
-  echo "          $0 b $HOME/ADML/MMSbalancer"
-  echo "          $0 f $HOME/ADML/tester"
-  echo "          $0 s $HOME/ADML/stress-client"
+  echo "          $0 b $HOME/ADML-basicServer"
+  echo "          $0 b $HOME/ADML-MMSbalancer"
+  echo "          $0 f $HOME/ADML-tester"
+  echo "          $0 s $HOME/ADML-stress-client"
   echo
   exit 0
 }
@@ -168,25 +168,25 @@ case $option in
   a)
     echo "Advanced deployment"
     DEPLOYMENTS_DIR=deployments/advanced
-    DPATH_dflt=$HOME/ADML/advanced
+    DPATH_dflt=$HOME/ADML-advanced
   ;;
 
   b)
     echo "Basic deployment"
     DEPLOYMENTS_DIR=deployments/basic
-    DPATH_dflt=$HOME/ADML/basic
+    DPATH_dflt=$HOME/ADML-basic
   ;;
 
   f)
     echo "FT deployment"
     DEPLOYMENTS_DIR=deployments/ft-client
-    DPATH_dflt=$HOME/ADML/ft-client
+    DPATH_dflt=$HOME/ADML-ft-client
   ;;
 
   s)
     echo "ST deployment"
     DEPLOYMENTS_DIR=deployments/st-client
-    DPATH_dflt=$HOME/ADML/st-client
+    DPATH_dflt=$HOME/ADML-st-client
   ;;
 
   *)
diff --git a/example/diameter/launcher/Launcher.cpp b/example/diameter/launcher/Launcher.cpp
index bf80e2d..a6e5ab9 100644
--- a/example/diameter/launcher/Launcher.cpp
+++ b/example/diameter/launcher/Launcher.cpp
@@ -1340,7 +1340,7 @@ std::string Launcher::help() const throw() {
   result += "\n                                 Test cases reports are not dumped on process context (too many information in general).";
   result += "\n                                 The report contains context information in every moment: this operation acts as a snapshot.";
   result += "\n";
-  result += "\n   test|report|<Failed/Success>[|[yes]|no]";
+  result += "\n   test|report|<failed/success>[|[yes]|no]";
   result += "\n";
   result += "\n                                 Every time a test case is finished, its xml representation will be dump on a file under";
   result += "\n                                 the execution directory (or the one configured in process command-line 'tmDir') with";
@@ -1779,7 +1779,7 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons
     // test|next[|<sync-amount>]                Forces the execution of the next test case(s) without waiting for test manager tick ...
     // test|ip-limit[|amount]                   In-progress limit of test cases. No new test cases will be launched over this value ...
     // test|repeats|<amount>                    Restarts the whole programmed test list when finished the amount number of times ...
-    // test|report|<Failed/Success>[|[yes]|no]  Every time a test case is finished a report file in xml format will be created under ...
+    // test|report|<failed/success>[|[yes]|no]  Every time a test case is finished a report file in xml format will be created under ...
     // test|report-hex[|[yes]|no]               Reports could include the diameter messages in hexadecimal format. Disabled by default.
     // test|goto|<id>                           Updates current test pointer position.
     // test|look[|id]                           Show programmed test case for id provided, current when missing ...
@@ -1852,21 +1852,21 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons
       if (numParams > 3)
         throw anna::RuntimeException("Wrong body content format on HTTP Request. Use 'help' management command to see more information.", ANNA_FILE_LOCATION);
 
-      if(param2 != "Failed" && param2 != "Success")
+      if(param2 != "failed" && param2 != "success")
         throw anna::RuntimeException("Wrong body content format on HTTP Request. Use 'help' management command to see more information.", ANNA_FILE_LOCATION);
 
       if(param3 == "") param3 = "yes";
       bool enable = (param3 == "yes");
 
-      if(param2 == "Success")
+      if(param2 == "success")
         testManager.setDumpSuccessfulReports(enable);
       else
         testManager.setDumpFailedReports(enable);
 
       opt_response_content += (enable ? "report enabled " : "report disabled ");
-      opt_response_content += "for ";
+      opt_response_content += "for tests in '";
       opt_response_content += param2;
-      opt_response_content += " tests";
+      opt_response_content += "' state";
     }
     else if(param1 == "report-hex") {
       if (numParams > 2)
-- 
2.20.1