projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Better temporary fix.
[wxWidgets.git]
/
tests
/
test.cpp
diff --git
a/tests/test.cpp
b/tests/test.cpp
index ae856107fad3411ec71a39709cee971d5a8c5b74..b26e73317f0e682dd3cf0ae5d457f2aa50581537 100644
(file)
--- a/
tests/test.cpp
+++ b/
tests/test.cpp
@@
-7,13
+7,9
@@
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
// Licence: wxWidgets licence
///////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(__APPLE__)
- #pragma implementation
- #pragma interface
-#endif
-
-// For compilers that support precompilation, includes "wx/wx.h".
-#include "wx/wxprec.h"
+// For compilers that support precompilation, includes "wx/wx.h"
+// and "wx/cppunit.h"
+#include "testprec.h"
#ifdef __BORLANDC__
#pragma hdrstop
#ifdef __BORLANDC__
#pragma hdrstop
@@
-25,11
+21,18
@@
#endif
#include "wx/cmdline.h"
#endif
#include "wx/cmdline.h"
-#include "wx/cppunit.h"
#include <iostream>
#include <iostream>
-using namespace std;
-using namespace CppUnit;
+using CppUnit::Test;
+using CppUnit::TestSuite;
+using CppUnit::TestFactoryRegistry;
+using CppUnit::TextUi::TestRunner;
+using CppUnit::CompilerOutputter;
+
+using std::string;
+using std::vector;
+using std::auto_ptr;
+using std::cout;
// The application class
//
// The application class
//
@@
-66,7
+69,7
@@
TestApp::TestApp()
bool TestApp::OnInit()
{
cout << "Test program for wxWidgets\n"
bool TestApp::OnInit()
{
cout << "Test program for wxWidgets\n"
- << "build: " << WX_BUILD_OPTIONS_SIGNATURE << endl;
+ << "build: " << WX_BUILD_OPTIONS_SIGNATURE <<
std::
endl;
return wxAppConsole::OnInit();
};
return wxAppConsole::OnInit();
};
@@
-100,19
+103,18
@@
bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
m_registries.push_back(string(parser.GetParam(i).mb_str()));
else
m_registries.push_back("");
m_registries.push_back(string(parser.GetParam(i).mb_str()));
else
m_registries.push_back("");
-
+
m_longlist = parser.Found(_T("longlist"));
m_list = m_longlist || parser.Found(_T("list"));
return wxAppConsole::OnCmdLineParsed(parser);
}
m_longlist = parser.Found(_T("longlist"));
m_list = m_longlist || parser.Found(_T("list"));
return wxAppConsole::OnCmdLineParsed(parser);
}
-#include "wx/uri.h"
// Run
//
int TestApp::OnRun()
{
// Run
//
int TestApp::OnRun()
{
- Te
xtUi::Te
stRunner runner;
+ TestRunner runner;
for (size_t i = 0; i < m_registries.size(); i++) {
auto_ptr<Test> test(m_registries[i].empty() ?
for (size_t i = 0; i < m_registries.size(); i++) {
auto_ptr<Test> test(m_registries[i].empty() ?
@@
-130,18
+132,19
@@
int TestApp::OnRun()
runner.addTest(test.release());
}
runner.addTest(test.release());
}
-#if wxUSE_LOG
- // Switch off logging unless --verbose
- wxLog::EnableLogging(wxLog::GetVerbose());
-#endif // wxUSE_LOG
+ runner.setOutputter(new CompilerOutputter(&runner.result(), cout));
- return m_list || runner.run("", false, true,
#if wxUSE_LOG
#if wxUSE_LOG
- !wxLog::GetVerbose()
+ // Switch off logging unless --verbose
+ bool verbose = wxLog::GetVerbose();
+ wxLog::EnableLogging(verbose);
#else
#else
- true
-#endif // wxUSE_LOG
- ) ? EXIT_SUCCESS : EXIT_FAILURE;
+ bool verbose = false;
+#endif
+
+ return ( m_list || runner.run("", false, true, !verbose) )
+ ? EXIT_SUCCESS
+ : EXIT_FAILURE;
}
// List the tests
}
// List the tests
@@
-155,7
+158,9
@@
void TestApp::List(Test *test, const string& parent /*=""*/) const
// take the last component of the name and append to the parent
name = test->getName();
string::size_type i = name.find_last_of(".:");
// take the last component of the name and append to the parent
name = test->getName();
string::size_type i = name.find_last_of(".:");
- name = parent + "." + (i != string::npos ? name.substr(i + 1) : name);
+ if (i != string::npos)
+ name = name.substr(i + 1);
+ name = parent + "." + name;
// drop the 1st component from the display and indent
if (parent != "") {
// drop the 1st component from the display and indent
if (parent != "") {