void cmdRunOnThread (TestStepCmd *step, const std::string &cmd) {
- // Thread running:
- step->setThreadRunning(true);
+ // Thread running (will be set to false at complete()):
+ step->setThreadRunning();
int status = -2;
}
*/
- bool decodeMessage(const anna::DataBlock &message, anna::diameter::codec::Message &messageCodec) throw() {
+ bool decodeMessage(const anna::DataBlock &message, anna::diameter::codec::Message &messageCodec) {
if (message.isEmpty())
return false;
a_number = testCase->steps() + 1; // testCase is not NULL
}
-bool TestStep::decodeMessage(bool trust) throw() {
+bool TestStep::decodeMessage(bool trust) {
if (a_messageCodec) return true;
a_messageCodec = new anna::diameter::codec::Message;
if (::decodeMessage(a_message, *a_messageCodec)) return true;
}
const char* TestStep::asText(const Type::_v type)
-throw() {
+{
static const char* text [] = { "Unconfigured", "Timeout", "SendDiameterXmlToEntity", "SendDiameterXmlToClient", "Delay", "Wait", "Command", "IpLimit" };
return text [type];
}
anna::xml::Node* TestStep::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = parent->createChild("TestStep");
result->createAttribute("Number", a_number);
return result;
}
-std::string TestStep::asXMLString() throw() {
+std::string TestStep::asXMLString() {
anna::xml::Node root("root");
return anna::xml::Compiler().apply(asXML(&root));
}
-bool TestStep::execute() throw() {
+bool TestStep::execute() {
int ia = a_testCase->interactiveAmount();
if (ia > -1) {
return do_execute();
}
-void TestStep::complete() throw() {
+void TestStep::complete() {
const char *literal = "Complete %s Test Step %d/%d (test case %llu)";
do_complete();
}
-void TestStep::reset() throw() {
+void TestStep::reset() {
const char *literal = "Reset %s Test Step %d/%d (test case %llu)";
do_reset();
}
-void TestStep::next() throw() {
+void TestStep::next() {
a_testCase->nextStep();
a_testCase->process();
}
// TestStepTimeout
////////////////////////////////////////////////////////////////////////////////////////////////////////
anna::xml::Node* TestStepTimeout::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = TestStep::asXML(parent); // end timestamp will be 0 if test finished OK
//parent->createChild("TestStepTimeout");
result->createAttribute("Timeout", a_timeout.asString());
return result;
}
-bool TestStepTimeout::do_execute() throw() {
+bool TestStepTimeout::do_execute() {
try {
a_timer = TestManager::instantiate().createTimer((TestCaseStep*)this, a_timeout, TestTimer::Type::TimeLeft);
}
return true; // go next
}
-void TestStepTimeout::do_complete() throw() {
+void TestStepTimeout::do_complete() {
int stepNumber = getNumber();
if (stepNumber == a_testCase->steps()) {
a_testCase->addDebugSummaryHint(anna::functions::asString("Timeout expired (step number %d) but it was the last test case step", stepNumber)); // before report (when set Failed state)
a_timer = NULL;
}
-void TestStepTimeout::cancelTimer() throw() {
+void TestStepTimeout::cancelTimer() {
if (!a_timer) return;
try {
TestManager::instantiate().cancelTimer(a_timer);
//a_timeout = 0; THIS IS CONFIGURATION INFO
}
-void TestStepTimeout::do_reset() throw() {
+void TestStepTimeout::do_reset() {
cancelTimer();
}
// TestStepSendDiameterXml
////////////////////////////////////////////////////////////////////////////////////////////////////////
anna::xml::Node* TestStepSendDiameterXml::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = TestStep::asXML(parent);
//parent->createChild("TestStepSendDiameterXml");
std::string msg = "", xmlmsg = "";
// Message
if (TestManager::instantiate().getDumpHex()) {
if (a_message.isEmpty()) {
- msg = "<empty>";
+ msg = "[empty]";
}
else {
msg = "\n"; msg += a_message.asString(); msg += "\n";
xmlmsg += "\n";
}
else {
- xmlmsg = "<unable to decode, check traces>";
+ xmlmsg = "[unable to decode, check traces]";
}
if (msg != "") result->createAttribute("Message", msg);
return result;
}
-bool TestStepSendDiameterXml::do_execute() throw() {
+bool TestStepSendDiameterXml::do_execute() {
bool success = false;
std::string failReason = "Error sending diameter message";
anna::diameter::comm::Entity *entity = a_originHost->getEntity(); // by default
// Detailed log:
if(a_originHost->logEnabled()) {
if (decodeMessage(true /* trust */)) {
- std::string detail = usedClientSession ? usedClientSession->asString() : "<null client session>"; // shouldn't happen
+ std::string detail = usedClientSession ? usedClientSession->asString() : "[null client session]"; // shouldn't happen
a_originHost->writeLogFile(*a_messageCodec, (success ? "sent2e" : "send2eError"), detail);
}
}
// Detailed log:
if(a_originHost->logEnabled()) {
if (decodeMessage(true /* trust */)) {
- std::string detail = usedServerSession ? usedServerSession->asString() : "<null server session>"; // shouldn't happen
+ std::string detail = usedServerSession ? usedServerSession->asString() : "[null server session]"; // shouldn't happen
a_originHost->writeLogFile(*a_messageCodec, (success ? "sent2c" : "send2cError"), detail);
}
}
return success; // go next if sent was OK
}
-void TestStepSendDiameterXml::do_reset() throw() {
+void TestStepSendDiameterXml::do_reset() {
a_expired = false;
//a_message.clear();
//a_messageAlreadyDecoded = false;
// TestStepDelay
////////////////////////////////////////////////////////////////////////////////////////////////////////
anna::xml::Node* TestStepDelay::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = TestStep::asXML(parent);
//parent->createChild("TestStepDelay");
return result;
}
-bool TestStepDelay::do_execute() throw() {
+bool TestStepDelay::do_execute() {
if (a_delay == 0) { complete(); return true; } // special case
try {
a_timer = TestManager::instantiate().createTimer((TestCaseStep*)this, a_delay, TestTimer::Type::Delay);
return false; // don't go next (wait complete)
}
-void TestStepDelay::do_complete() throw() {
+void TestStepDelay::do_complete() {
if (a_delay == 0) return; // special case
a_timer = NULL;
if (TestManager::instantiate().getDumpStdout()) {
// TODO, avoid this recursion
}
-void TestStepDelay::cancelTimer() throw() {
+void TestStepDelay::cancelTimer() {
if (!a_timer) return;
if (a_delay == 0) return; // special case
try {
//a_delay = 0; THIS IS CONFIGURATION INFO
}
-void TestStepDelay::do_reset() throw() {
+void TestStepDelay::do_reset() {
cancelTimer();
}
void TestStepWaitDiameter::setCondition(bool fromEntity,
const std::string &code, const std::string &bitR, const std::string &hopByHop, const std::string &applicationId,
const std::string &sessionId, const std::string &resultCode,
- const std::string &msisdn, const std::string &imsi, const std::string &serviceContextId) throw() {
+ const std::string &msisdn, const std::string &imsi, const std::string &serviceContextId) {
a_condition.setReceivedFromEntity(fromEntity);
a_condition.setCode(code);
a_condition.setServiceContextId(serviceContextId);
}
-void TestStepWaitDiameter::setConditionRegexpHex(bool fromEntity, const std::string ®exp) throw() {
+void TestStepWaitDiameter::setConditionRegexpHex(bool fromEntity, const std::string ®exp) {
a_condition.setReceivedFromEntity(fromEntity);
a_condition.setRegexpHex(regexp);
}
-void TestStepWaitDiameter::setConditionRegexpXml(bool fromEntity, const std::string ®exp) throw() {
+void TestStepWaitDiameter::setConditionRegexpXml(bool fromEntity, const std::string ®exp) {
a_condition.setReceivedFromEntity(fromEntity);
a_condition.setRegexpXml(regexp);
}
anna::xml::Node* TestStepWaitDiameter::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = TestStep::asXML(parent);
//parent->createChild("TestStepWaitDiameter");
std::string msg = "", xmlmsg = "";
// Message
if (TestManager::instantiate().getDumpHex()) {
if (a_message.isEmpty()) {
- msg = "<empty>";
+ msg = "[empty]";
}
else {
msg = "\n"; msg += a_message.asString(); msg += "\n";
}
if (a_message.isEmpty()) {
- xmlmsg = "<empty>";
+ xmlmsg = "[empty]";
}
else {
if (decodeMessage()) {
xmlmsg += "\n";
}
else {
- xmlmsg = "<unable to decode, check traces>";
+ xmlmsg = "[unable to decode, check traces]";
}
}
return result;
}
-bool TestStepWaitDiameter::do_execute() throw() {
+bool TestStepWaitDiameter::do_execute() {
return a_completed;
}
-void TestStepWaitDiameter::do_complete() throw() {
+void TestStepWaitDiameter::do_complete() {
//a_testCase->process(); // next() not invoked; we only want to reactivate the test case
// avoid stack overflow: we will process the test case externally when incoming message is fulfilled (TestCase.cpp), and TestManager is noticed
}
-bool TestStepWaitDiameter::fulfilled(const anna::DataBlock &db/*, bool matchSessionId*/) throw() {
+bool TestStepWaitDiameter::fulfilled(const anna::DataBlock &db/*, bool matchSessionId*/) {
if (a_condition.comply(db/*, matchSessionId*/)) {
a_message = db; // store matched
complete();
return false;
}
-void TestStepWaitDiameter::do_reset() throw() {
+void TestStepWaitDiameter::do_reset() {
a_message.clear();
a_clientSession = NULL;
a_serverSession = NULL;
// TestStepCmd
////////////////////////////////////////////////////////////////////////////////////////////////////////
anna::xml::Node* TestStepCmd::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = TestStep::asXML(parent);
//parent->createChild("TestStepCmd");
- result->createAttribute("Script", (a_script != "") ? a_script:"<no script>");
+ result->createAttribute("Script", (a_script != "") ? a_script:"[no script]");
if (a_errorMsg != "") result->createAttribute("ErrorMessage", a_errorMsg);
if (a_threadRunning) {
if (a_childPid != -1)
return result;
}
-bool TestStepCmd::do_execute() throw() {
+bool TestStepCmd::do_execute() {
if (!a_threadRunning /* || a_threadDeprecated DO NOT WANT TO OVERLAP ... */) {
// Special tags to replace:
std::string cmd = getScript();
// We must implement a interrupt procedure for the thread on reset call... TODO !
}
-void TestStepCmd::do_complete() throw() {
+void TestStepCmd::do_complete() {
if (TestManager::instantiate().getDumpStdout()) {
std::cout << "Executed Command Test Step (" << a_script << ") [rc=" << a_resultCode << "]" << std::endl;
}
- a_threadRunning = false;
+ setThreadNotRunning();
if (a_threadDeprecated) {
a_threadDeprecated = false;
do_reset();
// TODO, avoid this recursion
}
-void TestStepCmd::do_reset() throw() {
+void TestStepCmd::do_reset() {
if (a_threadRunning) {
std::string s_warn = anna::functions::asString("Thread still in progress: deprecating step %d for Test Case %llu", getNumber(), a_testCase->getId());
}
anna::xml::Node* TestStepIpLimit::asXML(anna::xml::Node* parent)
-throw() {
+{
anna::xml::Node* result = TestStep::asXML(parent);
- std::string limit = (a_ipLimit != UINT_MAX) ? anna::functions::asString(a_ipLimit) : "<no limit>";
+ std::string limit = (a_ipLimit != UINT_MAX) ? anna::functions::asString(a_ipLimit) : "[no limit]";
result->createAttribute("IpLimit", limit);
return result;
}
-bool TestStepIpLimit::do_execute() throw() {
+bool TestStepIpLimit::do_execute() {
TestManager::instantiate().setInProgressLimit(a_ipLimit);
complete();
return true; // go next
}
-void TestStepIpLimit::do_complete() throw() {
+void TestStepIpLimit::do_complete() {
if (TestManager::instantiate().getDumpStdout()) {
- std::string limit = (a_ipLimit != UINT_MAX) ? anna::functions::asString(a_ipLimit) : "<no limit>";
+ std::string limit = (a_ipLimit != UINT_MAX) ? anna::functions::asString(a_ipLimit) : "[no limit]";
std::cout << "Executed IpLimit Test Step (value = " << limit << ")" << std::endl;
}
}