walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix sorting order for test fixtures to get consistent behaviour across different platforms (#1145)

This commit is contained in:
amai2012 2018-04-04 20:51:47 +02:00 committed by GitHub
parent a62c932a8f
commit 41a46364c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/testsuite.cpp
View File

@ -23,7 +23,6 @@
#include <cstdio>
#include <iostream>
#include <list>
#include <string>
std::ostringstream errout;
@ -33,21 +32,27 @@ std::ostringstream output;
* TestRegistry
**/
class TestRegistry {
private:
std::list<TestFixture *> _tests;
struct CompareFixtures {
bool operator()(const TestFixture* lhs, const TestFixture* rhs) {
return lhs->classname < rhs->classname;
}
};
typedef std::set<TestFixture*, CompareFixtures> TestSet;
class TestRegistry {
TestSet _tests;
public:
static TestRegistry &theInstance() {
static TestRegistry testreg;
return testreg;
}
void addTest(TestFixture *t) {
_tests.push_back(t);
_tests.insert(t);
}
const std::list<TestFixture *> &tests() const {
const TestSet &tests() const {
return _tests;
}
};
@ -68,8 +73,8 @@ std::size_t TestFixture::succeeded_todos_counter = 0;
std::set<std::string> TestFixture::missingLibs;
TestFixture::TestFixture(const char * const _name)
:classname(_name)
,quiet_tests(false)
:quiet_tests(false),
classname(_name)
{
TestRegistry::theInstance().addTest(this);
}
@ -287,9 +292,9 @@ std::size_t TestFixture::runTests(const options& args)
countTests = 0;
errmsg.str("");
const std::list<TestFixture *> &tests = TestRegistry::theInstance().tests();
const TestSet &tests = TestRegistry::theInstance().tests();
for (std::list<TestFixture *>::const_iterator it = tests.begin(); it != tests.end(); ++it) {
for (TestSet::const_iterator it = tests.begin(); it != tests.end(); ++it) {
if (classname.empty() || (*it)->classname == classname) {
(*it)->processOptions(args);
(*it)->run(testname);

2
test/testsuite.h
View File

@ -39,7 +39,6 @@ private:
static std::set<std::string> missingLibs;
protected:
std::string classname;
std::string testToRun;
bool quiet_tests;
@ -73,6 +72,7 @@ public:
virtual void reportOut(const std::string &outmsg);
virtual void reportErr(const ErrorLogger::ErrorMessage &msg);
void run(const std::string &str);
const std::string classname;
explicit TestFixture(const char * const _name);
virtual ~TestFixture() { }