parameterized tests have names

This commit is contained in:
Gabriel Schlozer 2016-06-08 11:25:13 +02:00
parent 69d2a14343
commit 733b73dc87
3 changed files with 10 additions and 6 deletions

View file

@ -15,7 +15,7 @@
## SetUpBody \
} static parameterizedCreator ## IterationName ## Instance; \
\
static UnitTest::ParameterizedTest<## Type> ## IterationName(parameterizedCreator ## IterationName ## Instance.parameters);
static UnitTest::ParameterizedTest<## Type> ## IterationName(parameterizedCreator ## IterationName ## Instance.parameters, #IterationName);
#endif

View file

@ -5,8 +5,9 @@ using namespace std;
using namespace UnitTest;
ParameterizedTestAbstract::ParameterizedTestAbstract()
: _iteration(0)
ParameterizedTestAbstract::ParameterizedTestAbstract(const string & name)
: _name(name),
_iteration(0)
{
}

View file

@ -16,9 +16,10 @@ namespace UnitTest
{
friend class ParameterizedManager;
public:
ParameterizedTestAbstract();
ParameterizedTestAbstract(const string & name);
virtual ~ParameterizedTestAbstract();
size_t getIteration();
const string & getName() const { return _name; }
protected:
void updateIteration();
@ -29,6 +30,7 @@ namespace UnitTest
bool hasMoreParameters(int advance = 0) const;
void onNewIteration(bool first);
string _name;
size_t _iteration;
};
@ -42,8 +44,9 @@ namespace UnitTest
virtual void onNextIteration(Test* const test, T_Parameter current, size_t iteration) = 0;
};
ParameterizedTest(vector<T_Parameter> parameters, IParameterizedTestListener* const listener = nullptr)
: _parameters(parameters),
ParameterizedTest(vector<T_Parameter> parameters, const string & name = "", IParameterizedTestListener* const listener = nullptr)
: ParameterizedTestAbstract(name),
_parameters(parameters),
_listener(listener)
{
}