X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aa3b041ed734e2d5a4778bc542fa7f59e07426b9..52cefafe7e85c807c92440d20afa1e4d88cc6be3:/tests/test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 0da0b1de6b..1559f2944f 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -26,26 +26,28 @@
 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;
+using namespace std;
+
+#if wxUSE_GUI
+    typedef wxApp TestAppBase;
+#else
+    typedef wxAppConsole TestAppBase;
+#endif
 
 // The application class
 //
-class TestApp : public wxAppConsole
+class TestApp : public TestAppBase
 {
 public:
     TestApp();
 
     // standard overrides
-    void OnInitCmdLine(wxCmdLineParser& parser);
-    bool OnCmdLineParsed(wxCmdLineParser& parser);
-    bool OnInit();
-    int  OnRun();
+    virtual void OnInitCmdLine(wxCmdLineParser& parser);
+    virtual bool OnCmdLineParsed(wxCmdLineParser& parser);
+    virtual bool OnInit();
+    virtual int  OnRun();
+    virtual int  OnExit();
 
 private:
     void List(Test *test, const string& parent = "") const;
@@ -68,24 +70,25 @@ TestApp::TestApp()
 //
 bool TestApp::OnInit()
 {
+    if ( !TestAppBase::OnInit() )
+        return false;
+
     cout << "Test program for wxWidgets\n"
          << "build: " << WX_BUILD_OPTIONS_SIGNATURE << std::endl;
 
-#if !wxUSE_WXVSNPRINTF
-    cout << "\n";
-    cout << "WARNING: VsnprintfTestCase will test the system vsnprintf() function\n";
-    cout << "         instead of the wxWidgets wxVsnprintf_ implementation!" << std::endl;
-    cout << "\n";
-#endif
+#if wxUSE_GUI
+    // create a hidden parent window to be used as parent for the GUI controls
+    new wxFrame(NULL, wxID_ANY, "Hidden wx test frame");
+#endif // wxUSE_GUI
 
-    return wxAppConsole::OnInit();
-};
+    return true;
+}
 
 // The table of command line options
 //
 void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
 {
-    wxAppConsole::OnInitCmdLine(parser);
+    TestAppBase::OnInitCmdLine(parser);
 
     static const wxCmdLineEntryDesc cmdLineDesc[] = {
         { wxCMD_LINE_SWITCH, "l", "list",
@@ -115,14 +118,14 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
     m_longlist = parser.Found(_T("longlist"));
     m_list = m_longlist || parser.Found(_T("list"));
 
-    return wxAppConsole::OnCmdLineParsed(parser);
+    return TestAppBase::OnCmdLineParsed(parser);
 }
 
 // Run
 //
 int TestApp::OnRun()
 {
-    TestRunner runner;
+    CppUnit::TextTestRunner runner;
 
     for (size_t i = 0; i < m_registries.size(); i++) {
         auto_ptr<Test> test(m_registries[i].empty() ?
@@ -140,7 +143,10 @@ int TestApp::OnRun()
             runner.addTest(test.release());
     }
 
-    runner.setOutputter(new CompilerOutputter(&runner.result(), cout));
+    if ( m_list )
+        return EXIT_SUCCESS;
+
+    runner.setOutputter(new CppUnit::CompilerOutputter(&runner.result(), cout));
 
 #if wxUSE_LOG
     // Switch off logging unless --verbose
@@ -150,9 +156,23 @@ int TestApp::OnRun()
     bool verbose = false;
 #endif
 
-    return ( m_list || runner.run("", false, true, !verbose) )
-           ? EXIT_SUCCESS
-           : EXIT_FAILURE;
+    // there is a bug
+    // (http://sf.net/tracker/index.php?func=detail&aid=1649369&group_id=11795&atid=111795)
+    // in some versions of cppunit: they write progress dots to cout (and not
+    // cerr) and don't flush it so all the dots appear at once at the end which
+    // is not very useful so unbuffer cout to work around this
+    cout.setf(ios::unitbuf);
+
+    return runner.run("", false, true, !verbose) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+int TestApp::OnExit()
+{
+#if wxUSE_GUI
+    delete GetTopWindow();
+#endif // wxUSE_GUI
+
+    return 0;
 }
 
 // List the tests