Fix archivers test suite broken by transition to Catch
The code of ziptest and tartest classes still compiled, but actually didn't do anything during the run-time because makeSuite() method was never called. Replace this unused method with DoRunTest() and override runTest() in the test suite classes to actually run the tests.
This commit is contained in:
@@ -213,11 +213,10 @@ class ziptest : public ArchiveTestSuite
|
||||
{
|
||||
public:
|
||||
ziptest();
|
||||
static CppUnit::Test *suite() { return (new ziptest)->makeSuite(); }
|
||||
|
||||
void runTest() wxOVERRIDE { DoRunTest(); }
|
||||
|
||||
protected:
|
||||
ArchiveTestSuite *makeSuite();
|
||||
|
||||
CppUnit::Test *makeTest(string descr, int options,
|
||||
bool genericInterface, const wxString& archiver,
|
||||
const wxString& unarchiver);
|
||||
@@ -230,23 +229,6 @@ ziptest::ziptest()
|
||||
AddUnArchiver(wxT("unzip -q %s"));
|
||||
}
|
||||
|
||||
ArchiveTestSuite *ziptest::makeSuite()
|
||||
{
|
||||
ArchiveTestSuite::makeSuite();
|
||||
|
||||
#if 0
|
||||
// zip doesn't support this any more so disabled
|
||||
if (IsInPath(wxT("zip")))
|
||||
for (int options = 0; options <= PipeIn; options += PipeIn) {
|
||||
string name = Description(wxT("ZipPipeTestCase"), options,
|
||||
false, wxT(""), wxT("zip -q - -"));
|
||||
addTest(new ZipPipeTestCase(name, options));
|
||||
}
|
||||
#endif
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
CppUnit::Test *ziptest::makeTest(
|
||||
string descr,
|
||||
int options,
|
||||
|
Reference in New Issue
Block a user