From: Eduardo Ramos Testillano (eramedu) Date: Sun, 9 Jun 2019 03:21:25 +0000 (+0200) Subject: Fix answer condition from message X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=commitdiff_plain;h=76a27f58b66e801feef1c836c66753ffd172c13d Fix answer condition from message Answer was wrongly calculated from message, then always answer was true when request, and false when answer. Also adds a trace to get the wait for request value. --- diff --git a/source/testing/TestStep.cpp b/source/testing/TestStep.cpp index 4a75f3b..07ed6b3 100644 --- a/source/testing/TestStep.cpp +++ b/source/testing/TestStep.cpp @@ -345,7 +345,7 @@ throw() { xmlmsg += "\n"; } else { - xmlmsg = ""; + xmlmsg = ""; } if (msg != "") result->createAttribute("Message", msg); @@ -368,12 +368,16 @@ bool TestStepSendxml::do_execute() throw() { try { if (a_waitForRequestStepNumber != -1) { + bool thisIsAnswer = anna::diameter::codec::functions::isAnswer(getMsgDataBlock()); + LOGDEBUG( + std::string trace = anna::functions::asString("'Wait For Request' step number for this %s: %d", (thisIsAnswer ? "answer":"request"), a_waitForRequestStepNumber); + anna::Logger::debug(trace, ANNA_FILE_LOCATION); + ); // Referenced request in the 'wait for request step': tsw = static_cast(a_testCase->getStep(a_waitForRequestStepNumber)); const anna::DataBlock &referenceRequest = tsw->getMsgDataBlock(); std::string sessionIdReferenceRequest = anna::diameter::helpers::base::functions::getSessionId(referenceRequest); - bool thisIsAnswer = anna::diameter::codec::functions::isRequest(getMsgDataBlock()); if (thisIsAnswer) { // is an answer: try to copy sequence information; alert about Session-Id discrepance anna::diameter::HopByHop hbh = anna::diameter::codec::functions::getHopByHop(referenceRequest); @@ -600,7 +604,7 @@ throw() { xmlmsg += "\n"; } else { - xmlmsg = ""; + xmlmsg = ""; } }