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

moved iteration FIRST/IDLE/ITERATE handling in manager

Browse source
This commit is contained in:
Gabriel Schlozer 2016-06-20 10:46:00 +02:00
parent 8b1cb0b1d0
commit 4373207200
3 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
UnitTest++/ParameterizedManager.cpp
View file

@ -109,6 +109,24 @@ void ParameterizedManager::endExecute(TestDetails const * const details)
}
void ParameterizedManager::updateParameter(ParameterizedTestAbstract* const parameterized)
{
RegisterThen then = registerParameter(parameterized);
if (then == ParameterizedManager::IDLE)
{
return;
}
if (then == ParameterizedManager::FIRST)
{
parameterized->onNewIteration(true);
}
else if (then == ParameterizedManager::ITERATE)
{
parameterized->onNewIteration(false);
}
}
ParameterizedManager::RegisterThen ParameterizedManager::registerParameter(ParameterizedTestAbstract* const parameterized)
{
if (find(_stack.begin(), _stack.end(), parameterized) == _stack.end())

21
UnitTest++/ParameterizedManager.h
View file

@ -14,25 +14,26 @@ namespace UnitTest
class ParameterizedManager
{
public:
enum RegisterThen
static ParameterizedManager & getInstance();
Test* const getCurrentTest() const;
bool isCurrentTest(TestDetails const * const details) const;
void beginExecute(TestDetails const * const details);
void endExecute(TestDetails const * const details);
void updateParameter(ParameterizedTestAbstract* const parameterized);
const vector<ParameterizedTestAbstract*> & getStack(TestDetails const * const details) const;
private:
enum RegisterThen //TODO Can remove this ?
{
FIRST,
ITERATE,
IDLE
};
static ParameterizedManager & getInstance();
Test* const getCurrentTest() const;
bool isCurrentTest(TestDetails const * const details) const;
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;
private:
ParameterizedManager();
virtual ~ParameterizedManager();
TestListNode* const retrieveTest(TestDetails const * const details);
RegisterThen registerParameter(ParameterizedTestAbstract* const parameterized);
TestListNode* _currentTest;
TestListNode* _nextTestBackup;

10
UnitTest++/ParameterizedTest.cpp
View file

@ -36,15 +36,7 @@ string ParameterizedTestAbstract::getNameCurrent() const
void ParameterizedTestAbstract::updateIteration()
{
ParameterizedManager::RegisterThen then = ParameterizedManager::getInstance().registerParameter(this);
if (then == ParameterizedManager::FIRST)
{
onNewIteration(true);
}
else if (then == ParameterizedManager::ITERATE)
{
onNewIteration(false);
}
ParameterizedManager::getInstance().updateParameter(this);
}