X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2Ftesting%2FTestCase.cpp;fp=example%2Fdiameter%2Flauncher%2Ftesting%2FTestCase.cpp;h=32ecba158334c15d84683adcc657c2dae5989661;hb=e80e62a5cf9aacad1a9551c68c432147ef98cd29;hp=a8b96433aebea6f816fcd1073793a23478f66f91;hpb=c7742e2134826a05ee9c6bf89eebaa726dae0d1b;p=anna.git diff --git a/example/diameter/launcher/testing/TestCase.cpp b/example/diameter/launcher/testing/TestCase.cpp index a8b9643..32ecba1 100644 --- a/example/diameter/launcher/testing/TestCase.cpp +++ b/example/diameter/launcher/testing/TestCase.cpp @@ -248,15 +248,15 @@ void TestCase::addSendxml2e(const anna::DataBlock &db, RealmNode *realm, int ste int steps = a_steps.size(); int stepIndx = stepNumber - 1; if ((stepIndx < 0) || (stepIndx > (a_steps.size()-1))) - throw anna::RuntimeException(anna::functions::asString("Step number out of range (test case %llu)", a_id), ANNA_FILE_LOCATION); + throw anna::RuntimeException(anna::functions::asString("Step number (%d) out of range (test case %llu)", stepNumber, a_id), ANNA_FILE_LOCATION); TestStep *stepReferred = a_steps[stepIndx]; if (stepReferred->getType() != TestStep::Type::Wait) - throw anna::RuntimeException(anna::functions::asString("Step number must refer to a 'wait' step (test case %llu)", a_id), ANNA_FILE_LOCATION); + throw anna::RuntimeException(anna::functions::asString("Step number (%d) must refer to a 'wait' step (test case %llu)", stepNumber, a_id), ANNA_FILE_LOCATION); const TestCondition &tc = (static_cast(stepReferred))->getCondition(); if (tc.getCode() == "0") { // if regexp used, is not possible to detect this kind of errors - throw anna::RuntimeException(anna::functions::asString("Step number must refer to a 'wait for request' step (test case %llu)", a_id), ANNA_FILE_LOCATION); + throw anna::RuntimeException(anna::functions::asString("Step number (%d) must refer to a 'wait for request' step (test case %llu)", stepNumber, a_id), ANNA_FILE_LOCATION); } } @@ -285,8 +285,9 @@ void TestCase::addDelay(const anna::Millisecond &delay) throw(anna::RuntimeExcep } void TestCase::addWait(bool fromEntity, - const std::string &code, const std::string &bitR, const std::string &resultCode, const std::string &sessionId, - const std::string &hopByHop, const std::string &msisdn, const std::string &imsi, const std::string &serviceContextId) throw(anna::RuntimeException) { + 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(anna::RuntimeException) { assertInitialized(); std::string usedHopByHop = hopByHop; TestStepWait *step = NULL; @@ -329,7 +330,7 @@ void TestCase::addWait(bool fromEntity, } if (!step) step = new TestStepWait(this); - step->setCondition(fromEntity, code, bitR, resultCode, sessionId, usedHopByHop, msisdn, imsi, serviceContextId); + step->setCondition(fromEntity, code, bitR, usedHopByHop, applicationId, sessionId, resultCode, msisdn, imsi, serviceContextId); LOGWARNING( if (hasSameCondition(step->getCondition()))