#include "wx/filename.h"
#include "wx/filefn.h"
+#ifdef __WXMSW__
+ #include "wx/msw/registry.h"
+#endif // __WXMSW__
+
// ----------------------------------------------------------------------------
// local functions
// ----------------------------------------------------------------------------
CPPUNIT_TEST( TestSetPath );
CPPUNIT_TEST( TestStrip );
CPPUNIT_TEST( TestNormalize );
+ CPPUNIT_TEST( TestReplace );
#ifdef __WINDOWS__
CPPUNIT_TEST( TestShortLongPath );
#endif // __WINDOWS__
void TestSetPath();
void TestStrip();
void TestNormalize();
+ void TestReplace();
#ifdef __WINDOWS__
void TestShortLongPath();
#endif // __WINDOWS__
{ ".\\foo", wxPATH_NORM_LONG, ".\\foo", wxPATH_DOS },
{ "..\\Makefile.in", wxPATH_NORM_LONG, "..\\Makefile.in", wxPATH_DOS },
{ "..\\foo", wxPATH_NORM_LONG, "..\\foo", wxPATH_DOS },
-#ifdef __WXMSW__
- { "..\\MKINST~1", wxPATH_NORM_LONG, "..\\mkinstalldirs", wxPATH_DOS },
-#endif
};
// set the env var ABCDEF
expected, fn.GetFullPath(fnt.fmt)
);
}
+
+ // MSW-only test for wxPATH_NORM_LONG: notice that we only run it if short
+ // names generation is not disabled for this system as otherwise the file
+ // MKINST~1 doesn't exist at all and normalizing it fails (it's possible
+ // that we're on a FAT partition in which case the test would still succeed
+ // and also that the registry key was changed recently and didn't take
+ // effect yet but these are marginal cases which we consciously choose to
+ // ignore for now)
+#ifdef __WXMSW__
+ long shortNamesDisabled;
+ if ( wxRegKey
+ (
+ wxRegKey::HKLM,
+ "SYSTEM\\CurrentControlSet\\Control\\FileSystem"
+ ).QueryValue("NtfsDisable8dot3NameCreation", &shortNamesDisabled) &&
+ !shortNamesDisabled )
+ {
+ wxFileName fn("..\\MKINST~1");
+ CPPUNIT_ASSERT( fn.Normalize(wxPATH_NORM_LONG, cwd) );
+ CPPUNIT_ASSERT_EQUAL( "..\\mkinstalldirs", fn.GetFullPath() );
+ }
+ //else: when in doubt, don't run the test
+#endif // __WXMSW__
}
-wxString wxTestStripExtension(wxString szFile)
+void FileNameTestCase::TestReplace()
{
- wxStripExtension(szFile);
- return szFile;
+ static const struct FileNameTest
+ {
+ const char *original;
+ const char *env_contents;
+ const char *replace_fmtstring;
+ const char *expected;
+ wxPathFormat fmt;
+ } tests[] =
+ {
+ { "/usr/a/strange path/lib/someFile.ext", "/usr/a/strange path", "$%s", "$TEST_VAR/lib/someFile.ext", wxPATH_UNIX },
+ { "/usr/a/path/lib/someFile.ext", "/usr/a/path", "$%s", "$TEST_VAR/lib/someFile.ext", wxPATH_UNIX },
+ { "/usr/a/path/lib/someFile", "/usr/a/path/", "$%s", "$TEST_VARlib/someFile", wxPATH_UNIX },
+ { "/usr/a/path/lib/", "/usr/a/path/", "$(%s)", "$(TEST_VAR)lib/", wxPATH_UNIX },
+ { "/usr/a/path/lib/", "/usr/a/path/", "${{%s}}", "${{TEST_VAR}}lib/", wxPATH_UNIX },
+ { "/usr/a/path/lib/", "/usr/a/path/", "%s", "TEST_VARlib/", wxPATH_UNIX },
+ { "/usr/a/path/lib/", "/usr/a/path/", "%s//", "TEST_VAR/lib/", wxPATH_UNIX },
+ // note: empty directory components are automatically removed by wxFileName thus
+ // using // in the replace format string has no effect
+
+ { "/usr/../a/path/lib/", "/usr/a/path/", "%s", "/usr/../a/path/lib/", wxPATH_UNIX },
+ { "/usr/a/path/usr/usr", "/usr", "%s", "TEST_VAR/a/pathTEST_VAR/usr", wxPATH_UNIX },
+ { "/usr/a/path/usr/usr", "/usr", "$%s", "$TEST_VAR/a/path$TEST_VAR/usr", wxPATH_UNIX },
+ { "/a/b/c/d", "a/", "%s", "/TEST_VARb/c/d", wxPATH_UNIX },
+
+ { "C:\\A\\Strange Path\\lib\\someFile", "C:\\A\\Strange Path", "%%%s%%", "%TEST_VAR%\\lib\\someFile", wxPATH_WIN },
+ { "C:\\A\\Path\\lib\\someFile", "C:\\A\\Path", "%%%s%%", "%TEST_VAR%\\lib\\someFile", wxPATH_WIN },
+ { "C:\\A\\Path\\lib\\someFile", "C:\\A\\Path", "$(%s)", "$(TEST_VAR)\\lib\\someFile", wxPATH_WIN }
+ };
+
+ for ( size_t i = 0; i < WXSIZEOF(tests); i++ )
+ {
+ const FileNameTest& fnt = tests[i];
+ wxFileName fn(fnt.original, fnt.fmt);
+
+ // set the environment variable
+ wxSetEnv(_T("TEST_VAR"), fnt.env_contents);
+
+ // be sure this ReplaceEnvVariable does not fail
+ WX_ASSERT_MESSAGE
+ (
+ ("#%d: ReplaceEnvVariable(%s) failed", (int)i, fnt.replace_fmtstring),
+ fn.ReplaceEnvVariable("TEST_VAR", fnt.replace_fmtstring, fnt.fmt)
+ );
+
+ // compare result with expected string
+ wxString expected(fnt.expected);
+ WX_ASSERT_EQUAL_MESSAGE
+ (
+ ("array element #%d", (int)i),
+ expected, fn.GetFullPath(fnt.fmt)
+ );
+ }
+
+ // now test ReplaceHomeDir
+
+ wxFileName fn = wxFileName::DirName(wxGetHomeDir());
+ fn.AppendDir("test1");
+ fn.AppendDir("test2");
+ fn.AppendDir("test3");
+ fn.SetName("some file");
+
+ WX_ASSERT_MESSAGE
+ (
+ ("ReplaceHomeDir(%s) failed", fn.GetFullPath()),
+ fn.ReplaceHomeDir()
+ );
+
+ CPPUNIT_ASSERT_EQUAL( wxString(_T("~/test1/test2/test3/some file")),
+ fn.GetFullPath(wxPATH_UNIX) );
}
void FileNameTestCase::TestStrip()
{
- //test a crash
- CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T("")) );
-
- //others
- CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".")) );
- CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".wav")) );
- CPPUNIT_ASSERT_EQUAL( wxString(_T("good")), wxTestStripExtension(_T("good.wav")) );
- CPPUNIT_ASSERT_EQUAL( wxString(_T("good.wav")), wxTestStripExtension(_T("good.wav.wav")) );
+ CPPUNIT_ASSERT_EQUAL( "", wxFileName::StripExtension(_T("")) );
+ CPPUNIT_ASSERT_EQUAL( ".", wxFileName::StripExtension(_T(".")) );
+ CPPUNIT_ASSERT_EQUAL( ".vimrc", wxFileName::StripExtension(_T(".vimrc")) );
+ CPPUNIT_ASSERT_EQUAL( "bad", wxFileName::StripExtension(_T("bad")) );
+ CPPUNIT_ASSERT_EQUAL( "good", wxFileName::StripExtension(_T("good.wav")) );
+ CPPUNIT_ASSERT_EQUAL( "good.wav", wxFileName::StripExtension(_T("good.wav.wav")) );
}
#ifdef __WINDOWS__