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

minor change: use a "positive" logic: use shouldSucceed instead of shouldFail and use more descriptive names for non-existing folders; add a few test cases

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64677 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2010-06-21 19:44:27 +00:00
parent bd7bfb002d
commit d6609db5a7
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/filename/filenametest.cpp
View File

@@ -586,36 +586,46 @@ void FileNameTestCase::TestCreateTempFileName()
{ {
const char *prefix; const char *prefix;
const char *expectedFolder; const char *expectedFolder;
bool shouldFail; bool shouldSucceed;
} testData[] = } testData[] =
{ {
{ "", "$SYSTEM_TEMP", false }, { "", "$SYSTEM_TEMP", true },
{ "foo", "$SYSTEM_TEMP", false }, { "foo", "$SYSTEM_TEMP", true },
{ "..", "$SYSTEM_TEMP", false }, { "..", "$SYSTEM_TEMP", true },
{ "../bar", "..", false }, { "../bar", "..", true },
#ifdef __WXMSW__ #ifdef __WXMSW__
{ "c:\\a\\place\\which\\does\\not\\exist", "", true }, { "$USER_DOCS_DIR\\", "$USER_DOCS_DIR", true },
{ "c:\\a\\directory\\which\\does\\not\\exist", "", false },
#else if defined( __UNIX__ ) #else if defined( __UNIX__ )
{ "/tmp/foo", "/tmp", false }, { "$USER_DOCS_DIR/", "$USER_DOCS_DIR", true },
{ "/tmp/foo/bar", "", true }, { "/tmp/foo", "/tmp", true },
{ "/tmp/a/directory/which/does/not/exist", "", false },
#endif // __UNIX__ #endif // __UNIX__
}; };
for ( size_t n = 0; n < WXSIZEOF(testData); n++ ) for ( size_t n = 0; n < WXSIZEOF(testData); n++ )
{ {
wxString path = wxFileName::CreateTempFileName(testData[n].prefix); wxString prefix = testData[n].prefix;
CPPUNIT_ASSERT_EQUAL( path.empty(), testData[n].shouldFail ); prefix.Replace("$USER_DOCS_DIR", wxStandardPaths::Get().GetDocumentsDir());
if (!testData[n].shouldFail) std::string errDesc = wxString::Format("failed on prefix '%s'", prefix).ToStdString();
wxString path = wxFileName::CreateTempFileName(prefix);
CPPUNIT_ASSERT_EQUAL_MESSAGE( errDesc, !testData[n].shouldSucceed, path.empty() );
if (testData[n].shouldSucceed)
{ {
errDesc += "; path is " + path.ToStdString();
// test the place where the temp file has been created // test the place where the temp file has been created
wxString expected = testData[n].expectedFolder; wxString expected = testData[n].expectedFolder;
expected.Replace("$SYSTEM_TEMP", wxStandardPaths::Get().GetTempDir()); expected.Replace("$SYSTEM_TEMP", wxStandardPaths::Get().GetTempDir());
CPPUNIT_ASSERT_EQUAL(expected, wxFileName(path).GetPath()); expected.Replace("$USER_DOCS_DIR", wxStandardPaths::Get().GetDocumentsDir());
CPPUNIT_ASSERT_EQUAL_MESSAGE( errDesc, expected, wxFileName(path).GetPath() );
// the temporary file is created with full permissions for the current process // the temporary file is created with full permissions for the current process
// so we should always be able to remove it: // so we should always be able to remove it:
CPPUNIT_ASSERT( wxRemoveFile(path) ); CPPUNIT_ASSERT_MESSAGE( errDesc, wxRemoveFile(path) );
} }
} }
} }