wxUSE_STL compilation fixes for wxGenericFontDialog

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index 97df72a276f9d91702b293e2af392322b03429a1..38c9175f9bd5903d6704d7bcc2359a09b0cb007d 100644 (file)
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -7,13 +7,9 @@
 // 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
@@ -25,13 +21,13 @@
 #endif
 
 #include "wx/cmdline.h"
-#include "wx/cppunit.h"
 #include <iostream>
 
 using CppUnit::Test;
 using CppUnit::TestSuite;
 using CppUnit::TestFactoryRegistry;
 using CppUnit::TextUi::TestRunner;
+using CppUnit::CompilerOutputter;
 
 using std::string;
 using std::vector;
@@ -74,6 +70,14 @@ bool TestApp::OnInit()
 {
     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
+
     return wxAppConsole::OnInit();
 };
 
@@ -114,7 +118,6 @@ bool TestApp::OnCmdLineParsed(wxCmdLineParser& parser)
     return wxAppConsole::OnCmdLineParsed(parser);
 }
 
-#include "wx/uri.h"
 // Run
 //
 int TestApp::OnRun()
@@ -137,6 +140,8 @@ int TestApp::OnRun()
             runner.addTest(test.release());
     }
 
+    runner.setOutputter(new CompilerOutputter(&runner.result(), cout));
+
 #if wxUSE_LOG
     // Switch off logging unless --verbose
     bool verbose = wxLog::GetVerbose();
@@ -161,7 +166,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(".:");
-        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 != "") {