diff --git a/tests/archive/tartest.cpp b/tests/archive/tartest.cpp index 07d907a538..07a330c30a 100644 --- a/tests/archive/tartest.cpp +++ b/tests/archive/tartest.cpp @@ -25,7 +25,7 @@ using std::string; /////////////////////////////////////////////////////////////////////////////// -// Tar suite +// Tar suite class tartest : public ArchiveTestSuite { @@ -38,7 +38,7 @@ protected: CppUnit::Test *makeTest(string descr, int options, bool genericInterface, const wxString& archiver, - const wxString& unarchiver); + const wxString& unarchiver) wxOVERRIDE; }; tartest::tartest() diff --git a/tests/archive/ziptest.cpp b/tests/archive/ziptest.cpp index 24c62e3f8f..0abe646e4f 100644 --- a/tests/archive/ziptest.cpp +++ b/tests/archive/ziptest.cpp @@ -43,13 +43,13 @@ public: protected: void OnCreateArchive(wxZipOutputStream& zip); - + void OnArchiveExtracted(wxZipInputStream& zip, int expectedTotal); - + void OnCreateEntry(wxZipOutputStream& zip, TestEntry& testEntry, wxZipEntry *entry); - + void OnEntryExtracted(wxZipEntry& entry, const TestEntry& testEntry, wxZipInputStream *arc); @@ -206,7 +206,7 @@ void ZipPipeTestCase::runTest() /////////////////////////////////////////////////////////////////////////////// -// Zip suite +// Zip suite class ziptest : public ArchiveTestSuite { @@ -218,7 +218,7 @@ public: protected: CppUnit::Test *makeTest(string descr, int options, bool genericInterface, const wxString& archiver, - const wxString& unarchiver); + const wxString& unarchiver) wxOVERRIDE; }; ziptest::ziptest() diff --git a/tests/controls/bitmapcomboboxtest.cpp b/tests/controls/bitmapcomboboxtest.cpp index 55c044465f..7ac6c112d5 100644 --- a/tests/controls/bitmapcomboboxtest.cpp +++ b/tests/controls/bitmapcomboboxtest.cpp @@ -34,17 +34,17 @@ class BitmapComboBoxTestCase : public TextEntryTestCase, public: BitmapComboBoxTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxTextEntry *GetTestEntry() const { return m_combo; } - virtual wxWindow *GetTestWindow() const { return m_combo; } + virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; } + virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; } - virtual wxItemContainer *GetContainer() const { return m_combo; } - virtual wxWindow *GetContainerWindow() const { return m_combo; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; } - virtual void CheckStringSelection(const char * WXUNUSED(sel)) + virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE { // do nothing here, as explained in TextEntryTestCase comment, our // GetStringSelection() is the wxChoice, not wxTextEntry, one and there diff --git a/tests/controls/bitmaptogglebuttontest.cpp b/tests/controls/bitmaptogglebuttontest.cpp index 9ba028d93d..2a477daa80 100644 --- a/tests/controls/bitmaptogglebuttontest.cpp +++ b/tests/controls/bitmaptogglebuttontest.cpp @@ -31,8 +31,8 @@ class BitmapToggleButtonTestCase : public CppUnit::TestCase public: BitmapToggleButtonTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( BitmapToggleButtonTestCase ); diff --git a/tests/controls/buttontest.cpp b/tests/controls/buttontest.cpp index 26638d9583..764de5b28e 100644 --- a/tests/controls/buttontest.cpp +++ b/tests/controls/buttontest.cpp @@ -32,8 +32,8 @@ class ButtonTestCase : public CppUnit::TestCase public: ButtonTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( ButtonTestCase ); @@ -164,7 +164,7 @@ void ButtonTestCase::Bitmap() CPPUNIT_ASSERT(!m_button->GetBitmap().IsOk()); - m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, + m_button->SetBitmap(wxArtProvider::GetIcon(wxART_INFORMATION, wxART_OTHER, wxSize(32, 32))); diff --git a/tests/controls/checkboxtest.cpp b/tests/controls/checkboxtest.cpp index 5f38a61f2c..e1edd3e514 100644 --- a/tests/controls/checkboxtest.cpp +++ b/tests/controls/checkboxtest.cpp @@ -26,8 +26,8 @@ class CheckBoxTestCase : public CppUnit::TestCase public: CheckBoxTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( CheckBoxTestCase ); diff --git a/tests/controls/checklistboxtest.cpp b/tests/controls/checklistboxtest.cpp index b81ea7cf43..27a33ccf54 100644 --- a/tests/controls/checklistboxtest.cpp +++ b/tests/controls/checklistboxtest.cpp @@ -27,12 +27,12 @@ class CheckListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestC public: CheckListBoxTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxItemContainer *GetContainer() const { return m_check; } - virtual wxWindow *GetContainerWindow() const { return m_check; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_check; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_check; } CPPUNIT_TEST_SUITE( CheckListBoxTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/choicebooktest.cpp b/tests/controls/choicebooktest.cpp index 23683cbdf4..1c3efaf020 100644 --- a/tests/controls/choicebooktest.cpp +++ b/tests/controls/choicebooktest.cpp @@ -27,16 +27,16 @@ class ChoicebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: ChoicebookTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxBookCtrlBase *GetBase() const { return m_choicebook; } + virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_choicebook; } - virtual wxEventType GetChangedEvent() const + virtual wxEventType GetChangedEvent() const wxOVERRIDE { return wxEVT_CHOICEBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const + virtual wxEventType GetChangingEvent() const wxOVERRIDE { return wxEVT_CHOICEBOOK_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( ChoicebookTestCase ); diff --git a/tests/controls/choicetest.cpp b/tests/controls/choicetest.cpp index 14e2f4600f..eacb0e88e6 100644 --- a/tests/controls/choicetest.cpp +++ b/tests/controls/choicetest.cpp @@ -26,12 +26,12 @@ class ChoiceTestCase : public ItemContainerTestCase, public CppUnit::TestCase public: ChoiceTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxItemContainer *GetContainer() const { return m_choice; } - virtual wxWindow *GetContainerWindow() const { return m_choice; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_choice; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_choice; } CPPUNIT_TEST_SUITE( ChoiceTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/comboboxtest.cpp b/tests/controls/comboboxtest.cpp index 705f406318..6bec622644 100644 --- a/tests/controls/comboboxtest.cpp +++ b/tests/controls/comboboxtest.cpp @@ -37,17 +37,17 @@ class ComboBoxTestCase : public TextEntryTestCase, public ItemContainerTestCase, public: ComboBoxTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxTextEntry *GetTestEntry() const { return m_combo; } - virtual wxWindow *GetTestWindow() const { return m_combo; } + virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; } + virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; } - virtual wxItemContainer *GetContainer() const { return m_combo; } - virtual wxWindow *GetContainerWindow() const { return m_combo; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; } - virtual void CheckStringSelection(const char * WXUNUSED(sel)) + virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE { // do nothing here, as explained in TextEntryTestCase comment, our // GetStringSelection() is the wxChoice, not wxTextEntry, one and there @@ -64,7 +64,7 @@ private: // TODO on OS X only works interactively // WXUISIM_TEST( Editable ); CPPUNIT_TEST( Hint ); - CPPUNIT_TEST( CopyPaste ); + CPPUNIT_TEST( CopyPaste ); CPPUNIT_TEST( UndoRedo ); #else wxTEXT_ENTRY_TESTS(); diff --git a/tests/controls/dataviewctrltest.cpp b/tests/controls/dataviewctrltest.cpp index 339b389dad..45c10cf253 100644 --- a/tests/controls/dataviewctrltest.cpp +++ b/tests/controls/dataviewctrltest.cpp @@ -32,8 +32,8 @@ class DataViewCtrlTestCase : public CppUnit::TestCase public: DataViewCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( DataViewCtrlTestCase ); diff --git a/tests/controls/datepickerctrltest.cpp b/tests/controls/datepickerctrltest.cpp index 2a9094a6e7..403e18ac01 100644 --- a/tests/controls/datepickerctrltest.cpp +++ b/tests/controls/datepickerctrltest.cpp @@ -30,8 +30,8 @@ class DatePickerCtrlTestCase : public CppUnit::TestCase public: DatePickerCtrlTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( DatePickerCtrlTestCase ); diff --git a/tests/controls/frametest.cpp b/tests/controls/frametest.cpp index fff1dfbff1..5d68b42a45 100644 --- a/tests/controls/frametest.cpp +++ b/tests/controls/frametest.cpp @@ -24,8 +24,8 @@ class FrameTestCase : public CppUnit::TestCase public: FrameTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( FrameTestCase ); diff --git a/tests/controls/gaugetest.cpp b/tests/controls/gaugetest.cpp index a07872f826..3d2163d81a 100644 --- a/tests/controls/gaugetest.cpp +++ b/tests/controls/gaugetest.cpp @@ -24,8 +24,8 @@ class GaugeTestCase : public CppUnit::TestCase public: GaugeTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( GaugeTestCase ); diff --git a/tests/controls/gridtest.cpp b/tests/controls/gridtest.cpp index 7f79e8f48d..abc11a8803 100644 --- a/tests/controls/gridtest.cpp +++ b/tests/controls/gridtest.cpp @@ -42,8 +42,8 @@ class GridTestCase : public CppUnit::TestCase public: GridTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( GridTestCase ); diff --git a/tests/controls/headerctrltest.cpp b/tests/controls/headerctrltest.cpp index eb41b3210c..e235cd622a 100644 --- a/tests/controls/headerctrltest.cpp +++ b/tests/controls/headerctrltest.cpp @@ -31,8 +31,8 @@ class HeaderCtrlTestCase : public CppUnit::TestCase public: HeaderCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( HeaderCtrlTestCase ); diff --git a/tests/controls/htmllboxtest.cpp b/tests/controls/htmllboxtest.cpp index 764d2b861f..92707dd0a8 100644 --- a/tests/controls/htmllboxtest.cpp +++ b/tests/controls/htmllboxtest.cpp @@ -25,12 +25,12 @@ class HtmlListBoxTestCase : public ItemContainerTestCase, public: HtmlListBoxTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxItemContainer *GetContainer() const { return m_htmllbox; } - virtual wxWindow *GetContainerWindow() const { return m_htmllbox; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_htmllbox; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_htmllbox; } CPPUNIT_TEST_SUITE( HtmlListBoxTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/hyperlinkctrltest.cpp b/tests/controls/hyperlinkctrltest.cpp index 420490b4d6..88ff9ac5f6 100644 --- a/tests/controls/hyperlinkctrltest.cpp +++ b/tests/controls/hyperlinkctrltest.cpp @@ -28,8 +28,8 @@ class HyperlinkCtrlTestCase : public CppUnit::TestCase public: HyperlinkCtrlTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( HyperlinkCtrlTestCase ); diff --git a/tests/controls/label.cpp b/tests/controls/label.cpp index 2a272f7a65..3ba89c2f7e 100644 --- a/tests/controls/label.cpp +++ b/tests/controls/label.cpp @@ -33,8 +33,8 @@ class LabelTestCase : public CppUnit::TestCase public: LabelTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( LabelTestCase ); diff --git a/tests/controls/listbasetest.cpp b/tests/controls/listbasetest.cpp index 0548b93a45..ca49e77914 100644 --- a/tests/controls/listbasetest.cpp +++ b/tests/controls/listbasetest.cpp @@ -179,7 +179,7 @@ void ListBaseTestCase::ChangeMode() void ListBaseTestCase::ItemClick() { -#if wxUSE_UIACTIONSIMULATOR +#if wxUSE_UIACTIONSIMULATOR #ifdef __WXMSW__ // FIXME: This test fails on MSW buildbot slaves although works fine on @@ -226,7 +226,7 @@ void ListBaseTestCase::ItemClick() // when the first item was selected the focus changes to it, but not // on subsequent clicks - + // FIXME: This test fail under wxGTK & wxOSX because we get 3 FOCUSED events and // 2 SELECTED ones instead of the one of each we expect for some // reason, this needs to be debugged as it may indicate a bug in the diff --git a/tests/controls/listbooktest.cpp b/tests/controls/listbooktest.cpp index 9790adc632..d87bd73e33 100644 --- a/tests/controls/listbooktest.cpp +++ b/tests/controls/listbooktest.cpp @@ -28,16 +28,16 @@ class ListbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: ListbookTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxBookCtrlBase *GetBase() const { return m_listbook; } + virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_listbook; } - virtual wxEventType GetChangedEvent() const + virtual wxEventType GetChangedEvent() const wxOVERRIDE { return wxEVT_LISTBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const + virtual wxEventType GetChangingEvent() const wxOVERRIDE { return wxEVT_LISTBOOK_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( ListbookTestCase ); diff --git a/tests/controls/listboxtest.cpp b/tests/controls/listboxtest.cpp index ec2897ad94..f7e37a375d 100644 --- a/tests/controls/listboxtest.cpp +++ b/tests/controls/listboxtest.cpp @@ -28,12 +28,12 @@ class ListBoxTestCase : public ItemContainerTestCase, public CppUnit::TestCase public: ListBoxTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxItemContainer *GetContainer() const { return m_list; } - virtual wxWindow *GetContainerWindow() const { return m_list; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_list; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_list; } CPPUNIT_TEST_SUITE( ListBoxTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/listctrltest.cpp b/tests/controls/listctrltest.cpp index b606b73f44..0c31dcb189 100644 --- a/tests/controls/listctrltest.cpp +++ b/tests/controls/listctrltest.cpp @@ -37,10 +37,10 @@ class ListCtrlTestCase : public ListBaseTestCase, public CppUnit::TestCase public: ListCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; - virtual wxListCtrl *GetList() const { return m_list; } + virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; } private: CPPUNIT_TEST_SUITE( ListCtrlTestCase ); diff --git a/tests/controls/listviewtest.cpp b/tests/controls/listviewtest.cpp index ceec1ed0ae..b4246d9f26 100644 --- a/tests/controls/listviewtest.cpp +++ b/tests/controls/listviewtest.cpp @@ -24,10 +24,10 @@ class ListViewTestCase : public ListBaseTestCase, public CppUnit::TestCase public: ListViewTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; - virtual wxListCtrl *GetList() const { return m_list; } + virtual wxListCtrl *GetList() const wxOVERRIDE { return m_list; } private: CPPUNIT_TEST_SUITE( ListViewTestCase ); diff --git a/tests/controls/notebooktest.cpp b/tests/controls/notebooktest.cpp index 5471dda4ce..c209eb4c3f 100644 --- a/tests/controls/notebooktest.cpp +++ b/tests/controls/notebooktest.cpp @@ -27,16 +27,16 @@ class NotebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: NotebookTestCase() { m_notebook = NULL; m_numPageChanges = 0; } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxBookCtrlBase *GetBase() const { return m_notebook; } + virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_notebook; } - virtual wxEventType GetChangedEvent() const + virtual wxEventType GetChangedEvent() const wxOVERRIDE { return wxEVT_NOTEBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const + virtual wxEventType GetChangingEvent() const wxOVERRIDE { return wxEVT_NOTEBOOK_PAGE_CHANGING; } diff --git a/tests/controls/ownerdrawncomboboxtest.cpp b/tests/controls/ownerdrawncomboboxtest.cpp index 4d187e8446..abeb7a90a1 100644 --- a/tests/controls/ownerdrawncomboboxtest.cpp +++ b/tests/controls/ownerdrawncomboboxtest.cpp @@ -39,17 +39,17 @@ class OwnerDrawnComboBoxTestCase : public TextEntryTestCase, public: OwnerDrawnComboBoxTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxTextEntry *GetTestEntry() const { return m_combo; } - virtual wxWindow *GetTestWindow() const { return m_combo; } + virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_combo; } + virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_combo; } - virtual wxItemContainer *GetContainer() const { return m_combo; } - virtual wxWindow *GetContainerWindow() const { return m_combo; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_combo; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_combo; } - virtual void CheckStringSelection(const char * WXUNUSED(sel)) + virtual void CheckStringSelection(const char * WXUNUSED(sel)) wxOVERRIDE { // do nothing here, as explained in TextEntryTestCase comment, our // GetStringSelection() is the wxChoice, not wxTextEntry, one and there diff --git a/tests/controls/pickertest.cpp b/tests/controls/pickertest.cpp index 86e687e90f..51637a3269 100644 --- a/tests/controls/pickertest.cpp +++ b/tests/controls/pickertest.cpp @@ -30,11 +30,11 @@ class ColourPickerCtrlTestCase : public PickerBaseTestCase, public: ColourPickerCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxPickerBase *GetBase() const { return m_colour; } + virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_colour; } CPPUNIT_TEST_SUITE( ColourPickerCtrlTestCase ); wxPICKER_BASE_TESTS(); @@ -74,11 +74,11 @@ class DirPickerCtrlTestCase : public PickerBaseTestCase, public: DirPickerCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxPickerBase *GetBase() const { return m_dir; } + virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_dir; } CPPUNIT_TEST_SUITE( DirPickerCtrlTestCase ); wxPICKER_BASE_TESTS(); @@ -119,11 +119,11 @@ class FilePickerCtrlTestCase : public PickerBaseTestCase, public: FilePickerCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxPickerBase *GetBase() const { return m_file; } + virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_file; } CPPUNIT_TEST_SUITE( FilePickerCtrlTestCase ); wxPICKER_BASE_TESTS(); @@ -165,11 +165,11 @@ class FontPickerCtrlTestCase : public PickerBaseTestCase, public: FontPickerCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxPickerBase *GetBase() const { return m_font; } + virtual wxPickerBase *GetBase() const wxOVERRIDE { return m_font; } CPPUNIT_TEST_SUITE( FontPickerCtrlTestCase ); wxPICKER_BASE_TESTS(); diff --git a/tests/controls/radioboxtest.cpp b/tests/controls/radioboxtest.cpp index f64546c34f..8f6ae8a61e 100644 --- a/tests/controls/radioboxtest.cpp +++ b/tests/controls/radioboxtest.cpp @@ -26,8 +26,8 @@ class RadioBoxTestCase : public CppUnit::TestCase public: RadioBoxTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( RadioBoxTestCase ); diff --git a/tests/controls/radiobuttontest.cpp b/tests/controls/radiobuttontest.cpp index 102d1a3532..0d687a7918 100644 --- a/tests/controls/radiobuttontest.cpp +++ b/tests/controls/radiobuttontest.cpp @@ -27,8 +27,8 @@ class RadioButtonTestCase : public CppUnit::TestCase public: RadioButtonTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( RadioButtonTestCase ); diff --git a/tests/controls/rearrangelisttest.cpp b/tests/controls/rearrangelisttest.cpp index 3049b87c06..ec83a40f66 100644 --- a/tests/controls/rearrangelisttest.cpp +++ b/tests/controls/rearrangelisttest.cpp @@ -25,12 +25,12 @@ class RearrangeListTestCase : public ItemContainerTestCase, public CppUnit::Test public: RearrangeListTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxItemContainer *GetContainer() const { return m_rearrange; } - virtual wxWindow *GetContainerWindow() const { return m_rearrange; } + virtual wxItemContainer *GetContainer() const wxOVERRIDE { return m_rearrange; } + virtual wxWindow *GetContainerWindow() const wxOVERRIDE { return m_rearrange; } CPPUNIT_TEST_SUITE( RearrangeListTestCase ); wxITEM_CONTAINER_TESTS(); diff --git a/tests/controls/richtextctrltest.cpp b/tests/controls/richtextctrltest.cpp index 2b5036fba5..bad0f17228 100644 --- a/tests/controls/richtextctrltest.cpp +++ b/tests/controls/richtextctrltest.cpp @@ -29,8 +29,8 @@ class RichTextCtrlTestCase : public CppUnit::TestCase public: RichTextCtrlTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( RichTextCtrlTestCase ); diff --git a/tests/controls/simplebooktest.cpp b/tests/controls/simplebooktest.cpp index b1452b9305..d5dffcc584 100644 --- a/tests/controls/simplebooktest.cpp +++ b/tests/controls/simplebooktest.cpp @@ -27,16 +27,16 @@ class SimplebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: SimplebookTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxBookCtrlBase *GetBase() const { return m_simplebook; } + virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_simplebook; } - virtual wxEventType GetChangedEvent() const + virtual wxEventType GetChangedEvent() const wxOVERRIDE { return wxEVT_BOOKCTRL_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const + virtual wxEventType GetChangingEvent() const wxOVERRIDE { return wxEVT_BOOKCTRL_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( SimplebookTestCase ); diff --git a/tests/controls/slidertest.cpp b/tests/controls/slidertest.cpp index d02b3ee0be..e09b20f3b0 100644 --- a/tests/controls/slidertest.cpp +++ b/tests/controls/slidertest.cpp @@ -27,8 +27,8 @@ class SliderTestCase : public CppUnit::TestCase public: SliderTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( SliderTestCase ); diff --git a/tests/controls/spinctrldbltest.cpp b/tests/controls/spinctrldbltest.cpp index 76cfe783d2..989891c9bd 100644 --- a/tests/controls/spinctrldbltest.cpp +++ b/tests/controls/spinctrldbltest.cpp @@ -25,8 +25,8 @@ class SpinCtrlDoubleTestCase : public CppUnit::TestCase public: SpinCtrlDoubleTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( SpinCtrlDoubleTestCase ); diff --git a/tests/controls/spinctrltest.cpp b/tests/controls/spinctrltest.cpp index 0692b55e63..da4df9363f 100644 --- a/tests/controls/spinctrltest.cpp +++ b/tests/controls/spinctrltest.cpp @@ -27,8 +27,8 @@ class SpinCtrlTestCase : public CppUnit::TestCase public: SpinCtrlTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( SpinCtrlTestCase ); diff --git a/tests/controls/textctrltest.cpp b/tests/controls/textctrltest.cpp index eceaee7e47..753890f85c 100644 --- a/tests/controls/textctrltest.cpp +++ b/tests/controls/textctrltest.cpp @@ -41,12 +41,12 @@ class TextCtrlTestCase : public TextEntryTestCase, public CppUnit::TestCase public: TextCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxTextEntry *GetTestEntry() const { return m_text; } - virtual wxWindow *GetTestWindow() const { return m_text; } + virtual wxTextEntry *GetTestEntry() const wxOVERRIDE { return m_text; } + virtual wxWindow *GetTestWindow() const wxOVERRIDE { return m_text; } #define SINGLE_AND_MULTI_TESTS() \ WXUISIM_TEST( ReadOnly ); \ @@ -223,7 +223,7 @@ void TextCtrlTestCase::ReadOnly() // SetEditable() is supposed to override wxTE_READONLY m_text->SetEditable(true); - + #if defined(__WXOSX__) || defined(__WXUNIVERSAL__) // a ready only text field might not have been focusable at all m_text->SetFocus(); diff --git a/tests/controls/togglebuttontest.cpp b/tests/controls/togglebuttontest.cpp index a06ede48d0..a8ada1fa25 100644 --- a/tests/controls/togglebuttontest.cpp +++ b/tests/controls/togglebuttontest.cpp @@ -27,8 +27,8 @@ class ToggleButtonTestCase : public CppUnit::TestCase public: ToggleButtonTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( ToggleButtonTestCase ); diff --git a/tests/controls/toolbooktest.cpp b/tests/controls/toolbooktest.cpp index 90047eb848..92cdc3aa81 100644 --- a/tests/controls/toolbooktest.cpp +++ b/tests/controls/toolbooktest.cpp @@ -28,19 +28,19 @@ class ToolbookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: ToolbookTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxBookCtrlBase *GetBase() const { return m_toolbook; } + virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_toolbook; } - virtual wxEventType GetChangedEvent() const + virtual wxEventType GetChangedEvent() const wxOVERRIDE { return wxEVT_TOOLBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const + virtual wxEventType GetChangingEvent() const wxOVERRIDE { return wxEVT_TOOLBOOK_PAGE_CHANGING; } - virtual void Realize() { m_toolbook->GetToolBar()->Realize(); } + virtual void Realize() wxOVERRIDE { m_toolbook->GetToolBar()->Realize(); } CPPUNIT_TEST_SUITE( ToolbookTestCase ); wxBOOK_CTRL_BASE_TESTS(); diff --git a/tests/controls/treebooktest.cpp b/tests/controls/treebooktest.cpp index aa855bf6f3..41ff507a42 100644 --- a/tests/controls/treebooktest.cpp +++ b/tests/controls/treebooktest.cpp @@ -27,16 +27,16 @@ class TreebookTestCase : public BookCtrlBaseTestCase, public CppUnit::TestCase public: TreebookTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: - virtual wxBookCtrlBase *GetBase() const { return m_treebook; } + virtual wxBookCtrlBase *GetBase() const wxOVERRIDE { return m_treebook; } - virtual wxEventType GetChangedEvent() const + virtual wxEventType GetChangedEvent() const wxOVERRIDE { return wxEVT_TREEBOOK_PAGE_CHANGED; } - virtual wxEventType GetChangingEvent() const + virtual wxEventType GetChangingEvent() const wxOVERRIDE { return wxEVT_TREEBOOK_PAGE_CHANGING; } CPPUNIT_TEST_SUITE( TreebookTestCase ); diff --git a/tests/controls/treectrltest.cpp b/tests/controls/treectrltest.cpp index 8a6c822e9a..6f8e8ff514 100644 --- a/tests/controls/treectrltest.cpp +++ b/tests/controls/treectrltest.cpp @@ -38,8 +38,8 @@ class TreeCtrlTestCase : public CppUnit::TestCase public: TreeCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( TreeCtrlTestCase ); diff --git a/tests/controls/treelistctrltest.cpp b/tests/controls/treelistctrltest.cpp index d4a3ac96d6..3648b7f86c 100644 --- a/tests/controls/treelistctrltest.cpp +++ b/tests/controls/treelistctrltest.cpp @@ -31,8 +31,8 @@ class TreeListCtrlTestCase : public CppUnit::TestCase public: TreeListCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( TreeListCtrlTestCase ); diff --git a/tests/controls/virtlistctrltest.cpp b/tests/controls/virtlistctrltest.cpp index fec6c1bd40..f04f460a00 100644 --- a/tests/controls/virtlistctrltest.cpp +++ b/tests/controls/virtlistctrltest.cpp @@ -33,8 +33,8 @@ class VirtListCtrlTestCase : public CppUnit::TestCase public: VirtListCtrlTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( VirtListCtrlTestCase ); diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp index a71db74ef7..93ed8344a6 100644 --- a/tests/controls/webtest.cpp +++ b/tests/controls/webtest.cpp @@ -31,8 +31,8 @@ class WebTestCase : public CppUnit::TestCase public: WebTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( WebTestCase ); diff --git a/tests/controls/windowtest.cpp b/tests/controls/windowtest.cpp index c7933832eb..bf34e19fde 100644 --- a/tests/controls/windowtest.cpp +++ b/tests/controls/windowtest.cpp @@ -31,8 +31,8 @@ class WindowTestCase : public CppUnit::TestCase public: WindowTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( WindowTestCase ); diff --git a/tests/events/clone.cpp b/tests/events/clone.cpp index 0d98548806..2f06827fda 100644 --- a/tests/events/clone.cpp +++ b/tests/events/clone.cpp @@ -55,14 +55,14 @@ void EventCloneTestCase::CheckAll() for (; ci; ci = ci->GetNext()) { wxString cn = wxString(ci->GetClassName()); - + // is this class derived from wxEvent? if ( !ci->IsKindOf(CLASSINFO(wxEvent)) || cn == "wxEvent" ) continue; const std::string - msg = std::string("Event class \"") + + msg = std::string("Event class \"") + std::string(cn.c_str()) + "\""; CPPUNIT_ASSERT_MESSAGE( msg, ci->IsDynamic() ); diff --git a/tests/events/keyboard.cpp b/tests/events/keyboard.cpp index 29f849aab3..05229f9a99 100644 --- a/tests/events/keyboard.cpp +++ b/tests/events/keyboard.cpp @@ -197,8 +197,8 @@ class KeyboardEventTestCase : public CppUnit::TestCase public: KeyboardEventTestCase() {} - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( KeyboardEventTestCase ); diff --git a/tests/events/propagation.cpp b/tests/events/propagation.cpp index bf2d40e7d0..8c58d662fd 100644 --- a/tests/events/propagation.cpp +++ b/tests/events/propagation.cpp @@ -234,8 +234,8 @@ class EventPropagationTestCase : public CppUnit::TestCase public: EventPropagationTestCase() {} - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( EventPropagationTestCase ); diff --git a/tests/file/dir.cpp b/tests/file/dir.cpp index 8b5c4ed89f..d788ee642e 100644 --- a/tests/file/dir.cpp +++ b/tests/file/dir.cpp @@ -32,8 +32,8 @@ class DirTestCase : public CppUnit::TestCase public: DirTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( DirTestCase ); @@ -181,7 +181,7 @@ void DirTestCase::DirExists() { const char *dirname; bool shouldExist; - } testData[] = + } testData[] = { { ".", true }, { "..", true }, diff --git a/tests/file/filefn.cpp b/tests/file/filefn.cpp index 49d8767dbd..5d9e6a435e 100644 --- a/tests/file/filefn.cpp +++ b/tests/file/filefn.cpp @@ -33,8 +33,8 @@ class FileFunctionsTestCase : public CppUnit::TestCase { public: FileFunctionsTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( FileFunctionsTestCase ); @@ -453,7 +453,7 @@ void FileFunctionsTestCase::FileEof() bool failed = true; try { - file.Eof(); + file.Eof(); failed = false; } catch (...) diff --git a/tests/filekind/filekind.cpp b/tests/filekind/filekind.cpp index fa270897b4..0d37dd2cc3 100644 --- a/tests/filekind/filekind.cpp +++ b/tests/filekind/filekind.cpp @@ -73,7 +73,7 @@ class FileKindTestCase : public CppUnit::TestCase }; // test a wxFFile and wxFFileInput/OutputStreams of a known type -// +// void FileKindTestCase::TestFILE(wxFFile& file, bool expected) { CPPUNIT_ASSERT(file.IsOpened()); @@ -191,7 +191,7 @@ void FileKindTestCase::MemoryStream() } // Stdin will usually be a terminal, if so then test it -// +// void FileKindTestCase::Stdin() { if (isatty(0)) diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index 762061813c..bba94b23cd 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -665,7 +665,7 @@ void FileNameTestCase::TestCreateTempFileName() if (testData[n].shouldSucceed) { errDesc += "; path is " + path.ToStdString(); - + // test the place where the temp file has been created wxString expected = testData[n].expectedFolder; expected.Replace("$SYSTEM_TEMP", wxStandardPaths::Get().GetTempDir()); @@ -688,7 +688,7 @@ void FileNameTestCase::TestGetTimes() wxDateTime dtAccess, dtMod, dtCreate; CPPUNIT_ASSERT( fn.GetTimes(&dtAccess, &dtMod, &dtCreate) ); - // make sure all retrieved dates are equal to the current date&time + // make sure all retrieved dates are equal to the current date&time // with an accuracy up to 1 minute CPPUNIT_ASSERT(dtCreate.IsEqualUpTo(wxDateTime::Now(), wxTimeSpan(0,1))); CPPUNIT_ASSERT(dtMod.IsEqualUpTo(wxDateTime::Now(), wxTimeSpan(0,1))); diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp index d19b5e5c09..e074b2df9d 100644 --- a/tests/fswatcher/fswatchertest.cpp +++ b/tests/fswatcher/fswatchertest.cpp @@ -438,8 +438,8 @@ class FileSystemWatcherTestCase : public CppUnit::TestCase public: FileSystemWatcherTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; protected: wxEventLoopBase* m_loop; diff --git a/tests/graphics/affinematrix.cpp b/tests/graphics/affinematrix.cpp index dce58f76ae..130c95424b 100644 --- a/tests/graphics/affinematrix.cpp +++ b/tests/graphics/affinematrix.cpp @@ -121,7 +121,7 @@ public: { } - virtual void setUp() + virtual void setUp() wxOVERRIDE { m_bmpOrig = wxBitmap(m_imgOrig); m_bmpUsingMatrix.Create(m_bmpOrig.GetSize(), m_bmpOrig.GetDepth()); diff --git a/tests/graphics/bitmap.cpp b/tests/graphics/bitmap.cpp index ea79bddfff..6588a3a636 100644 --- a/tests/graphics/bitmap.cpp +++ b/tests/graphics/bitmap.cpp @@ -37,8 +37,8 @@ class BitmapTestCase : public CppUnit::TestCase public: BitmapTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( BitmapTestCase ); diff --git a/tests/graphics/boundingbox.cpp b/tests/graphics/boundingbox.cpp index 1c316e3a80..74c177b58a 100644 --- a/tests/graphics/boundingbox.cpp +++ b/tests/graphics/boundingbox.cpp @@ -47,7 +47,7 @@ public: m_bmp = wxNullBitmap; } - virtual void setUp() + virtual void setUp() wxOVERRIDE { m_gcdc->ResetBoundingBox(); } diff --git a/tests/graphics/clippingbox.cpp b/tests/graphics/clippingbox.cpp index 42eed74701..87f56119e9 100644 --- a/tests/graphics/clippingbox.cpp +++ b/tests/graphics/clippingbox.cpp @@ -127,7 +127,7 @@ public: { } - virtual void setUp() { wxASSERT( m_dc ); } + virtual void setUp() wxOVERRIDE { wxASSERT( m_dc ); } virtual wxDC* GetDC(wxMemoryDC* dc) = 0; protected: diff --git a/tests/html/htmlwindow.cpp b/tests/html/htmlwindow.cpp index af9cbb2e33..2bf6ba593d 100644 --- a/tests/html/htmlwindow.cpp +++ b/tests/html/htmlwindow.cpp @@ -35,8 +35,8 @@ class HtmlWindowTestCase : public CppUnit::TestCase public: HtmlWindowTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( HtmlWindowTestCase ); diff --git a/tests/interactive/input.cpp b/tests/interactive/input.cpp index da72fd6755..fa3f751201 100644 --- a/tests/interactive/input.cpp +++ b/tests/interactive/input.cpp @@ -95,7 +95,7 @@ void InteractiveInputTestCase::TestDiskInfo() // kill the last '\n' pathname[wxStrlen(pathname) - 1] = 0; - + if (pathname[0] == '\0' || wxStrcmp(pathname, "quit") == 0) break; @@ -111,7 +111,7 @@ void InteractiveInputTestCase::TestDiskInfo() (free / 1024).ToString().c_str(), pathname); } - + wxPuts("\n"); } @@ -128,7 +128,7 @@ void InteractiveInputTestCase::TestDiskInfo() void InteractiveInputTestCase::TestRegExInteractive() { -#ifdef TEST_REGEX +#ifdef TEST_REGEX wxPuts(wxT("*** Testing RE interactively ***")); for ( ;; ) @@ -143,7 +143,7 @@ void InteractiveInputTestCase::TestRegExInteractive() if (pattern[0] == '\0' || wxStrcmp(pattern, "quit") == 0) break; - + wxRegEx re; if ( !re.Compile(pattern) ) { @@ -181,7 +181,7 @@ void InteractiveInputTestCase::TestRegExInteractive() } } } - + wxPuts("\n"); } #endif // TEST_REGEX @@ -237,7 +237,7 @@ void InteractiveInputTestCase::TestFtpInteractive() wxPrintf(wxT("--- Connected to %s, current directory is '%s'\n"), hostname, ftp.Pwd().c_str()); } - + wxChar buf[128]; for ( ;; ) { @@ -250,7 +250,7 @@ void InteractiveInputTestCase::TestFtpInteractive() if (buf[0] == '\0' || wxStrcmp(buf, "quit") == 0) break; - + // special handling of LIST and NLST as they require data connection wxString start(buf, 4); start.MakeUpper(); @@ -316,7 +316,7 @@ void InteractiveInputTestCase::TestDateTimeInteractive() // kill the last '\n' buf[wxStrlen(buf) - 1] = 0; - + if ( buf[0] == '\0' || wxStrcmp(buf, "quit") == 0 ) break; @@ -340,7 +340,7 @@ void InteractiveInputTestCase::TestDateTimeInteractive() dt.GetWeekOfMonth(wxDateTime::Sunday_First), dt.GetWeekOfYear(wxDateTime::Monday_First)); } - + wxPuts("\n"); #endif // TEST_DATETIME } @@ -375,7 +375,7 @@ void InteractiveInputTestCase::TestSingleIstance() { wxPrintf(wxT("Failed to init wxSingleInstanceChecker.\n")); } - + wxPuts("\n"); #endif // defined(TEST_SNGLINST) } diff --git a/tests/intl/intltest.cpp b/tests/intl/intltest.cpp index 4e39762a0f..dc9975248b 100644 --- a/tests/intl/intltest.cpp +++ b/tests/intl/intltest.cpp @@ -33,8 +33,8 @@ class IntlTestCase : public CppUnit::TestCase public: IntlTestCase() { m_locale=NULL; } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( IntlTestCase ); diff --git a/tests/log/logtest.cpp b/tests/log/logtest.cpp index 60b7f7cc5a..353f136c62 100644 --- a/tests/log/logtest.cpp +++ b/tests/log/logtest.cpp @@ -159,8 +159,8 @@ class LogTestCase : public CppUnit::TestCase public: LogTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( LogTestCase ); diff --git a/tests/menu/menu.cpp b/tests/menu/menu.cpp index a38235c47a..dbda30cb74 100644 --- a/tests/menu/menu.cpp +++ b/tests/menu/menu.cpp @@ -77,8 +77,8 @@ class MenuTestCase : public CppUnit::TestCase public: MenuTestCase() {} - virtual void setUp() { CreateFrame(); } - virtual void tearDown() { m_frame->Destroy(); } + virtual void setUp() wxOVERRIDE { CreateFrame(); } + virtual void tearDown() wxOVERRIDE { m_frame->Destroy(); } private: CPPUNIT_TEST_SUITE( MenuTestCase ); diff --git a/tests/misc/dynamiclib.cpp b/tests/misc/dynamiclib.cpp index b93e2889ae..fa85291701 100644 --- a/tests/misc/dynamiclib.cpp +++ b/tests/misc/dynamiclib.cpp @@ -77,7 +77,7 @@ void DynamicLibraryTestCase::Load() typedef int (wxSTDCALL *wxStrlenType)(const char *); wxStrlenType pfnStrlen = (wxStrlenType)lib.GetSymbol(FUNC_NAME); - + wxString errMsg = wxString::Format("ERROR: function '%s' wasn't found in '%s'.\n", FUNC_NAME, LIB_NAME); CPPUNIT_ASSERT_MESSAGE( errMsg.ToStdString(), pfnStrlen ); diff --git a/tests/misc/environ.cpp b/tests/misc/environ.cpp index 10dac64f07..8ddec15791 100644 --- a/tests/misc/environ.cpp +++ b/tests/misc/environ.cpp @@ -68,7 +68,7 @@ void EnvTestCase::GetSet() void EnvTestCase::Path() { wxString contents; - + CPPUNIT_ASSERT(wxGetEnv(wxT("PATH"), &contents)); CPPUNIT_ASSERT(!contents.empty()); } diff --git a/tests/misc/pathlist.cpp b/tests/misc/pathlist.cpp index c869b63955..8227f74f45 100644 --- a/tests/misc/pathlist.cpp +++ b/tests/misc/pathlist.cpp @@ -28,7 +28,7 @@ TEST_CASE("wxPathList::FindValidPath", "[file][path]") wxPathList pathlist; pathlist.AddEnvList(wxT("PATH")); - + wxString path = pathlist.FindValidPath(CMD_IN_PATH); INFO( CMD_IN_PATH " not found in " << wxGetenv("PATH") ); CHECK( !path.empty() ); diff --git a/tests/misc/selstoretest.cpp b/tests/misc/selstoretest.cpp index e05ebf0cd9..7883e46f5b 100644 --- a/tests/misc/selstoretest.cpp +++ b/tests/misc/selstoretest.cpp @@ -27,13 +27,13 @@ class SelStoreTestCase : public CppUnit::TestCase public: SelStoreTestCase() { m_store = NULL; } - virtual void setUp() + virtual void setUp() wxOVERRIDE { m_store = new wxSelectionStore; m_store->SetItemCount(NUM_ITEMS); } - virtual void tearDown() + virtual void tearDown() wxOVERRIDE { delete m_store; m_store = NULL; diff --git a/tests/misc/settings.cpp b/tests/misc/settings.cpp index bde01ed2bb..2bba569832 100644 --- a/tests/misc/settings.cpp +++ b/tests/misc/settings.cpp @@ -42,7 +42,7 @@ private: void GetColour(); void GetFont(); - + // not really wxSystemSettings stuff but still nice to test: void GlobalColours(); void GlobalFonts(); @@ -67,7 +67,7 @@ void SettingsTestCase::GetColour() void SettingsTestCase::GetFont() { - const wxSystemFont ids[] = + const wxSystemFont ids[] = { wxSYS_OEM_FIXED_FONT, wxSYS_ANSI_FIXED_FONT, diff --git a/tests/sizers/boxsizer.cpp b/tests/sizers/boxsizer.cpp index a0da683f4c..77c33cc9fb 100644 --- a/tests/sizers/boxsizer.cpp +++ b/tests/sizers/boxsizer.cpp @@ -33,8 +33,8 @@ class BoxSizerTestCase : public CppUnit::TestCase public: BoxSizerTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( BoxSizerTestCase ); diff --git a/tests/sizers/gridsizer.cpp b/tests/sizers/gridsizer.cpp index 0253ed8e1d..1b5c0689d6 100644 --- a/tests/sizers/gridsizer.cpp +++ b/tests/sizers/gridsizer.cpp @@ -33,8 +33,8 @@ class GridSizerTestCase : public CppUnit::TestCase public: GridSizerTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( GridSizerTestCase ); diff --git a/tests/sizers/wrapsizer.cpp b/tests/sizers/wrapsizer.cpp index 2d43863df5..d574b24962 100644 --- a/tests/sizers/wrapsizer.cpp +++ b/tests/sizers/wrapsizer.cpp @@ -33,8 +33,8 @@ class WrapSizerTestCase : public CppUnit::TestCase public: WrapSizerTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( WrapSizerTestCase ); diff --git a/tests/streams/ffilestream.cpp b/tests/streams/ffilestream.cpp index 1586701a0e..c60e0ab8a3 100644 --- a/tests/streams/ffilestream.cpp +++ b/tests/streams/ffilestream.cpp @@ -65,9 +65,9 @@ protected: private: // Implement base class functions. - virtual wxFFileInputStream *DoCreateInStream(); - virtual wxFFileOutputStream *DoCreateOutStream(); - virtual void DoDeleteOutStream(); + virtual wxFFileInputStream *DoCreateInStream() wxOVERRIDE; + virtual wxFFileOutputStream *DoCreateOutStream() wxOVERRIDE; + virtual void DoDeleteOutStream() wxOVERRIDE; private: wxString GetInFileName() const; diff --git a/tests/streams/filestream.cpp b/tests/streams/filestream.cpp index cfa638f97f..1e8487eb5f 100644 --- a/tests/streams/filestream.cpp +++ b/tests/streams/filestream.cpp @@ -65,9 +65,9 @@ protected: private: // Implement base class functions. - virtual wxFileInputStream *DoCreateInStream(); - virtual wxFileOutputStream *DoCreateOutStream(); - virtual void DoDeleteOutStream(); + virtual wxFileInputStream *DoCreateInStream() wxOVERRIDE; + virtual wxFileOutputStream *DoCreateOutStream() wxOVERRIDE; + virtual void DoDeleteOutStream() wxOVERRIDE; private: wxString GetInFileName() const; diff --git a/tests/streams/iostreams.cpp b/tests/streams/iostreams.cpp index f51bd474f3..8237c795c6 100644 --- a/tests/streams/iostreams.cpp +++ b/tests/streams/iostreams.cpp @@ -29,7 +29,7 @@ class IOStreamsTestCase : public CppUnit::TestCase public: IOStreamsTestCase() { } - virtual void tearDown() + virtual void tearDown() wxOVERRIDE { if ( !m_fnTemp.empty() ) { diff --git a/tests/streams/memstream.cpp b/tests/streams/memstream.cpp index 54fb318e85..88776d45f6 100644 --- a/tests/streams/memstream.cpp +++ b/tests/streams/memstream.cpp @@ -70,8 +70,8 @@ private: private: // Implement base class functions. - virtual wxMemoryInputStream *DoCreateInStream(); - virtual wxMemoryOutputStream *DoCreateOutStream(); + virtual wxMemoryInputStream *DoCreateInStream() wxOVERRIDE; + virtual wxMemoryOutputStream *DoCreateOutStream() wxOVERRIDE; private: char m_DataBuffer[DATABUFFER_SIZE]; diff --git a/tests/streams/socketstream.cpp b/tests/streams/socketstream.cpp index 2837f6add1..3a48be19a4 100644 --- a/tests/streams/socketstream.cpp +++ b/tests/streams/socketstream.cpp @@ -103,8 +103,8 @@ public: socketStream(); virtual ~socketStream(); - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; // repeat all socket tests several times with different socket flags, so we // define this macro which is used several times in the test suite @@ -137,8 +137,8 @@ public: private: // Implement base class functions. - virtual wxSocketInputStream *DoCreateInStream(); - virtual wxSocketOutputStream *DoCreateOutStream(); + virtual wxSocketInputStream *DoCreateInStream() wxOVERRIDE; + virtual wxSocketOutputStream *DoCreateOutStream() wxOVERRIDE; // socket thread functions static void WriteSocket(wxSocketBase& socket) diff --git a/tests/streams/sstream.cpp b/tests/streams/sstream.cpp index 6b2903b2ff..f1a2d26203 100644 --- a/tests/streams/sstream.cpp +++ b/tests/streams/sstream.cpp @@ -63,8 +63,8 @@ protected: private: // Implement base class functions. - virtual wxStringInputStream *DoCreateInStream(); - virtual wxStringOutputStream *DoCreateOutStream(); + virtual wxStringInputStream *DoCreateInStream() wxOVERRIDE; + virtual wxStringOutputStream *DoCreateOutStream() wxOVERRIDE; // output the given string to wxStringOutputStream and check that its // contents is exactly the same string diff --git a/tests/streams/zlibstream.cpp b/tests/streams/zlibstream.cpp index 294b623a81..d9a7890d42 100644 --- a/tests/streams/zlibstream.cpp +++ b/tests/streams/zlibstream.cpp @@ -119,10 +119,10 @@ private: private: // Implement base class functions. - virtual wxZlibInputStream *DoCreateInStream(); - virtual wxZlibOutputStream *DoCreateOutStream(); - virtual void DoDeleteInStream(); - virtual void DoDeleteOutStream(); + virtual wxZlibInputStream *DoCreateInStream() wxOVERRIDE; + virtual wxZlibOutputStream *DoCreateOutStream() wxOVERRIDE; + virtual void DoDeleteInStream() wxOVERRIDE; + virtual void DoDeleteOutStream() wxOVERRIDE; // Helper that can be used to create new wx compatibility tests... // Otherwise not used by the tests. diff --git a/tests/strings/numformatter.cpp b/tests/strings/numformatter.cpp index e88d0f38d0..9a583f8a7c 100644 --- a/tests/strings/numformatter.cpp +++ b/tests/strings/numformatter.cpp @@ -28,7 +28,7 @@ class NumFormatterTestCase : public CppUnit::TestCase public: NumFormatterTestCase() { m_locale = NULL; } - virtual void setUp() + virtual void setUp() wxOVERRIDE { // We need to use a locale with known decimal point and which uses the // thousands separator for the tests to make sense. @@ -38,7 +38,7 @@ public: tearDown(); } - virtual void tearDown() + virtual void tearDown() wxOVERRIDE { delete m_locale; m_locale = NULL; diff --git a/tests/strings/unichar.cpp b/tests/strings/unichar.cpp index f9603cb61e..e465688bb3 100644 --- a/tests/strings/unichar.cpp +++ b/tests/strings/unichar.cpp @@ -1156,4 +1156,4 @@ void UniCharTestCase::RefWideCharCompare() wxUNICHARREF_TEST_INT_COMPARE } -#endif \ No newline at end of file +#endif diff --git a/tests/strings/vsnprintf.cpp b/tests/strings/vsnprintf.cpp index 3b082c53aa..9fe7232fd7 100644 --- a/tests/strings/vsnprintf.cpp +++ b/tests/strings/vsnprintf.cpp @@ -166,7 +166,7 @@ private: #endif void Unicode(); - template + template void DoBigToSmallBuffer(T *buffer, int size); void BigToSmallBuffer(); @@ -251,12 +251,12 @@ void VsnprintfTestCase::P() CMP3i("0000ABCDEFABCDEF", "%p", (void*)0xABCDEFABCDEF); CMP3("0000000000000000", "%p", (void*)NULL); #endif -#elif defined(__MINGW32__) +#elif defined(__MINGW32__) // mingw32 uses MSVC CRT in old versions but is own implementation now // which is somewhere in the middle as it uses %8x, so to catch both cases // we use case-insensitive comparison here. - CMP3("0xabcdef", "%p", (void*)0xABCDEF); - CMP3("0", "%p", (void*)NULL); + CMP3("0xabcdef", "%p", (void*)0xABCDEF); + CMP3("0", "%p", (void*)NULL); #elif defined(__GNUG__) // glibc prints pointers as %#x except for NULL pointers which are printed // as '(nil)'. diff --git a/tests/test.cpp b/tests/test.cpp index 7dbb44fb53..339d091396 100644 --- a/tests/test.cpp +++ b/tests/test.cpp @@ -359,9 +359,9 @@ extern bool IsNetworkAvailable() // NOTE: we could use wxDialUpManager here if it was in wxNet; since it's in // wxCore we use a simple rough test: - + wxSocketBase::Initialize(); - + wxIPV4address addr; if (!addr.Hostname("www.google.com") || !addr.Service("www")) { @@ -372,9 +372,9 @@ extern bool IsNetworkAvailable() wxSocketClient sock; sock.SetTimeout(10); // 10 secs bool online = sock.Connect(addr); - + wxSocketBase::Shutdown(); - + return online; } diff --git a/tests/textfile/textfiletest.cpp b/tests/textfile/textfiletest.cpp index 910cbe3cc7..eda450d1f3 100644 --- a/tests/textfile/textfiletest.cpp +++ b/tests/textfile/textfiletest.cpp @@ -40,7 +40,7 @@ public: srand((unsigned)time(NULL)); } - virtual void tearDown() { unlink(GetTestFileName()); } + virtual void tearDown() wxOVERRIDE { unlink(GetTestFileName()); } private: CPPUNIT_TEST_SUITE( TextFileTestCase ); diff --git a/tests/thread/misc.cpp b/tests/thread/misc.cpp index b26d83da79..3eb5fcdbbb 100644 --- a/tests/thread/misc.cpp +++ b/tests/thread/misc.cpp @@ -246,7 +246,7 @@ void MiscThreadTestCase::TestJoinable() CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread.Run() ); CPPUNIT_ASSERT_EQUAL( 362880, (unsigned long)thread.Wait() ); } - + void MiscThreadTestCase::TestDetached() { static const size_t nThreads = 3; @@ -330,31 +330,31 @@ void MiscThreadTestCase::TestThreadDelete() // terminated will lead to a crash! MyDetachedThread *thread0 = new MyDetachedThread(30, 'W'); - CPPUNIT_ASSERT_EQUAL( wxTHREAD_MISC_ERROR, thread0->Delete() ); + CPPUNIT_ASSERT_EQUAL( wxTHREAD_MISC_ERROR, thread0->Delete() ); // delete a thread which didn't start to run yet. MyDetachedThread *thread1 = new MyDetachedThread(30, 'Y'); CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread1->Run() ); wxMilliSleep(300); - CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread1->Delete() ); + CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread1->Delete() ); // delete a running thread MyDetachedThread *thread2 = new MyDetachedThread(30, 'Z'); CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Run() ); wxMilliSleep(300); CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Pause() ); - CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Delete() ); + CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread2->Delete() ); // delete a sleeping thread MyJoinableThread thread3(20); CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread3.Run() ); - CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread3.Delete() ); + CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread3.Delete() ); // delete a joinable running thread MyJoinableThread thread4(2); CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread4.Run() ); wxMilliSleep(300); - CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread4.Delete() ); + CPPUNIT_ASSERT_EQUAL( wxTHREAD_NO_ERROR, thread4.Delete() ); // delete a joinable thread which already terminated } diff --git a/tests/uris/url.cpp b/tests/uris/url.cpp index fc4ef5a77f..dec56558bb 100644 --- a/tests/uris/url.cpp +++ b/tests/uris/url.cpp @@ -30,7 +30,7 @@ class URLTestCase : public CppUnit::TestCase { public: - URLTestCase(); + URLTestCase(); ~URLTestCase(); private: diff --git a/tests/validators/valnum.cpp b/tests/validators/valnum.cpp index 0a2421588b..400011a232 100644 --- a/tests/validators/valnum.cpp +++ b/tests/validators/valnum.cpp @@ -30,8 +30,8 @@ class NumValidatorTestCase : public CppUnit::TestCase public: NumValidatorTestCase() { } - void setUp(); - void tearDown(); + void setUp() wxOVERRIDE; + void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( NumValidatorTestCase ); diff --git a/tests/window/clientsize.cpp b/tests/window/clientsize.cpp index 421a442f43..27e13b4459 100644 --- a/tests/window/clientsize.cpp +++ b/tests/window/clientsize.cpp @@ -30,8 +30,8 @@ class ClientSizeTestCase : public CppUnit::TestCase public: ClientSizeTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( ClientSizeTestCase ); diff --git a/tests/window/setsize.cpp b/tests/window/setsize.cpp index 56caaded36..fe10aea399 100644 --- a/tests/window/setsize.cpp +++ b/tests/window/setsize.cpp @@ -32,8 +32,8 @@ class SetSizeTestCase : public CppUnit::TestCase public: SetSizeTestCase() { } - virtual void setUp(); - virtual void tearDown(); + virtual void setUp() wxOVERRIDE; + virtual void tearDown() wxOVERRIDE; private: CPPUNIT_TEST_SUITE( SetSizeTestCase ); diff --git a/tests/xml/xrctest.cpp b/tests/xml/xrctest.cpp index a8e72084eb..1744640cf6 100644 --- a/tests/xml/xrctest.cpp +++ b/tests/xml/xrctest.cpp @@ -139,8 +139,8 @@ class XrcTestCase : public CppUnit::TestCase public: XrcTestCase() {} - virtual void setUp() { CreateXrc(); } - virtual void tearDown() { wxRemoveFile(TEST_XRC_FILE); } + virtual void setUp() wxOVERRIDE { CreateXrc(); } + virtual void tearDown() wxOVERRIDE { wxRemoveFile(TEST_XRC_FILE); } private: CPPUNIT_TEST_SUITE( XrcTestCase );