Refactorization: Removed some redundant code
This commit is contained in:
parent
3a5cef8a7e
commit
b7f2f826a4
|
@ -135,9 +135,6 @@ private:
|
||||||
/** Disable assignment operator, no implementation */
|
/** Disable assignment operator, no implementation */
|
||||||
TokenList &operator=(const TokenList &);
|
TokenList &operator=(const TokenList &);
|
||||||
|
|
||||||
public:
|
|
||||||
|
|
||||||
private: /// private
|
|
||||||
/** Token list */
|
/** Token list */
|
||||||
Token *_front, *_back;
|
Token *_front, *_back;
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,6 @@ bool TestFixture::prepareTest(const char testname[])
|
||||||
} else {
|
} else {
|
||||||
std::cout << classname << "::" << testname << std::endl;
|
std::cout << classname << "::" << testname << std::endl;
|
||||||
}
|
}
|
||||||
_lib = Library();
|
|
||||||
currentTest = classname + "::" + testname;
|
currentTest = classname + "::" + testname;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
#include <set>
|
#include <set>
|
||||||
#include "errorlogger.h"
|
#include "errorlogger.h"
|
||||||
#include "redirect.h"
|
#include "redirect.h"
|
||||||
#include "library.h"
|
|
||||||
|
|
||||||
class options;
|
class options;
|
||||||
|
|
||||||
|
@ -38,7 +37,6 @@ private:
|
||||||
static std::set<std::string> missingLibs;
|
static std::set<std::string> missingLibs;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Library _lib;
|
|
||||||
std::string classname;
|
std::string classname;
|
||||||
std::string testToRun;
|
std::string testToRun;
|
||||||
bool gcc_style_errors;
|
bool gcc_style_errors;
|
||||||
|
@ -50,7 +48,6 @@ protected:
|
||||||
bool prepareTest(const char testname[]);
|
bool prepareTest(const char testname[]);
|
||||||
|
|
||||||
void assert_(const char *filename, unsigned int linenr, bool condition) const;
|
void assert_(const char *filename, unsigned int linenr, bool condition) const;
|
||||||
void todoAssert(const char *filename, unsigned int linenr, bool condition) const;
|
|
||||||
|
|
||||||
void assertEquals(const char *filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
|
void assertEquals(const char *filename, unsigned int linenr, const std::string &expected, const std::string &actual, const std::string &msg = emptyString) const;
|
||||||
void assertEquals(const char *filename, unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg = emptyString) const;
|
void assertEquals(const char *filename, unsigned int linenr, const char expected[], const std::string& actual, const std::string &msg = emptyString) const;
|
||||||
|
@ -97,6 +94,5 @@ extern std::ostringstream warnings;
|
||||||
#else
|
#else
|
||||||
#define LOAD_LIB_2( LIB, NAME ) { if ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK) { complainMissingLib(NAME); return; } }
|
#define LOAD_LIB_2( LIB, NAME ) { if ((LIB).load("./testrunner", "cfg/" NAME).errorcode != Library::OK) { complainMissingLib(NAME); return; } }
|
||||||
#endif
|
#endif
|
||||||
#define LOAD_LIB( NAME ) { LOAD_LIB_2(_lib, NAME); }
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
<?define TranslationsDir = "..\gui" ?>
|
<?define TranslationsDir = "..\gui" ?>
|
||||||
<?define CfgsDir = "..\cfg" ?>
|
<?define CfgsDir = "..\cfg" ?>
|
||||||
<?define AddonsDir = "..\addons" ?>
|
<?define AddonsDir = "..\addons" ?>
|
||||||
<?define HelpDir = "..\gui\help" ?>
|
|
||||||
<?define QtDllDir = "..\bin" ?>
|
<?define QtDllDir = "..\bin" ?>
|
||||||
|
|
||||||
<?if $(var.Platform) = x64 ?>
|
<?if $(var.Platform) = x64 ?>
|
||||||
|
|
Loading…
Reference in New Issue