Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define a helper variable to reduce #ifdefs in wxFileName test

Browse Source 
No real changes, just avoid repeating "#ifdef __WINDOWS__" multiple
times.
This commit is contained in:
Vadim Zeitlin
2021-07-11 14:48:24 +01:00
parent 702c221901
commit 3539a81a8a
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/filename/filenametest.cpp
View File

@@ -262,6 +262,14 @@ TEST_CASE("wxFileName::Normalize", "[filename]")
if (cwd.Contains(wxT(':'))) if (cwd.Contains(wxT(':')))
cwd = cwd.AfterFirst(wxT(':')); cwd = cwd.AfterFirst(wxT(':'));
static const char* pathWithEnvVar =
#ifdef __WINDOWS__
"%ABCDEF%/g/h/i"
#else
"$(ABCDEF)/g/h/i"
#endif
;
static const struct FileNameTest static const struct FileNameTest
{ {
const char *original; const char *original;
@@ -271,11 +279,7 @@ TEST_CASE("wxFileName::Normalize", "[filename]")
} tests[] = } tests[] =
{ {
// test wxPATH_NORM_ENV_VARS // test wxPATH_NORM_ENV_VARS
#ifdef __WINDOWS__ { pathWithEnvVar, wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
{ "%ABCDEF%/g/h/i", wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
#else
{ "$(ABCDEF)/g/h/i", wxPATH_NORM_ENV_VARS, "abcdef/g/h/i", wxPATH_UNIX },
#endif
// test wxPATH_NORM_DOTS // test wxPATH_NORM_DOTS
{ "a/.././b/c/../../", wxPATH_NORM_DOTS, "", wxPATH_UNIX }, { "a/.././b/c/../../", wxPATH_NORM_DOTS, "", wxPATH_UNIX },
@@ -323,11 +327,7 @@ TEST_CASE("wxFileName::Normalize", "[filename]")
{ "..\\foo", wxPATH_NORM_LONG, "..\\foo", wxPATH_DOS }, { "..\\foo", wxPATH_NORM_LONG, "..\\foo", wxPATH_DOS },
// test default behaviour with deprecated wxPATH_NORM_ALL // test default behaviour with deprecated wxPATH_NORM_ALL
#ifdef __WINDOWS__ { pathWithEnvVar, wxPATH_NORM_ALL, "CWD/abcdef/g/h/i", wxPATH_UNIX },
{ "%ABCDEF%/g/h/i", wxPATH_NORM_ALL, "CWD/abcdef/g/h/i", wxPATH_UNIX },
#else
{ "$(ABCDEF)/g/h/i", wxPATH_NORM_ALL, "CWD/abcdef/g/h/i", wxPATH_UNIX },
#endif
}; };
// set the env var ABCDEF // set the env var ABCDEF