X-Git-Url: https://git.teslayout.com/public/public/public/?p=anna.git;a=blobdiff_plain;f=source%2Ftesting%2FTestManager.cpp;h=87278f14ce768aa66fccaf82daf59c81f38e5897;hp=8b72efae3aad410b956dfbe0a3213946cfed39ad;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hpb=af9c86ffb0e28d35ad94d99c5f77e41578c972b4 diff --git a/source/testing/TestManager.cpp b/source/testing/TestManager.cpp index 8b72efa..87278f1 100644 --- a/source/testing/TestManager.cpp +++ b/source/testing/TestManager.cpp @@ -35,7 +35,7 @@ using namespace anna::testing; /////////////////////////////////////////////////////////////////////////////////////////////////// -void TestManager::StatSummary::newTCState(const TestCase::State::_v beginState, const TestCase::State::_v endState) throw() { +void TestManager::StatSummary::newTCState(const TestCase::State::_v beginState, const TestCase::State::_v endState) { if ((beginState == TestCase::State::Initialized)&&(endState == TestCase::State::Initialized)) { // special case (new test case provisioning) a_initializedTcs++; @@ -58,14 +58,14 @@ void TestManager::StatSummary::newTCState(const TestCase::State::_v beginState, } } -void TestManager::StatSummary::clear() throw() { +void TestManager::StatSummary::clear() { a_initializedTcs = 0; a_inprogressTcs = 0; a_failedTcs = 0; a_sucessTcs = 0; } -anna::xml::Node *TestManager::StatSummary::asXML(anna::xml::Node* parent) const throw() { +anna::xml::Node *TestManager::StatSummary::asXML(anna::xml::Node* parent) const { anna::xml::Node* result = parent->createChild("StatSummary"); anna::xml::Node* tcs = result->createChild("TestCasesCounts"); @@ -106,7 +106,7 @@ TestManager::TestManager() : a_currentTestIt = a_testPool.end(); } -void TestManager::registerKey1(const std::string &key, const TestCase *testCase) throw(anna::RuntimeException) { +void TestManager::registerKey1(const std::string &key, const TestCase *testCase) noexcept(false) { auto it = a_key1TestCaseMap.find(key); if (it != a_key1TestCaseMap.end()) { // found @@ -121,7 +121,7 @@ void TestManager::registerKey1(const std::string &key, const TestCase *testCase) } } -void TestManager::registerKey2(const std::string &key, const TestCase *testCase) throw(anna::RuntimeException) { +void TestManager::registerKey2(const std::string &key, const TestCase *testCase) noexcept(false) { auto it = a_key2TestCaseMap.find(key); if (it != a_key2TestCaseMap.end()) { // found @@ -137,7 +137,7 @@ void TestManager::registerKey2(const std::string &key, const TestCase *testCase) } TestTimer* TestManager::createTimer(TestCaseStep* testCaseStep, const anna::Millisecond &timeout, const TestTimer::Type::_v type) -throw(anna::RuntimeException) { +noexcept(false) { TestTimer* result(NULL); if(a_timeController == NULL) @@ -162,7 +162,7 @@ throw(anna::RuntimeException) { } void TestManager::cancelTimer(TestTimer* timer) -throw() { +{ if(timer == NULL) return; @@ -186,13 +186,13 @@ throw() { // Se invoca automaticamente desde anna::timex::Engine //------------------------------------------------------------------------------------------ void TestManager::release(anna::timex::TimeEvent* timeEvent) -throw() { +{ TestTimer* timer = static_cast (timeEvent); timer->setContext(NULL); a_timers.release(timer); } -bool TestManager::configureTTPS(int testTicksPerSecond) throw() { +bool TestManager::configureTTPS(int testTicksPerSecond) { if (testTicksPerSecond == 0) { if (a_clock) { @@ -250,7 +250,7 @@ bool TestManager::configureTTPS(int testTicksPerSecond) throw() { return true; } -bool TestManager::gotoTestCase(unsigned int id) throw() { +bool TestManager::gotoTestCase(unsigned int id) { test_pool_it it = a_testPool.find(id); if (it != a_testPool.end()) { a_currentTestIt = it; @@ -260,7 +260,7 @@ bool TestManager::gotoTestCase(unsigned int id) throw() { return false; } -bool TestManager::runTestCase(unsigned int id) throw() { +bool TestManager::runTestCase(unsigned int id) { test_pool_it it = a_testPool.find(id); if (it != a_testPool.end()) { a_currentTestIt = it; @@ -277,7 +277,7 @@ bool TestManager::runTestCase(unsigned int id) throw() { return false; } -TestCase *TestManager::findTestCase(unsigned int id) const throw() { // id = -1 provides current test case triggered +TestCase *TestManager::findTestCase(unsigned int id) const { // id = -1 provides current test case triggered if (!tests()) return NULL; test_pool_it it = ((id != -1) ? a_testPool.find(id) : a_currentTestIt); @@ -285,7 +285,7 @@ TestCase *TestManager::findTestCase(unsigned int id) const throw() { // id = -1 return NULL; } -TestCase *TestManager::getTestCase(unsigned int id, const std::string &description) throw() { +TestCase *TestManager::getTestCase(unsigned int id, const std::string &description) { test_pool_nc_it it = a_testPool.find(id); if (it != a_testPool.end()) return it->second; @@ -295,7 +295,7 @@ TestCase *TestManager::getTestCase(unsigned int id, const std::string &descripti return result; } -bool TestManager::clearPool(std::string &result) throw() { +bool TestManager::clearPool(std::string &result) { result = ""; @@ -340,7 +340,7 @@ bool TestManager::clearPool(std::string &result) throw() { return true; } -bool TestManager::resetPool(bool hard) throw() { +bool TestManager::resetPool(bool hard) { bool result = false; // any reset if (!tests()) return result; @@ -353,12 +353,12 @@ bool TestManager::resetPool(bool hard) throw() { return result; } -bool TestManager::tick() throw() { +bool TestManager::tick() { LOGDEBUG(anna::Logger::debug("New test clock tick !", ANNA_FILE_LOCATION)); return execTestCases(a_synchronousAmount); } -bool TestManager::execTestCases(int sync_amount) throw() { +bool TestManager::execTestCases(int sync_amount) { if (!tests()) { LOGWARNING(anna::Logger::warning("Testing pool is empty. You need programming", ANNA_FILE_LOCATION)); @@ -375,7 +375,7 @@ bool TestManager::execTestCases(int sync_amount) throw() { return true; } -bool TestManager::nextTestCase() throw() { +bool TestManager::nextTestCase() { while (true) { @@ -424,7 +424,7 @@ bool TestManager::nextTestCase() throw() { } } -TestCase *TestManager::getDiameterTestCaseFromSessionId(const anna::DataBlock &message, std::string &sessionId) throw() { +TestCase *TestManager::getDiameterTestCaseFromSessionId(const anna::DataBlock &message, std::string &sessionId) { try { sessionId = anna::diameter::helpers::base::functions::getSessionId(message); } @@ -441,7 +441,7 @@ TestCase *TestManager::getDiameterTestCaseFromSessionId(const anna::DataBlock &m return NULL; } -TestCase *TestManager::getDiameterTestCaseFromSubscriberId(const anna::DataBlock &message, std::string &subscriberId) throw() { +TestCase *TestManager::getDiameterTestCaseFromSubscriberId(const anna::DataBlock &message, std::string &subscriberId) { try { subscriberId = anna::diameter::helpers::dcca::functions::getSubscriptionIdData(message, anna::diameter::helpers::dcca::AVPVALUES__Subscription_Id_Type::END_USER_E164); if (subscriberId == "") // try with IMSI @@ -460,7 +460,7 @@ TestCase *TestManager::getDiameterTestCaseFromSubscriberId(const anna::DataBlock return NULL; } -void TestManager::receiveDiameterMessage(const anna::DataBlock &message, const anna::diameter::comm::ClientSession *clientSession) throw(anna::RuntimeException) { +void TestManager::receiveDiameterMessage(const anna::DataBlock &message, const anna::diameter::comm::ClientSession *clientSession) noexcept(false) { // Testing disabled: if (!tests()) return; @@ -501,7 +501,7 @@ void TestManager::receiveDiameterMessage(const anna::DataBlock &message, const a } } -void TestManager::receiveDiameterMessage(const anna::DataBlock &message, const anna::diameter::comm::ServerSession *serverSession) throw(anna::RuntimeException) { +void TestManager::receiveDiameterMessage(const anna::DataBlock &message, const anna::diameter::comm::ServerSession *serverSession) noexcept(false) { // Testing disabled: if (!tests()) return; @@ -543,7 +543,7 @@ void TestManager::receiveDiameterMessage(const anna::DataBlock &message, const a } anna::xml::Node* TestManager::asXML(anna::xml::Node* parent) const -throw() { +{ anna::xml::Node* result = parent->createChild("TestManager"); int poolSize = a_testPool.size(); @@ -587,7 +587,7 @@ throw() { } anna::xml::Node* TestManager::junitAsXML(anna::xml::Node* parent) const -throw() { +{ // if only a single testsuite element is present, the testsuites element can be omitted //anna::xml::Node* result = parent->createChild("testsuites"); anna::xml::Node* result = parent->createChild("testsuite"); @@ -729,17 +729,17 @@ Each testcase element can have multiple error, failure, system-out, or system-er return result; } -std::string TestManager::asXMLString() const throw() { +std::string TestManager::asXMLString() const { anna::xml::Node root("root"); return anna::xml::Compiler().apply(asXML(&root)); } -std::string TestManager::junitAsXMLString() const throw() { +std::string TestManager::junitAsXMLString() const { anna::xml::Node root("root"); return anna::xml::Compiler().apply(junitAsXML(&root)); } -std::string TestManager::summaryCounts() const throw() { +std::string TestManager::summaryCounts() const { std::string result= "\nSummary Counts:\n"; unsigned int total = a_statSummary.getTotal(); @@ -758,7 +758,7 @@ std::string TestManager::summaryCounts() const throw() { return result; } -std::string TestManager::summaryStates() const throw() { +std::string TestManager::summaryStates() const { std::string result = "\nSummary States:\n"; const char *literal = "\n[%s] %s";