Make SetFont actually do something

[wxWidgets.git] / tests / test.cpp

diff --git a/tests/test.cpp b/tests/test.cpp
index c5038865112f34d4519b9e95c21a424a61e1aeee..0da0b1de6b3337e8593dfac88daca1f7bcd5ea37 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();
 };
 
@@ -84,15 +88,15 @@ void TestApp::OnInitCmdLine(wxCmdLineParser& parser)
     wxAppConsole::OnInitCmdLine(parser);
 
     static const wxCmdLineEntryDesc cmdLineDesc[] = {
-        { wxCMD_LINE_SWITCH, _T("l"), _T("list"),
-            _T("list the test suites, do not run them"),
+        { wxCMD_LINE_SWITCH, "l", "list",
+            "list the test suites, do not run them",
             wxCMD_LINE_VAL_NONE, 0 },
-        { wxCMD_LINE_SWITCH, _T("L"), _T("longlist"),
-            _T("list the test cases, do not run them"),
+        { wxCMD_LINE_SWITCH, "L", "longlist",
+            "list the test cases, do not run them",
             wxCMD_LINE_VAL_NONE, 0 },
-        { wxCMD_LINE_PARAM, 0, 0, _T("REGISTRY"), wxCMD_LINE_VAL_STRING,
+        { wxCMD_LINE_PARAM, NULL, NULL, "REGISTRY", wxCMD_LINE_VAL_STRING,
             wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE },
-        { wxCMD_LINE_NONE , 0, 0, 0, wxCMD_LINE_VAL_NONE, 0 }
+        wxCMD_LINE_DESC_END
     };
 
     parser.SetDesc(cmdLineDesc);
@@ -136,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();
@@ -160,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 != "") {