Add wxOVERRIDE to test files

And cleanup some tailing spaces and tabs.
This commit is contained in:
Maarten Bent
2018-07-29 11:09:17 +02:00
parent 56a51ad1e7
commit 57180d68c8
87 changed files with 252 additions and 252 deletions

View File

@@ -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 );

View File

@@ -68,7 +68,7 @@ void EnvTestCase::GetSet()
void EnvTestCase::Path()
{
wxString contents;
CPPUNIT_ASSERT(wxGetEnv(wxT("PATH"), &contents));
CPPUNIT_ASSERT(!contents.empty());
}

View File

@@ -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() );

View File

@@ -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;

View File

@@ -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,