ilusha/unittest-cpp
1
0
Fork 0
mirror of https://github.com/unittest-cpp/unittest-cpp synced 2026-09-26 16:19:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaning

Browse source
This commit is contained in:
Gabriel Schlozer 2016-06-20 10:14:55 +02:00
parent 7c89e14aec
commit 8b1cb0b1d0
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
UnitTest++/ParameterizedManager.cpp
View file

@ -46,7 +46,12 @@ TestListNode* const ParameterizedManager::retrieveTest(TestDetails const * const
Test* const ParameterizedManager::getCurrentTest() const
{
return (_currentTest != nullptr) ? _currentTest->m_test : nullptr;
if (_currentTest == nullptr)
{
return nullptr;
}
return _currentTest->m_test;
}
@ -99,6 +104,7 @@ void ParameterizedManager::endExecute(TestDetails const * const details)
_currentTest = nullptr;
_nextTestBackup = nullptr;
}
_iterationDone = false;
}
@ -124,14 +130,12 @@ ParameterizedManager::RegisterThen ParameterizedManager::registerParameter(Param
}
const vector<ParameterizedTestAbstract*> & ParameterizedManager::getStack(TestDetails const * const details)
const vector<ParameterizedTestAbstract*> & ParameterizedManager::getStack(TestDetails const * const details) const
{
static vector<ParameterizedTestAbstract*> emptyStored;
if (!isCurrentTest(details))
{
static vector<ParameterizedTestAbstract*> emptyStored;
return emptyStored;
}
return _stack;
}

2
UnitTest++/ParameterizedManager.h
View file

@ -27,7 +27,7 @@ namespace UnitTest
void beginExecute(TestDetails const * const details);
void endExecute(TestDetails const * const details);
RegisterThen registerParameter(ParameterizedTestAbstract* const parameterized);
const vector<ParameterizedTestAbstract*> & getStack(TestDetails const * const details);
const vector<ParameterizedTestAbstract*> & getStack(TestDetails const * const details) const;
private:
ParameterizedManager();