Simplify command (no parameter field, all inside command). Interactive mode.

[anna.git] / example / diameter / launcher / testing / TestCase.cpp

diff --git a/example/diameter/launcher/testing/TestCase.cpp b/example/diameter/launcher/testing/TestCase.cpp
index 32ecba1..63851f7 100644 (file)
--- a/example/diameter/launcher/testing/TestCase.cpp
+++ b/example/diameter/launcher/testing/TestCase.cpp
@@ -86,6 +86,8 @@ throw() {
     a_debugSummary.asXML(result);
   }
 
+  result->createAttribute("Interactive", (a_interactiveAmount != -1) ? "yes":"no");
+
   return result;
 }
 
@@ -203,6 +205,7 @@ bool TestCase::reset(bool hard) throw() {
 
   a_debugSummary.clear();
   a_startTime = 0;
+  a_interactiveAmount = -1;
 
   setState(State::Initialized);
 
@@ -354,12 +357,11 @@ void TestCase::addWaitRegexp(bool fromEntity, const std::string &regexp) throw(a
   a_steps.push_back(step);
 }
 
-void TestCase::addCmd(const std::string &script, const std::string &parameters) throw(anna::RuntimeException) {
+void TestCase::addCommand(const std::string &cmd) throw(anna::RuntimeException) {
   assertInitialized();
 
   TestStepCmd *step = new TestStepCmd(this);
-  step->setScript(script);
-  step->setParameters(parameters);
+  step->setScript(cmd);
 
   a_steps.push_back(step);
 }