[Libreoffice-commits] core.git: 7 commits - sal/qa
Chris Sherlock
chris.sherlock79 at gmail.com
Sat May 13 04:00:47 UTC 2017
sal/qa/osl/file/osl_File.cxx | 5277 +++++++++++++++++++++----------------------
1 file changed, 2619 insertions(+), 2658 deletions(-)
New commits:
commit b20d55706d233cafdf95adcffa267f414f318929
Author: Chris Sherlock <chris.sherlock79 at gmail.com>
Date: Sat May 13 13:54:42 2017 +1000
osl: final cleanup of sal_File.cxx unit test
Change-Id: I00201c5456904a537e349fa5e30be223b744fc5e
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 5f358fd1d802..1471d4310c5b 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -39,38 +39,38 @@ using namespace osl;
/** detailed wrong message.
*/
-inline OString errorToString( const FileBase::RC _nError )
+inline OString errorToString(const osl::FileBase::RC _nError)
{
OString sResult;
- switch ( _nError ) {
- case FileBase::E_None:
+ switch (_nError) {
+ case osl::FileBase::E_None:
sResult = "Success";
break;
- case FileBase::E_PERM:
+ case osl::FileBase::E_PERM:
sResult = "Operation not permitted";
break;
- case FileBase::E_NOENT:
+ case osl::FileBase::E_NOENT:
sResult = "No such file or directory";
break;
- case FileBase::E_EXIST:
+ case osl::FileBase::E_EXIST:
sResult = "Already Exist";
break;
- case FileBase::E_ACCES:
+ case osl::FileBase::E_ACCES:
sResult = "Permission denied";
break;
- case FileBase::E_INVAL:
+ case osl::FileBase::E_INVAL:
sResult = "The format of the parameters was not valid";
break;
- case FileBase::E_NOTDIR:
+ case osl::FileBase::E_NOTDIR:
sResult = "Not a directory";
break;
- case FileBase::E_ISDIR:
+ case osl::FileBase::E_ISDIR:
sResult = "Is a directory";
break;
- case FileBase::E_BADF:
+ case osl::FileBase::E_BADF:
sResult = "Bad file";
break;
- case FileBase::E_NOTEMPTY:
+ case osl::FileBase::E_NOTEMPTY:
sResult = "The directory is not empty";
break;
default:
@@ -80,9 +80,9 @@ inline OString errorToString( const FileBase::RC _nError )
return sResult;
}
-rtl::OString errorToStr( FileBase::RC const& nError)
+OString errorToStr(osl::FileBase::RC const& nError)
{
- rtl::OString suBuf;
+ OString suBuf;
suBuf += "The returned error is: " ;
suBuf += errorToString(nError);
suBuf += "!\n";
@@ -93,13 +93,13 @@ rtl::OString errorToStr( FileBase::RC const& nError)
*/
/* FIXME: the above assertion is bogus */
-#if ( defined UNX ) // precision of time in Windows is better than UNX
+#if (defined UNX) // precision of time in Windows is better than UNX
# define delta 2000 // time precision, 2000ms
#else
# define delta 1800 // time precision, 1.8s
#endif
-inline bool t_compareTime( TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_Int32 nDelta)
+inline bool t_compareTime(TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_Int32 nDelta)
{
sal_Int32 nDeltaSeconds = m_aEndTime->Seconds - m_aStartTime->Seconds;
sal_Int32 nDeltaNanoSec = sal_Int32(m_aEndTime->Nanosec) - sal_Int32(m_aStartTime->Nanosec);
@@ -110,12 +110,12 @@ inline bool t_compareTime( TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_
}
sal_Int32 nDeltaMilliSec = (nDeltaSeconds * 1000) + (nDeltaNanoSec / 1000000);
- return ( nDeltaMilliSec < nDelta );
+ return (nDeltaMilliSec < nDelta);
}
/** compare two OUString file name.
*/
-inline bool compareFileName( const OUString & ustr1, const OUString & ustr2 )
+inline bool compareFileName(const OUString & ustr1, const OUString & ustr2)
{
bool bOk;
// on Windows, the separator is '\', so here change to '/', then compare
@@ -131,9 +131,9 @@ inline bool compareFileName( const OUString & ustr1, const OUString & ustr2 )
ustr2new = ustr2.replace(reverseSlash,'/');
else
ustr2new = ustr2;
- bOk = ustr1new.equalsIgnoreAsciiCase( ustr2new ) ;
+ bOk = ustr1new.equalsIgnoreAsciiCase(ustr2new);
#else
- bOk = ustr1.equalsIgnoreAsciiCase( ustr2 );
+ bOk = ustr1.equalsIgnoreAsciiCase(ustr2);
#endif
return bOk;
}
@@ -141,42 +141,42 @@ inline bool compareFileName( const OUString & ustr1, const OUString & ustr2 )
/** simple version to judge if a file name or directory name is a URL or a system path, just to see if it
is start with "file:///";.
*/
-inline bool isURL( const OUString& pathname )
+inline bool isURL(const OUString& pathname)
{
- return pathname.startsWith( aPreURL );
+ return pathname.startsWith(aPreURL);
}
/** concat two part to form a URL or system path, add PATH_SEPARATOR between them if necessary, add "file:///" to beginning if necessary.
*/
-inline void concatURL( OUString & pathname1, const OUString & pathname2 )
+inline void concatURL(OUString & pathname1, const OUString & pathname2)
{
// check if pathname1 is full qualified URL;
- if ( !isURL( pathname1 ) )
+ if (!isURL(pathname1))
{
- OUString aPathName = pathname1.copy( 0 );
- FileBase::getFileURLFromSystemPath( pathname1, aPathName ); // convert if not full qualified URL
- pathname1 = aPathName.copy( 0 );
+ OUString aPathName = pathname1.copy(0);
+ osl::FileBase::getFileURLFromSystemPath(pathname1, aPathName); // convert if not full qualified URL
+ pathname1 = aPathName.copy(0);
}
// check if '/' is in the end of pathname1 or at the begin of pathname2;
- if ( !pathname1.endsWith( aSlashURL ) && !pathname2.startsWith( aSlashURL ) )
+ if (!pathname1.endsWith(aSlashURL) && !pathname2.startsWith(aSlashURL))
pathname1 += aSlashURL;
pathname1 += pathname2;
}
/** create a temp test file using OUString name of full qualified URL or system path.
*/
-inline void createTestFile( const OUString& filename )
+inline void createTestFile(const OUString& filename)
{
- OUString aPathURL = filename.copy( 0 );
- FileBase::RC nError;
+ OUString aPathURL = filename.copy(0);
+ osl::FileBase::RC nError;
- if ( !isURL( filename ) )
- FileBase::getFileURLFromSystemPath( filename, aPathURL ); // convert if not full qualified URL
+ if (!isURL(filename))
+ osl::FileBase::getFileURLFromSystemPath(filename, aPathURL); // convert if not full qualified URL
File aFile(aPathURL);
- nError = aFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create );
- if ( ( FileBase::E_None != nError ) && ( nError != FileBase::E_EXIST ))
+ nError = aFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
+ if ((osl::FileBase::E_None != nError) && (nError != osl::FileBase::E_EXIST))
printf("createTestFile failed!\n");
aFile.close();
@@ -185,93 +185,93 @@ inline void createTestFile( const OUString& filename )
/** create a temp test file using OUString name of full qualified URL or system path in a base directory.
*/
-inline void createTestFile( const OUString& basename, const OUString& filename )
+inline void createTestFile(const OUString& basename, const OUString& filename)
{
- OUString aBaseURL = basename.copy( 0 );
+ OUString aBaseURL = basename.copy(0);
- concatURL( aBaseURL, filename );
- createTestFile( aBaseURL );
+ concatURL(aBaseURL, filename);
+ createTestFile(aBaseURL);
}
/** delete a temp test file using OUString name.
*/
-inline void deleteTestFile( const OUString& filename )
+inline void deleteTestFile(const OUString& filename)
{
- OUString aPathURL = filename.copy( 0 );
- FileBase::RC nError;
+ OUString aPathURL = filename.copy(0);
+ osl::FileBase::RC nError;
- if ( !isURL( filename ) )
- FileBase::getFileURLFromSystemPath( filename, aPathURL ); // convert if not full qualified URL
+ if (!isURL(filename))
+ osl::FileBase::getFileURLFromSystemPath(filename, aPathURL); // convert if not full qualified URL
- nError = File::setAttributes( aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite ); // if readonly, make writable.
- CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: set writable ", ( FileBase::E_None == nError ) || ( FileBase::E_NOENT == nError ) );
+ nError = File::setAttributes(aPathURL, osl_File_Attribute_GrpWrite| osl_File_Attribute_OwnWrite| osl_File_Attribute_OthWrite); // if readonly, make writable.
+ CPPUNIT_ASSERT_MESSAGE("In deleteTestFile Function: set writable ", (osl::FileBase::E_None == nError) || (osl::FileBase::E_NOENT == nError));
- nError = File::remove( aPathURL );
- CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( FileBase::E_None == nError ) || ( nError == FileBase::E_NOENT ) );
+ nError = File::remove(aPathURL);
+ CPPUNIT_ASSERT_MESSAGE("In deleteTestFile Function: remove ", (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
}
/** delete a temp test file using OUString name of full qualified URL or system path in a base directory.
*/
-inline void deleteTestFile( const OUString& basename, const OUString& filename )
+inline void deleteTestFile(const OUString& basename, const OUString& filename)
{
- OUString aBaseURL = basename.copy( 0 );
+ OUString aBaseURL = basename.copy(0);
- concatURL( aBaseURL, filename );
- deleteTestFile( aBaseURL );
+ concatURL(aBaseURL, filename);
+ deleteTestFile(aBaseURL);
}
/** create a temp test directory using OUString name of full qualified URL or system path.
*/
-inline void createTestDirectory( const OUString& dirname )
+inline void createTestDirectory(const OUString& dirname)
{
- OUString aPathURL = dirname.copy( 0 );
- FileBase::RC nError;
+ OUString aPathURL = dirname.copy(0);
+ osl::FileBase::RC nError;
- if ( !isURL( dirname ) )
- FileBase::getFileURLFromSystemPath( dirname, aPathURL ); // convert if not full qualified URL
- nError = Directory::create( aPathURL );
- if ( ( FileBase::E_None != nError ) && ( nError != FileBase::E_EXIST ))
+ if (!isURL(dirname))
+ osl::FileBase::getFileURLFromSystemPath(dirname, aPathURL); // convert if not full qualified URL
+ nError = Directory::create(aPathURL);
+ if ((osl::FileBase::E_None != nError) && (nError != osl::FileBase::E_EXIST))
printf("createTestDirectory failed!\n");
}
/** create a temp test directory using OUString name of full qualified URL or system path in a base directory.
*/
-inline void createTestDirectory( const OUString& basename, const OUString& dirname )
+inline void createTestDirectory(const OUString& basename, const OUString& dirname)
{
- OUString aBaseURL = basename.copy( 0 );
+ OUString aBaseURL = basename.copy(0);
- concatURL( aBaseURL, dirname );
- createTestDirectory( aBaseURL );
+ concatURL(aBaseURL, dirname);
+ createTestDirectory(aBaseURL);
}
/** delete a temp test directory using OUString name of full qualified URL or system path.
*/
-inline void deleteTestDirectory( const OUString& dirname )
+inline void deleteTestDirectory(const OUString& dirname)
{
- OUString aPathURL = dirname.copy( 0 );
- FileBase::RC nError;
- if ( !isURL( dirname ) )
- FileBase::getFileURLFromSystemPath( dirname, aPathURL ); // convert if not full qualified URL
+ OUString aPathURL = dirname.copy(0);
+ osl::FileBase::RC nError;
+ if (!isURL(dirname))
+ osl::FileBase::getFileURLFromSystemPath(dirname, aPathURL); // convert if not full qualified URL
- Directory testDir( aPathURL );
- if ( testDir.isOpen() )
+ Directory testDir(aPathURL);
+ if (testDir.isOpen())
testDir.close(); // close if still open.
- nError = Directory::remove( aPathURL );
+ nError = Directory::remove(aPathURL);
- rtl::OString strError ("In deleteTestDirectory function: remove Directory ");
- strError += OUStringToOString( aPathURL, RTL_TEXTENCODING_ASCII_US );
- CPPUNIT_ASSERT_MESSAGE( strError.getStr(), ( FileBase::E_None == nError ) || ( nError == FileBase::E_NOENT ) );
+ OString strError ("In deleteTestDirectory function: remove Directory ");
+ strError += OUStringToOString(aPathURL, RTL_TEXTENCODING_ASCII_US);
+ CPPUNIT_ASSERT_MESSAGE(strError.getStr(), (osl::FileBase::E_None == nError) || (nError == osl::FileBase::E_NOENT));
}
/** delete a temp test directory using OUString name of full qualified URL or system path in a base directory.
*/
-inline void deleteTestDirectory( const OUString& basename, const OUString& dirname )
+inline void deleteTestDirectory(const OUString& basename, const OUString& dirname)
{
- OUString aBaseURL = basename.copy( 0 );
+ OUString aBaseURL = basename.copy(0);
- concatURL( aBaseURL, dirname );
- deleteTestDirectory( aBaseURL );
+ concatURL(aBaseURL, dirname);
+ deleteTestDirectory(aBaseURL);
}
/** Check for the file and directory access right.
@@ -283,63 +283,63 @@ enum class oslCheckMode {
};
// check if the file exist
-inline bool ifFileExist( const OUString & str )
+inline bool ifFileExist(const OUString & str)
{
- File testFile( str );
- return ( osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Read ) );
+ File testFile(str);
+ return (osl::FileBase::E_None == testFile.open(osl_File_OpenFlag_Read));
}
// check if the file can be written
-inline bool ifFileCanWrite( const OUString & str )
+inline bool ifFileCanWrite(const OUString & str)
{
// on Windows, the file has no write right, but can be written
#ifdef _WIN32
bool bCheckResult = false;
- OUString aUStr = str.copy( 0 );
- if ( isURL( str ) )
- FileBase::getSystemPathFromFileURL( str, aUStr );
+ OUString aUStr = str.copy(0);
+ if (isURL(str))
+ osl::FileBase::getSystemPathFromFileURL(str, aUStr);
- OString aString = OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US );
+ OString aString = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
const char *path = aString.getStr();
- if (( _access( path, 2 ) ) != -1 )
+ if ((_access(path, 2)) != -1)
bCheckResult = sal_True;
// on UNX, just test if open success with osl_File_OpenFlag_Write
#else
- File testFile( str );
- bool bCheckResult = (osl::FileBase::E_None == testFile.open( osl_File_OpenFlag_Write ));
+ File testFile(str);
+ bool bCheckResult = (osl::FileBase::E_None == testFile.open(osl_File_OpenFlag_Write));
#endif
return bCheckResult;
}
-inline bool checkDirectory( const OUString & str, oslCheckMode nCheckMode )
+inline bool checkDirectory(const OUString & str, oslCheckMode nCheckMode)
{
- rtl::OUString aUString;
+ OUString aUString;
DirectoryItem rItem;
- FileBase::RC rc;
+ osl::FileBase::RC rc;
bool bCheckResult= false;
- Directory aDir( str );
+ Directory aDir(str);
rc = aDir.open();
- if ( ( FileBase::E_NOENT != rc ) && ( FileBase::E_ACCES != rc ) )
+ if ((osl::FileBase::E_NOENT != rc) && (osl::FileBase::E_ACCES != rc))
{
- switch ( nCheckMode )
+ switch (nCheckMode)
{
case oslCheckMode::OpenAccess:
- if ( rc == FileBase::E_None )
+ if (rc == osl::FileBase::E_None)
bCheckResult = true;
break;
case oslCheckMode::ReadAccess:
- rc = aDir.getNextItem( rItem );
- bCheckResult = ( rc == FileBase::E_None ) || ( rc == FileBase::E_NOENT );
+ rc = aDir.getNextItem(rItem);
+ bCheckResult = (rc == osl::FileBase::E_None) || (rc == osl::FileBase::E_NOENT);
break;
case oslCheckMode::WriteAccess:
- ( ( aUString += str ) += aSlashURL ) += aTmpName2;
- if ( ( rc = Directory::create( aUString ) ) == FileBase::E_None )
+ ((aUString += str) += aSlashURL) += aTmpName2;
+ if ((rc = Directory::create(aUString)) == osl::FileBase::E_None)
{
bCheckResult = true;
- rc = Directory::remove( aUString );
- CPPUNIT_ASSERT_EQUAL( FileBase::E_None, rc );
+ rc = Directory::remove(aUString);
+ CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, rc);
}
else
bCheckResult = false;
@@ -350,7 +350,7 @@ inline bool checkDirectory( const OUString & str, oslCheckMode nCheckMode )
}
rc = aDir.close();
- CPPUNIT_ASSERT_EQUAL( FileBase::E_None, rc );
+ CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, rc);
}
return bCheckResult;
@@ -358,10 +358,10 @@ inline bool checkDirectory( const OUString & str, oslCheckMode nCheckMode )
/** construct error message
*/
-inline OString outputError( const OString & returnVal, const OString & rightVal, const sal_Char * msg = "")
+inline OString outputError(const OString & returnVal, const OString & rightVal, const sal_Char * msg = "")
{
OString aString;
- if ( returnVal.equals( rightVal ) )
+ if (returnVal.equals(rightVal))
return aString;
aString += msg;
@@ -375,21 +375,21 @@ inline OString outputError( const OString & returnVal, const OString & rightVal,
/** Change file mode, two version in UNIX and Windows;.
*/
-#if ( defined UNX ) // chmod() method is differ in Windows
-inline void changeFileMode( OUString & filepath, sal_Int32 mode )
+#if (defined UNX) // chmod() method is differ in Windows
+inline void changeFileMode(OUString & filepath, sal_Int32 mode)
{
- rtl::OString aString;
- rtl::OUString aUStr = filepath.copy( 0 );
+ OString aString;
+ OUString aUStr = filepath.copy(0);
- if ( isURL( filepath ) )
- FileBase::getSystemPathFromFileURL( filepath, aUStr );
+ if (isURL(filepath))
+ osl::FileBase::getSystemPathFromFileURL(filepath, aUStr);
- aString = OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US );
- int ret = chmod( aString.getStr(), mode );
+ aString = OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US);
+ int ret = chmod(aString.getStr(), mode);
CPPUNIT_ASSERT_EQUAL(0, ret);
}
#else // Windows version
-inline void changeFileMode( OUString & filepath, sal_Int32 mode )
+inline void changeFileMode(OUString & filepath, sal_Int32 mode)
{
(void)filepath;
(void)mode;
@@ -399,21 +399,19 @@ inline void changeFileMode( OUString & filepath, sal_Int32 mode )
inline OUString getCurrentPID();
-// Beginning of the test cases for FileBase class
+// Beginning of the test cases for osl::FileBase class
namespace osl_FileBase
{
-
// testing the method
- // static inline RC getAbsoluteFileURL( const OUString& ustrBaseDirectoryURL,
+ // static inline RC getAbsoluteFileURL(const OUString& ustrBaseDirectoryURL,
// const OUString& ustrRelativeFileURL,
- // OUString& ustrAbsoluteFileURL )
+ // OUString& ustrAbsoluteFileURL)
- class getAbsoluteFileURL:public CppUnit::TestFixture
+ class getAbsoluteFileURL : public CppUnit::TestFixture
{
public:
-
- void check_getAbsoluteFileURL( rtl::OUString const& _suBaseURL, rtl::OString const& _sRelativeURL, FileBase::RC _nAssumeError, rtl::OUString const& _suAssumeResultStr );
+ void check_getAbsoluteFileURL(OUString const& _suBaseURL, OString const& _sRelativeURL, osl::FileBase::RC _nAssumeError, OUString const& _suAssumeResultStr);
void getAbsoluteFileURL_001_1();
void getAbsoluteFileURL_001_2();
@@ -427,120 +425,120 @@ namespace osl_FileBase
void getAbsoluteFileURL_003();
void getAbsoluteFileURL_004();
- CPPUNIT_TEST_SUITE( getAbsoluteFileURL );
- CPPUNIT_TEST( getAbsoluteFileURL_001_1 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_2 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_3 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_4 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_5 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_6 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_7 );
- CPPUNIT_TEST( getAbsoluteFileURL_001_8 );
- CPPUNIT_TEST( getAbsoluteFileURL_002 );
- CPPUNIT_TEST( getAbsoluteFileURL_003 );
- CPPUNIT_TEST( getAbsoluteFileURL_004 );
+ CPPUNIT_TEST_SUITE(getAbsoluteFileURL);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_1);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_2);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_3);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_4);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_5);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_6);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_7);
+ CPPUNIT_TEST(getAbsoluteFileURL_001_8);
+ CPPUNIT_TEST(getAbsoluteFileURL_002);
+ CPPUNIT_TEST(getAbsoluteFileURL_003);
+ CPPUNIT_TEST(getAbsoluteFileURL_004);
CPPUNIT_TEST_SUITE_END();
};
- void getAbsoluteFileURL::check_getAbsoluteFileURL( rtl::OUString const& _suBaseURL, rtl::OString const& _sRelativeURL, FileBase::RC _nAssumeError, rtl::OUString const& _suAssumeResultStr )
+ void getAbsoluteFileURL::check_getAbsoluteFileURL(OUString const& _suBaseURL, OString const& _sRelativeURL, osl::FileBase::RC _nAssumeError, OUString const& _suAssumeResultStr)
{
- rtl::OUString suRelativeURL = rtl::OStringToOUString(_sRelativeURL, RTL_TEXTENCODING_UTF8);
- rtl::OString sBaseURL = rtl::OUStringToOString(_suBaseURL, RTL_TEXTENCODING_UTF8);
- rtl::OUString suResultURL;
- osl::FileBase::RC nError = FileBase::getAbsoluteFileURL( _suBaseURL, suRelativeURL, suResultURL );
- rtl::OString sResultURL = rtl::OUStringToOString( suResultURL, RTL_TEXTENCODING_UTF8);
- rtl::OString sError = errorToString(nError);
- printf("getAbsoluteFileURL('%s','%s') deliver absolute URL: '%s', error '%s'\n", sBaseURL.getStr(), _sRelativeURL.getStr(),sResultURL.getStr(), sError.getStr() );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Assumption is wrong: error number is wrong", _nAssumeError, nError );
- if ( nError == FileBase::E_None )
- {
- bool bStrAreEqual = _suAssumeResultStr.equals( suResultURL );
- CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong: ResultURL is not equal to expected URL ", bStrAreEqual );
+ OUString suRelativeURL = OStringToOUString(_sRelativeURL, RTL_TEXTENCODING_UTF8);
+ OString sBaseURL = OUStringToOString(_suBaseURL, RTL_TEXTENCODING_UTF8);
+ OUString suResultURL;
+ osl::FileBase::RC nError = osl::FileBase::getAbsoluteFileURL(_suBaseURL, suRelativeURL, suResultURL);
+ OString sResultURL = OUStringToOString(suResultURL, RTL_TEXTENCODING_UTF8);
+ OString sError = errorToString(nError);
+ printf("getAbsoluteFileURL('%s','%s') deliver absolute URL: '%s', error '%s'\n", sBaseURL.getStr(), _sRelativeURL.getStr(),sResultURL.getStr(), sError.getStr());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong: error number is wrong", _nAssumeError, nError);
+ if (nError == osl::FileBase::E_None)
+ {
+ bool bStrAreEqual = _suAssumeResultStr.equals(suResultURL);
+ CPPUNIT_ASSERT_MESSAGE("Assumption is wrong: ResultURL is not equal to expected URL ", bStrAreEqual);
}
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_1()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/relative/file1" );
- check_getAbsoluteFileURL( aUserDirectoryURL, "relative/file1",FileBase::E_None, suAssume );
+ OUString suAssume = aUserDirectoryURL.concat("/relative/file1");
+ check_getAbsoluteFileURL(aUserDirectoryURL, "relative/file1",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_2()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/relative/file2" );
- check_getAbsoluteFileURL( aUserDirectoryURL, "relative/./file2",FileBase::E_None, suAssume );
+ OUString suAssume = aUserDirectoryURL.concat("/relative/file2");
+ check_getAbsoluteFileURL(aUserDirectoryURL, "relative/./file2",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_3()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/file3" );
- check_getAbsoluteFileURL( aUserDirectoryURL, "relative/../file3",FileBase::E_None, suAssume );
+ OUString suAssume = aUserDirectoryURL.concat("/file3");
+ check_getAbsoluteFileURL(aUserDirectoryURL, "relative/../file3",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_4()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/file4" );
- check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/../file4",FileBase::E_None, suAssume );
+ OUString suAssume = aUserDirectoryURL.concat("/file4");
+ check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/../file4",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_5()
{
- rtl::OUString suAssume;
-#if ( defined UNX )
- suAssume = aUserDirectoryURL.concat( "/relative/" );
+ OUString suAssume;
+#if (defined UNX)
+ suAssume = aUserDirectoryURL.concat("/relative/");
#else
- suAssume = aUserDirectoryURL.concat( rtl::OUString("/relative") );
+ suAssume = aUserDirectoryURL.concat(OUString("/relative"));
#endif
- check_getAbsoluteFileURL( aUserDirectoryURL, "././relative/.",FileBase::E_None, suAssume );
+ check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/.",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_6()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/.relative" );
- check_getAbsoluteFileURL( aUserDirectoryURL, "./.relative",FileBase::E_None, suAssume );
+ OUString suAssume = aUserDirectoryURL.concat("/.relative");
+ check_getAbsoluteFileURL(aUserDirectoryURL, "./.relative",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_7()
{
- rtl::OUString suAssume;
-#if (defined UNX )
- suAssume = aUserDirectoryURL.concat( "/.a/" );
+ OUString suAssume;
+#if (defined UNX)
+ suAssume = aUserDirectoryURL.concat("/.a/");
#else // windows
- suAssume = aUserDirectoryURL.concat( rtl::OUString("/.a") );
+ suAssume = aUserDirectoryURL.concat(OUString("/.a"));
#endif
- check_getAbsoluteFileURL( aUserDirectoryURL, "./.a/mydir/..",FileBase::E_None, suAssume );
+ check_getAbsoluteFileURL(aUserDirectoryURL, "./.a/mydir/..",osl::FileBase::E_None, suAssume);
}
void getAbsoluteFileURL::getAbsoluteFileURL_001_8()
{
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/tmp/ok" );
-#if ( defined UNX )
- check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",FileBase::E_None, suAssume );
+ OUString suAssume = aUserDirectoryURL.concat("/tmp/ok");
+#if (defined UNX)
+ check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_None, suAssume);
#else
- check_getAbsoluteFileURL( aUserDirectoryURL, "tmp//ok",FileBase::E_INVAL, suAssume );
+ check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_INVAL, suAssume);
#endif
}
void getAbsoluteFileURL::getAbsoluteFileURL_002()
{
-#if ( defined UNX ) // Link is not defined in Windows
- OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
+#if (defined UNX) // Link is not defined in Windows
+ OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys);
aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file";
aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/canonical.name";
- rtl::OString strLinkFileName, strSrcFileName;
- strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
- strSrcFileName = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
-
- createTestFile( aCanURL1 );
- sal_Int32 fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
- CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
- rtl::OString sLnkURL = OUStringToOString( aLnkURL1, RTL_TEXTENCODING_ASCII_US );
- rtl::OUString suAssume = aUserDirectoryURL.concat( "/canonical.name" );
- check_getAbsoluteFileURL( aUserDirectoryURL, sLnkURL, FileBase::E_None, suAssume );
- deleteTestFile( aCanURL1 );
- fd = remove( strLinkFileName.getStr() );
- CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
+ OString strLinkFileName, strSrcFileName;
+ strLinkFileName = OUStringToOString(aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US);
+ strSrcFileName = OUStringToOString(aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US);
+
+ createTestFile(aCanURL1);
+ sal_Int32 fd = symlink(strSrcFileName.getStr(), strLinkFileName.getStr());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
+ OString sLnkURL = OUStringToOString(aLnkURL1, RTL_TEXTENCODING_ASCII_US);
+ OUString suAssume = aUserDirectoryURL.concat("/canonical.name");
+ check_getAbsoluteFileURL(aUserDirectoryURL, sLnkURL, osl::FileBase::E_None, suAssume);
+ deleteTestFile(aCanURL1);
+ fd = remove(strLinkFileName.getStr());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
#endif
}
@@ -553,33 +551,33 @@ namespace osl_FileBase
{
// create two level directories under $Temp/PID/
OUString aUStrUpBase = aUserDirectoryURL + "/test1";
- createTestDirectory( aUStrUpBase );
+ createTestDirectory(aUStrUpBase);
OUString aUStrBase = aUserDirectoryURL + "/test1/dir1";
- createTestDirectory( aUStrBase );
+ createTestDirectory(aUStrBase);
- OUString suAssume = aUserDirectoryURL.concat( "/mytestfile" );
- check_getAbsoluteFileURL( aUStrBase, "../../mytestfile" , FileBase::E_None, suAssume );
- deleteTestDirectory( aUStrBase );
- deleteTestDirectory( aUStrUpBase );
+ OUString suAssume = aUserDirectoryURL.concat("/mytestfile");
+ check_getAbsoluteFileURL(aUStrBase, "../../mytestfile" , osl::FileBase::E_None, suAssume);
+ deleteTestDirectory(aUStrBase);
+ deleteTestDirectory(aUStrUpBase);
}
// testing two methods:
- // static inline RC getSystemPathFromFileURL( const OUString& ustrFileURL,
- // OUString& ustrSystemPath )
- // static RC getFileURLFromSystemPath( const OUString & ustrSystemPath,
- // OUString & ustrFileURL );
+ // static inline RC getSystemPathFromFileURL(const OUString& ustrFileURL,
+ // OUString& ustrSystemPath)
+ // static RC getFileURLFromSystemPath(const OUString & ustrSystemPath,
+ // OUString & ustrFileURL);
- class SystemPath_FileURL:public CppUnit::TestFixture
+ class SystemPath_FileURL : public CppUnit::TestFixture
{
private:
- void check_SystemPath_FileURL(rtl::OString const& _sSource, FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, bool bDirection = true );
- void checkWNTBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString );
- void checkUNXBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString );
- void checkWNTBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString);
- void checkUNXBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString);
+ void check_SystemPath_FileURL(OString const& _sSource, osl::FileBase::RC _nAssumeError, OString const& _sAssumeResultStr, bool bDirection = true);
+ void checkWNTBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString);
+ void checkUNXBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString);
+ void checkWNTBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString);
+ void checkUNXBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString);
public:
- // test code.
+
void getSystemPathFromFileURL_001_1();
void getSystemPathFromFileURL_001_2();
void getSystemPathFromFileURL_001_21();
@@ -611,78 +609,78 @@ namespace osl_FileBase
void getFileURLFromSystemPath_004();
void getFileURLFromSystemPath_005();
- CPPUNIT_TEST_SUITE( SystemPath_FileURL );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_1 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_2 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_21 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_22 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_3 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_31 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_4 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_41 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_5 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_51 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_52 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_53 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_6 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_61 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_7 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_71 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_8 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_81 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_9 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_91 );
- CPPUNIT_TEST( getSystemPathFromFileURL_001_92 );
- CPPUNIT_TEST( getSystemPathFromFileURL_004 );
- CPPUNIT_TEST( getSystemPathFromFileURL_005 );
- CPPUNIT_TEST( getFileURLFromSystemPath_001 );
- CPPUNIT_TEST( getFileURLFromSystemPath_002 );
- CPPUNIT_TEST( getFileURLFromSystemPath_003 );
- CPPUNIT_TEST( getFileURLFromSystemPath_004 );
- CPPUNIT_TEST( getFileURLFromSystemPath_005 );
+ CPPUNIT_TEST_SUITE(SystemPath_FileURL);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_1);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_2);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_21);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_22);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_3);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_31);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_4);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_41);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_5);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_51);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_52);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_53);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_6);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_61);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_7);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_71);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_8);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_81);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_9);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_91);
+ CPPUNIT_TEST(getSystemPathFromFileURL_001_92);
+ CPPUNIT_TEST(getSystemPathFromFileURL_004);
+ CPPUNIT_TEST(getSystemPathFromFileURL_005);
+ CPPUNIT_TEST(getFileURLFromSystemPath_001);
+ CPPUNIT_TEST(getFileURLFromSystemPath_002);
+ CPPUNIT_TEST(getFileURLFromSystemPath_003);
+ CPPUNIT_TEST(getFileURLFromSystemPath_004);
+ CPPUNIT_TEST(getFileURLFromSystemPath_005);
CPPUNIT_TEST_SUITE_END();
};
// if bDirection==sal_True, check getSystemPathFromFileURL
// if bDirection==sal_False, check getFileURLFromSystemPath
- void SystemPath_FileURL::check_SystemPath_FileURL(rtl::OString const& _sSource, FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, bool bDirection)
+ void SystemPath_FileURL::check_SystemPath_FileURL(OString const& _sSource, osl::FileBase::RC _nAssumeError, OString const& _sAssumeResultStr, bool bDirection)
{
// PRE: URL as String
- rtl::OUString suSource;
- rtl::OUString suStr;
- suSource = rtl::OStringToOUString(_sSource, RTL_TEXTENCODING_UTF8);
- FileBase::RC nError;
+ OUString suSource;
+ OUString suStr;
+ suSource = OStringToOUString(_sSource, RTL_TEXTENCODING_UTF8);
+ osl::FileBase::RC nError;
- if ( bDirection )
- nError = osl::FileBase::getSystemPathFromFileURL( suSource, suStr );
+ if (bDirection)
+ nError = osl::FileBase::getSystemPathFromFileURL(suSource, suStr);
else
- nError = osl::FileBase::getFileURLFromSystemPath( suSource, suStr );
+ nError = osl::FileBase::getFileURLFromSystemPath(suSource, suStr);
// if the given string is gt length 0,
// we check also this string
- rtl::OString sStr = rtl::OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
- rtl::OString sError = errorToString(nError);
+ OString sStr = OUStringToOString(suStr, RTL_TEXTENCODING_UTF8);
+ OString sError = errorToString(nError);
- if ( bDirection )
- printf("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
+ if (bDirection)
+ printf("getSystemPathFromFileURL('%s') deliver system path: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr());
else
- printf("getFileURLFromSystemPath('%s') deliver File URL: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr() );
+ printf("getFileURLFromSystemPath('%s') deliver File URL: '%s', error '%s'\n", _sSource.getStr(), sStr.getStr(), sError.getStr());
if (!_sAssumeResultStr.isEmpty())
{
bool bStrAreEqual = _sAssumeResultStr.equals(sStr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Assumption is wrong",
- _nAssumeError, nError );
- CPPUNIT_ASSERT_MESSAGE( "Assumption is wrong",
- bStrAreEqual );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong",
+ _nAssumeError, nError);
+ CPPUNIT_ASSERT_MESSAGE("Assumption is wrong",
+ bStrAreEqual);
}
else
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "Assumption is wrong", _nAssumeError, nError );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Assumption is wrong", _nAssumeError, nError);
}
}
- void SystemPath_FileURL::checkWNTBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString)
+ void SystemPath_FileURL::checkWNTBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString)
{
#if defined(_WIN32)
check_SystemPath_FileURL(_sURL, _nAssumeError, _sWNTAssumeResultString);
@@ -693,9 +691,9 @@ namespace osl_FileBase
#endif
}
- void SystemPath_FileURL::checkUNXBehaviour_getSystemPathFromFileURL(rtl::OString const& _sURL, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString)
+ void SystemPath_FileURL::checkUNXBehaviour_getSystemPathFromFileURL(OString const& _sURL, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString)
{
-#if ( defined UNX )
+#if (defined UNX)
check_SystemPath_FileURL(_sURL, _nAssumeError, _sUnixAssumeResultString);
#else
(void)_sURL;
@@ -704,10 +702,10 @@ namespace osl_FileBase
#endif
}
- void SystemPath_FileURL::checkWNTBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sWNTAssumeResultString)
+ void SystemPath_FileURL::checkWNTBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sWNTAssumeResultString)
{
#if defined(_WIN32)
- check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sWNTAssumeResultString, sal_False );
+ check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sWNTAssumeResultString, sal_False);
#else
(void)_sSysPath;
(void)_nAssumeError;
@@ -715,10 +713,10 @@ namespace osl_FileBase
#endif
}
- void SystemPath_FileURL::checkUNXBehaviour_getFileURLFromSystemPath(rtl::OString const& _sSysPath, FileBase::RC _nAssumeError, rtl::OString const& _sUnixAssumeResultString)
+ void SystemPath_FileURL::checkUNXBehaviour_getFileURLFromSystemPath(OString const& _sSysPath, osl::FileBase::RC _nAssumeError, OString const& _sUnixAssumeResultString)
{
-#if ( defined UNX )
- check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sUnixAssumeResultString, false );
+#if (defined UNX)
+ check_SystemPath_FileURL(_sSysPath, _nAssumeError, _sUnixAssumeResultString, false);
#else
(void)_sSysPath;
(void)_nAssumeError;
@@ -737,14 +735,14 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_1()
{
- rtl::OString sURL("");
+ OString sURL("");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_2()
{
- rtl::OString sURL("/");
+ OString sURL("/");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "\\");
}
@@ -752,7 +750,7 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_21()
{
#if 0
- rtl::OString sURL("%2F");
+ OString sURL("%2F");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/"); // LLA: this is may be a BUG
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
#endif
@@ -760,42 +758,42 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_22()
{
- rtl::OString sURL("file:///tmp%2Fmydir");
+ OString sURL("file:///tmp%2Fmydir");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_3()
{
- rtl::OString sURL("a");
+ OString sURL("a");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "a");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_31()
{
- rtl::OString sURL("tmpname");
+ OString sURL("tmpname");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "tmpname");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_4()
{
- rtl::OString sURL("file://");
+ OString sURL("file://");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_41()
{
- rtl::OString sURL("file://localhost/tmp");
+ OString sURL("file://localhost/tmp");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_5()
{
- rtl::OString sURL("file:///tmp");
+ OString sURL("file:///tmp");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
@@ -803,7 +801,7 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_51()
{
#if 0
- rtl::OString sURL("file://c:/tmp");
+ OString sURL("file://c:/tmp");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:/tmp"); // LLA: this is may be a BUG
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
#endif
@@ -811,7 +809,7 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_52()
{
- rtl::OString sURL("file:///c:/tmp");
+ OString sURL("file:///c:/tmp");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp");
}
@@ -819,42 +817,42 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_53()
{
// LLA: is this a legal file path?
- rtl::OString sURL("file:///c|/tmp");
+ OString sURL("file:///c|/tmp");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c|/tmp");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_6()
{
- rtl::OString sURL("file:///tmp/first");
+ OString sURL("file:///tmp/first");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_61()
{
- rtl::OString sURL("file:///c:/tmp/first");
+ OString sURL("file:///c:/tmp/first");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_7()
{
- rtl::OString sURL("file:///tmp/../second");
+ OString sURL("file:///tmp/../second");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/../second"); // LLA: may be a BUG
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_71()
{
- rtl::OString sURL("file:///c:/tmp/../second");
+ OString sURL("file:///c:/tmp/../second");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/../second");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\..\\second");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_8()
{
- rtl::OString sURL("../tmp");
+ OString sURL("../tmp");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "../tmp");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "..\\tmp");
}
@@ -862,25 +860,25 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_81()
{
#if 0
- rtl::OString sURL("file://~/tmp");
+ OString sURL("file://~/tmp");
char* home_path;
home_path = getenv("HOME");
- rtl::OString expResult(home_path);
+ OString expResult(home_path);
expResult += "/tmp";
- checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult );
+ checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, expResult);
#endif
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_9()
{
- rtl::OString sURL("file:///tmp/first%20second");
+ OString sURL("file:///tmp/first%20second");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/tmp/first second");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getSystemPathFromFileURL_001_91()
{
- rtl::OString sURL("file:///c:/tmp/first%20second");
+ OString sURL("file:///c:/tmp/first%20second");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "/c:/tmp/first second");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "c:\\tmp\\first second");
}
@@ -888,7 +886,7 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_001_92()
{
#if 0
- rtl::OString sURL("ca@#;+.,$///78no%01ni..name");
+ OString sURL("ca@#;+.,$///78no%01ni..name");
checkUNXBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_None, "");
checkWNTBehaviour_getSystemPathFromFileURL(sURL, osl::FileBase::E_INVAL, "");
#endif
@@ -898,20 +896,20 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_004()
{
OUString aUStr;
- OUString aUNormalURL( aTmpName6 );
- OUString aUResultURL ( aSysPath4 );
- FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aUNormalURL, aUStr );
+ OUString aUNormalURL(aTmpName6);
+ OUString aUResultURL (aSysPath4);
+ osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL(aUNormalURL, aUStr);
- bool bOk = compareFileName( aUStr, aUResultURL );
+ bool bOk = compareFileName(aUStr, aUResultURL);
OString sError("test for getSystemPathFromFileURL(' ");
- sError += OUStringToOString( aUNormalURL, RTL_TEXTENCODING_ASCII_US );
+ sError += OUStringToOString(aUNormalURL, RTL_TEXTENCODING_ASCII_US);
sError += " ') function:use an absolute file URL, ";
- sError += outputError(OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US ),
- OUStringToOString( aUResultURL, RTL_TEXTENCODING_ASCII_US ));
+ sError += outputError(OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US),
+ OUStringToOString(aUResultURL, RTL_TEXTENCODING_ASCII_US));
- CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_None, nError );
- CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bOk );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_None, nError);
+ CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bOk);
}
@@ -919,222 +917,224 @@ namespace osl_FileBase
void SystemPath_FileURL::getSystemPathFromFileURL_005()
{
OUString aUStr;
- createTestDirectory( aTmpName10 );
- OUString aUNormalURL( aTmpName10 );
- OUString aUResultURL ( aSysPath5 );
+ createTestDirectory(aTmpName10);
+ OUString aUNormalURL(aTmpName10);
+ OUString aUResultURL (aSysPath5);
- FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL( aUNormalURL, aUStr );
+ osl::FileBase::RC nError = osl::FileBase::getSystemPathFromFileURL(aUNormalURL, aUStr);
- bool bOk = compareFileName( aUStr, aUResultURL );
+ bool bOk = compareFileName(aUStr, aUResultURL);
OString sError("test for getSystemPathFromFileURL(' ");
- sError += OUStringToOString( aUNormalURL, RTL_TEXTENCODING_ASCII_US );
+ sError += OUStringToOString(aUNormalURL, RTL_TEXTENCODING_ASCII_US);
sError += " ') function:use a CJK coded absolute URL, ";
- sError += outputError(OUStringToOString( aUStr, RTL_TEXTENCODING_ASCII_US ),
- OUStringToOString( aUResultURL, RTL_TEXTENCODING_ASCII_US ));
- deleteTestDirectory( aTmpName10 );
+ sError += outputError(OUStringToOString(aUStr, RTL_TEXTENCODING_ASCII_US),
+ OUStringToOString(aUResultURL, RTL_TEXTENCODING_ASCII_US));
+ deleteTestDirectory(aTmpName10);
- CPPUNIT_ASSERT_EQUAL_MESSAGE( sError.getStr(), osl::FileBase::E_None, nError );
- CPPUNIT_ASSERT_MESSAGE( sError.getStr(), bOk );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(sError.getStr(), osl::FileBase::E_None, nError);
+ CPPUNIT_ASSERT_MESSAGE(sError.getStr(), bOk);
}
void SystemPath_FileURL::getFileURLFromSystemPath_001()
{
- rtl::OString sSysPath("~/tmp");
+ OString sSysPath("~/tmp");
char* home_path;
home_path = getenv("HOME");
- rtl::OString expResult(home_path);
+ OString expResult(home_path);
expResult = "file://"+ expResult + "/tmp";
- checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, expResult );
+ checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, expResult);
checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "~/tmp");
}
void SystemPath_FileURL::getFileURLFromSystemPath_002()
{
- rtl::OString sSysPath("c:/tmp");
+ OString sSysPath("c:/tmp");
checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "c:/tmp");
checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///c:/tmp");
}
void SystemPath_FileURL::getFileURLFromSystemPath_003()
{
- rtl::OString sSysPath("file:///temp");
+ OString sSysPath("file:///temp");
checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getFileURLFromSystemPath_004()
{
- rtl::OString sSysPath("//tmp//first start");
+ OString sSysPath("//tmp//first start");
checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_None, "file:///tmp/first%20start");
checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
}
void SystemPath_FileURL::getFileURLFromSystemPath_005()
{
- rtl::OString sSysPath("");
+ OString sSysPath("");
checkUNXBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
checkWNTBehaviour_getFileURLFromSystemPath(sSysPath, osl::FileBase::E_INVAL, "");
}
// testing the method
- // static inline RC searchFileURL( const OUString& ustrFileName,
+ // static inline RC searchFileURL( const OUString& ustrFileName,
// const OUString& ustrSearchPath,
- // OUString& ustrFileURL )
+ // OUString& ustrFileURL)
class searchFileURL : public CppUnit::TestFixture
{
+ private:
OUString aUStr;
- FileBase::RC nError1, nError2, nError3,nError4;
-
- public:
+ osl::FileBase::RC nError1, nError2, nError3,nError4;
+ public:
searchFileURL()
- : nError1(FileBase::E_None)
- , nError2(FileBase::E_None)
- , nError3(FileBase::E_None)
- , nError4(FileBase::E_None) {}
+ : nError1(osl::FileBase::E_None)
+ , nError2(osl::FileBase::E_None)
+ , nError3(osl::FileBase::E_None)
+ , nError4(osl::FileBase::E_None) {}
void searchFileURL_001()
{
/* search file is passed by system filename */
- nError1 = FileBase::searchFileURL( aTmpName1, aUserDirectorySys, aUStr );
+ nError1 = osl::FileBase::searchFileURL(aTmpName1, aUserDirectorySys, aUStr);
/* search file is passed by full qualified file URL */
- nError2 = FileBase::searchFileURL( aCanURL1, aUserDirectorySys, aUStr );
+ nError2 = osl::FileBase::searchFileURL(aCanURL1, aUserDirectorySys, aUStr);
/* search file is passed by relative file path */
- nError3 = FileBase::searchFileURL( aRelURL4, aUserDirectorySys, aUStr );
+ nError3 = osl::FileBase::searchFileURL(aRelURL4, aUserDirectorySys, aUStr);
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
- osl::FileBase::E_NOENT, nError1 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
- osl::FileBase::E_NOENT, nError2 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
- osl::FileBase::E_NOENT, nError3 );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
+ osl::FileBase::E_NOENT, nError1);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
+ osl::FileBase::E_NOENT, nError2);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched files that is not exist, but it reply invalid error, did not pass in (W32) ",
+ osl::FileBase::E_NOENT, nError3);
}
void searchFileURL_002()
{
/* search file is passed by system filename */
- nError1 = FileBase::searchFileURL( aTempDirectorySys, aRootSys, aUStr );
- bool bOk1 = compareFileName( aUStr, aTempDirectoryURL );
+ nError1 = osl::FileBase::searchFileURL(aTempDirectorySys, aRootSys, aUStr);
+ bool bOk1 = compareFileName(aUStr, aTempDirectoryURL);
/* search file is passed by full qualified file URL */
- nError2 = FileBase::searchFileURL( aTempDirectoryURL, aRootSys, aUStr );
- bool bOk2 = compareFileName( aUStr, aTempDirectoryURL );
+ nError2 = osl::FileBase::searchFileURL(aTempDirectoryURL, aRootSys, aUStr);
+ bool bOk2 = compareFileName(aUStr, aTempDirectoryURL);
/* search file is passed by relative file path */
- nError3 = FileBase::searchFileURL( aRelURL5, aRootSys, aUStr );
- bool bOk3 = compareFileName( aUStr, aTempDirectoryURL );
+ nError3 = osl::FileBase::searchFileURL(aRelURL5, aRootSys, aUStr);
+ bool bOk3 = compareFileName(aUStr, aTempDirectoryURL);
/* search file is passed by an exist file */
- createTestFile( aCanURL1 );
- nError4 = FileBase::searchFileURL( aCanURL4, aUserDirectorySys, aUStr );
- bool bOk4 = compareFileName( aUStr, aCanURL1 );
- deleteTestFile( aCanURL1 );
-
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- osl::FileBase::E_None, nError2 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- osl::FileBase::E_None, nError3 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- osl::FileBase::E_None, nError4 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- bOk1 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- bOk2 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- bOk3 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
- bOk4 );
+ createTestFile(aCanURL1);
+ nError4 = osl::FileBase::searchFileURL(aCanURL4, aUserDirectorySys, aUStr);
+ bool bOk4 = compareFileName(aUStr, aCanURL1);
+ deleteTestFile(aCanURL1);
+
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ osl::FileBase::E_None, nError2);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ osl::FileBase::E_None, nError3);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ osl::FileBase::E_None, nError4);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ bOk1);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ bOk2);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ bOk3);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.",
+ bOk4);
}
void searchFileURL_003()
{
- OUString aSystemPathList( TEST_PLATFORM_ROOT ":" TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ":" TEST_PLATFORM_ROOT "system/path" );
- nError1 = FileBase::searchFileURL( aUserDirectoryURL, aSystemPathList, aUStr );
- bool bOk = compareFileName( aUStr, aUserDirectoryURL );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
- bOk );
+ OUString aSystemPathList(TEST_PLATFORM_ROOT ":" TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ":" TEST_PLATFORM_ROOT "system/path");
+ nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aSystemPathList, aUStr);
+ bool bOk = compareFileName(aUStr, aUserDirectoryURL);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+ bOk);
}
void searchFileURL_004()
{
- OUString aSystemPathList( TEST_PLATFORM_ROOT PATH_LIST_DELIMITER TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP PATH_LIST_DELIMITER TEST_PLATFORM_ROOT "system/path/../name" );
- nError1 = FileBase::searchFileURL( aUserDirectoryURL, aSystemPathList, aUStr );
- bool bOk = compareFileName( aUStr, aUserDirectoryURL );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: search directory is a list of system paths",
- bOk );
+ OUString aSystemPathList(TEST_PLATFORM_ROOT PATH_LIST_DELIMITER TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP PATH_LIST_DELIMITER TEST_PLATFORM_ROOT "system/path/../name");
+ nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aSystemPathList, aUStr);
+ bool bOk = compareFileName(aUStr, aUserDirectoryURL);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: search directory is a list of system paths",
+ bOk);
}
void searchFileURL_005()
{
- nError1 = FileBase::searchFileURL( aUserDirectoryURL, aNullURL, aUStr );
- bool bOk = compareFileName( aUStr, aUserDirectoryURL );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for searchFileURL function: search directory is NULL",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_MESSAGE( "test for searchFileURL function: search directory is NULL",
- bOk );
+ nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aNullURL, aUStr);
+ bool bOk = compareFileName(aUStr, aUserDirectoryURL);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: search directory is NULL",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: search directory is NULL",
+ bOk);
}
- CPPUNIT_TEST_SUITE( searchFileURL );
- CPPUNIT_TEST( searchFileURL_001 );
- CPPUNIT_TEST( searchFileURL_002 );
- CPPUNIT_TEST( searchFileURL_003 );
- CPPUNIT_TEST( searchFileURL_004 );
- CPPUNIT_TEST( searchFileURL_005 );
+ CPPUNIT_TEST_SUITE(searchFileURL);
+ CPPUNIT_TEST(searchFileURL_001);
+ CPPUNIT_TEST(searchFileURL_002);
+ CPPUNIT_TEST(searchFileURL_003);
+ CPPUNIT_TEST(searchFileURL_004);
+ CPPUNIT_TEST(searchFileURL_005);
CPPUNIT_TEST_SUITE_END();
};
// testing the method
- // static inline RC getTempDirURL( OUString& ustrTempDirURL )
+ // static inline RC getTempDirURL(OUString& ustrTempDirURL)
- class getTempDirURL:public CppUnit::TestFixture
+ class getTempDirURL : public CppUnit::TestFixture
{
+ private:
OUString aUStr;
- FileBase::RC nError;
+ osl::FileBase::RC nError;
public:
- getTempDirURL() : nError(FileBase::E_None) {}
+ getTempDirURL() : nError(osl::FileBase::E_None) {}
void setUp() override
{
- nError = FileBase::getTempDirURL( aUStr );
+ nError = osl::FileBase::getTempDirURL(aUStr);
}
void getTempDirURL_001()
{
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for getTempDirURL function: excution",
- osl::FileBase::E_None, nError );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getTempDirURL function: excution",
+ osl::FileBase::E_None, nError);
}
void getTempDirURL_002()
{
- CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
- checkDirectory( aUStr, oslCheckMode::OpenAccess ) );
- CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
- checkDirectory( aUStr, oslCheckMode::ReadAccess ) );
- CPPUNIT_ASSERT_MESSAGE( "test for getTempDirURL function: test for open and write access rights",
- checkDirectory( aUStr, oslCheckMode::WriteAccess ) );
+ CPPUNIT_ASSERT_MESSAGE("test for getTempDirURL function: test for open and write access rights",
+ checkDirectory(aUStr, oslCheckMode::OpenAccess));
+ CPPUNIT_ASSERT_MESSAGE("test for getTempDirURL function: test for open and write access rights",
+ checkDirectory(aUStr, oslCheckMode::ReadAccess));
+ CPPUNIT_ASSERT_MESSAGE("test for getTempDirURL function: test for open and write access rights",
+ checkDirectory(aUStr, oslCheckMode::WriteAccess));
}
- CPPUNIT_TEST_SUITE( getTempDirURL );
- CPPUNIT_TEST( getTempDirURL_001 );
- CPPUNIT_TEST( getTempDirURL_002 );
+ CPPUNIT_TEST_SUITE(getTempDirURL);
+ CPPUNIT_TEST(getTempDirURL_001);
+ CPPUNIT_TEST(getTempDirURL_002);
CPPUNIT_TEST_SUITE_END();
};
// testing the method
- // static inline RC createTempFile( OUString* pustrDirectoryURL,
+ // static inline RC createTempFile(OUString* pustrDirectoryURL,
// oslFileHandle* pHandle,
// OUString* pustrTempFileURL)
- class createTempFile:public CppUnit::TestFixture
+ class createTempFile : public CppUnit::TestFixture
{
- FileBase::RC nError1, nError2;
+ private:
+ osl::FileBase::RC nError1, nError2;
bool bOK;
oslFileHandle *pHandle;
@@ -1143,8 +1143,8 @@ namespace osl_FileBase
public:
createTempFile()
- : nError1(FileBase::E_None)
- , nError2(FileBase::E_None)
+ : nError1(osl::FileBase::E_None)
+ , nError2(osl::FileBase::E_None)
, bOK(false)
, pHandle(nullptr)
, pUStr_DirURL(nullptr)
@@ -1155,7 +1155,7 @@ namespace osl_FileBase
void setUp() override
{
pHandle = new oslFileHandle();
- pUStr_DirURL = new OUString( aUserDirectoryURL );
+ pUStr_DirURL = new OUString(aUserDirectoryURL);
pUStr_FileURL = new OUString();
}
@@ -1168,165 +1168,164 @@ namespace osl_FileBase
void createTempFile_001()
{
- nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, pUStr_FileURL );
- File testFile( *pUStr_FileURL );
- nError2 = testFile.open( osl_File_OpenFlag_Create );
+ nError1 = osl::FileBase::createTempFile(pUStr_DirURL, pHandle, pUStr_FileURL);
+ File testFile(*pUStr_FileURL);
+ nError2 = testFile.open(osl_File_OpenFlag_Create);
- if ( osl::FileBase::E_EXIST == nError2 )
+ if (osl::FileBase::E_EXIST == nError2)
{
- osl_closeFile( *pHandle );
- deleteTestFile( *pUStr_FileURL );
+ osl_closeFile(*pHandle);
+ deleteTestFile(*pUStr_FileURL);
}
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for createTempFile function: create temp file and test the existence",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_MESSAGE( "test for createTempFile function: create temp file and test the existence",
- ( pHandle != nullptr ) );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for createTempFile function: create temp file and test the existence",
- osl::FileBase::E_EXIST, nError2 );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for createTempFile function: create temp file and test the existence",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_MESSAGE("test for createTempFile function: create temp file and test the existence",
+ (pHandle != nullptr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for createTempFile function: create temp file and test the existence",
+ osl::FileBase::E_EXIST, nError2);
}
void createTempFile_002()
{
bOK = false;
- nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, pUStr_FileURL );
- File testFile( *pUStr_FileURL );
- nError2 = testFile.open( osl_File_OpenFlag_Create );
+ nError1 = osl::FileBase::createTempFile(pUStr_DirURL, pHandle, pUStr_FileURL);
+ File testFile(*pUStr_FileURL);
+ nError2 = testFile.open(osl_File_OpenFlag_Create);
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
- ( pHandle != nullptr ) );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
- osl::FileBase::E_EXIST, nError2 );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+ (pHandle != nullptr));
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+ osl::FileBase::E_EXIST, nError2);
// check file if have the write permission
- if ( osl::FileBase::E_EXIST == nError2 )
+ if (osl::FileBase::E_EXIST == nError2)
{
- bOK = ifFileCanWrite( *pUStr_FileURL );
- osl_closeFile( *pHandle );
- deleteTestFile( *pUStr_FileURL );
+ bOK = ifFileCanWrite(*pUStr_FileURL);
+ osl_closeFile(*pHandle);
+ deleteTestFile(*pUStr_FileURL);
}
- CPPUNIT_ASSERT_MESSAGE( "test for open and write access rights, in (W32), it did not have write access right, but it should be writable.",
- bOK );
+ CPPUNIT_ASSERT_MESSAGE("test for open and write access rights, in (W32), it did not have write access right, but it should be writable.",
+ bOK);
}
void createTempFile_003()
{
- nError1 = FileBase::createTempFile( pUStr_DirURL, pHandle, nullptr );
+ nError1 = osl::FileBase::createTempFile(pUStr_DirURL, pHandle, nullptr);
// the temp file will be removed when return from createTempFile
bOK = (pHandle != nullptr && nError1 == osl::FileBase::E_None);
- if ( bOK )
- osl_closeFile( *pHandle );
+ if (bOK)
+ osl_closeFile(*pHandle);
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
- FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_MESSAGE( "test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
- bOK );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_MESSAGE("test for createTempFile function: set pUStrFileURL to 0 to let it remove the file after call.",
+ bOK);
}
void createTempFile_004()
{
- nError1 = FileBase::createTempFile( pUStr_DirURL, nullptr, pUStr_FileURL );
- bOK = ( pUStr_FileURL != nullptr);
+ nError1 = osl::FileBase::createTempFile(pUStr_DirURL, nullptr, pUStr_FileURL);
+ bOK = (pUStr_FileURL != nullptr);
CPPUNIT_ASSERT(bOK);
- File testFile( *pUStr_FileURL );
- nError2 = testFile.open( osl_File_OpenFlag_Create );
- deleteTestFile( *pUStr_FileURL );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
- osl::FileBase::E_None, nError1 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
- osl::FileBase::E_EXIST, nError2 );
- CPPUNIT_ASSERT_MESSAGE( "createTempFile function: create a temp file, but it does not exist",
- bOK );
-
- }
-
- CPPUNIT_TEST_SUITE( createTempFile );
- CPPUNIT_TEST( createTempFile_001 );
- CPPUNIT_TEST( createTempFile_002 );
- CPPUNIT_TEST( createTempFile_003 );
- CPPUNIT_TEST( createTempFile_004 );
+ File testFile(*pUStr_FileURL);
+ nError2 = testFile.open(osl_File_OpenFlag_Create);
+ deleteTestFile(*pUStr_FileURL);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+ osl::FileBase::E_None, nError1);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+ osl::FileBase::E_EXIST, nError2);
+ CPPUNIT_ASSERT_MESSAGE("createTempFile function: create a temp file, but it does not exist",
+ bOK);
+
+ }
+
+ CPPUNIT_TEST_SUITE(createTempFile);
+ CPPUNIT_TEST(createTempFile_001);
+ CPPUNIT_TEST(createTempFile_002);
+ CPPUNIT_TEST(createTempFile_003);
+ CPPUNIT_TEST(createTempFile_004);
CPPUNIT_TEST_SUITE_END();
};
-// FIXME: remove the _disabled to enable:
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase_disabled" );
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::SystemPath_FileURL, "osl_FileBase" );
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::searchFileURL, "osl_FileBase_disabled" );
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getTempDirURL, "osl_FileBase_disabled" );
- CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::createTempFile, "osl_FileBase_disabled" );
+ // FIXME: remove the _disabled to enable:
+ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::getAbsoluteFileURL, "osl_osl::FileBase_disabled");
+ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::SystemPath_FileURL, "osl_osl::FileBase");
+ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::searchFileURL, "osl_osl::FileBase_disabled");
+ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::getTempDirURL, "osl_osl::FileBase_disabled");
+ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::createTempFile, "osl_osl::FileBase_disabled");
- CPPUNIT_REGISTRY_ADD_TO_DEFAULT( "osl_FileBase" );
+ CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_osl::FileBase");
}
namespace osl_FileStatus
{
// testing the method
- // FileStatus( sal_uInt32 nMask ): _nMask( nMask )
-
+ // FileStatus(sal_uInt32 nMask): _nMask(nMask)
class ctors : public CppUnit::TestFixture
{
private:
- OUString aUStr;
- FileBase::RC nError1;
- DirectoryItem rItem;
+ OUString aUStr;
+ osl::FileBase::RC nError1;
+ DirectoryItem rItem;
public:
- ctors() : nError1(FileBase::E_None) {}
- // initialization
+ ctors() : nError1(osl::FileBase::E_None) {}
+
void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
- createTestDirectory( aTmpName3 );
- createTestFile( aTmpName4 );
+ createTestDirectory(aTmpName3);
+ createTestFile(aTmpName4);
- Directory aDir( aTmpName3 );
+ Directory aDir(aTmpName3);
nError1 = aDir.open();
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
- nError1 = aDir.getNextItem( rItem );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+ nError1 = aDir.getNextItem(rItem);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
aDir.close();
}
void tearDown() override
{
// remove the tempfile in $TEMP/tmpdir/tmpname.
- deleteTestFile( aTmpName4 );
- deleteTestDirectory( aTmpName3 );
+ deleteTestFile(aTmpName4);
+ deleteTestDirectory(aTmpName3);
}
void ctors_001()
{
- FileStatus rFileStatus( osl_FileStatus_Mask_All );
- nError1 = rItem.getFileStatus( rFileStatus );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+ FileStatus rFileStatus(osl_FileStatus_Mask_All);
+ nError1 = rItem.getFileStatus(rFileStatus);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
aUStr = rFileStatus.getFileName();
- CPPUNIT_ASSERT_MESSAGE( "test for ctors function: mask all and see the file name",
- compareFileName( aUStr, aTmpName2) );
+ CPPUNIT_ASSERT_MESSAGE("test for ctors function: mask all and see the file name",
+ compareFileName(aUStr, aTmpName2));
}
void ctors_002()
{
- FileStatus rFileStatus( 0 );
- nError1 = rItem.getFileStatus( rFileStatus );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+ FileStatus rFileStatus(0);
+ nError1 = rItem.getFileStatus(rFileStatus);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
aUStr = rFileStatus.getFileName();
- CPPUNIT_ASSERT_MESSAGE( "test for ctors function: mask is empty",
- compareFileName( aUStr, aNullURL) );
+ CPPUNIT_ASSERT_MESSAGE("test for ctors function: mask is empty",
+ compareFileName(aUStr, aNullURL));
}
- CPPUNIT_TEST_SUITE( ctors );
- CPPUNIT_TEST( ctors_001 );
- CPPUNIT_TEST( ctors_002 );
+ CPPUNIT_TEST_SUITE(ctors);
+ CPPUNIT_TEST(ctors_001);
+ CPPUNIT_TEST(ctors_002);
CPPUNIT_TEST_SUITE_END();
};
// testing the method
- // inline sal_Bool isValid( sal_uInt32 nMask ) const
+ // inline sal_Bool isValid(sal_uInt32 nMask) const
class isValid : public CppUnit::TestFixture
{
@@ -1343,41 +1342,41 @@ namespace osl_FileStatus
void setUp() override
{
// create a tempfile in $TEMP/tmpdir/tmpname.
- createTestDirectory( aTmpName3 );
- createTestFile( aTmpName4 );
+ createTestDirectory(aTmpName3);
+ createTestFile(aTmpName4);
- pDir = new Directory( aTmpName3 );
- FileBase::RC nError1 = pDir->open();
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
- nError1 = pDir->getNextItem( rItem_file, 1 );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+ pDir = new Directory(aTmpName3);
+ osl::FileBase::RC nError1 = pDir->open();
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+ nError1 = pDir->getNextItem(rItem_file, 1);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
}
void tearDown() override
{
- FileBase::RC nError1 = pDir->close();
+ osl::FileBase::RC nError1 = pDir->close();
delete pDir;
- CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr(nError1).getStr(), nError1, FileBase::E_None );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), nError1, osl::FileBase::E_None);
// remove the tempfile in $TEMP/tmpdir/tmpname.
- deleteTestFile( aTmpName4 );
- deleteTestDirectory( aTmpName3 );
+ deleteTestFile(aTmpName4);
+ deleteTestDirectory(aTmpName3);
}
void isValid_001()
{
sal_uInt32 mask = 0;
- FileStatus rFileStatus( mask );
- FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
- bool bOk = rFileStatus.isValid( mask );
+ FileStatus rFileStatus(mask);
+ osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
+ bool bOk = rFileStatus.isValid(mask);
- CPPUNIT_ASSERT_MESSAGE( "test for isValid function: no fields specified", bOk );
+ CPPUNIT_ASSERT_MESSAGE("test for isValid function: no fields specified", bOk);
}
void check_FileStatus(FileStatus const& _aStatus)
{
- rtl::OString sStat;
+ OString sStat;
if (_aStatus.isValid(osl_FileStatus_Mask_Type))
sStat += "type ";
if (_aStatus.isValid(osl_FileStatus_Mask_Attributes))
@@ -1399,7 +1398,7 @@ namespace osl_FileStatus
void isValid_002()
{
- createTestFile( aTmpName6 );
+ createTestFile(aTmpName6);
sal_uInt32 mask_file = osl_FileStatus_Mask_Type |
osl_FileStatus_Mask_Attributes |
osl_FileStatus_Mask_CreationTime |
@@ -1409,14 +1408,14 @@ namespace osl_FileStatus
osl_FileStatus_Mask_FileName |
osl_FileStatus_Mask_FileURL;
- FileStatus rFileStatus( mask_file );
- DirectoryItem::get( aTmpName6, rItem_file );
- FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus );
+ FileStatus rFileStatus(mask_file);
+ DirectoryItem::get(aTmpName6, rItem_file);
+ osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus);
- CPPUNIT_ASSERT_EQUAL_MESSAGE( errorToStr(nError1).getStr(), nError1, FileBase::E_None );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), nError1, osl::FileBase::E_None);
check_FileStatus(rFileStatus);
- deleteTestFile( aTmpName6 );
+ deleteTestFile(aTmpName6);
}
@@ -1427,40 +1426,40 @@ namespace osl_FileStatus
void isValid_003()
{
-#if defined ( UNX )
+#if defined (UNX)
sal_Int32 fd;
- OUString aUStr_LnkFileSys( aTempDirectorySys ), aUStr_SrcFileSys( aTempDirectorySys );
+ OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys);
aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/tmpdir/link.file";
aUStr_SrcFileSys += aSlashURL + getCurrentPID() + "/tmpdir/tmpname";
- rtl::OString strLinkFileName;
- rtl::OString strSrcFileName;
- strLinkFileName = OUStringToOString( aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US );
- strSrcFileName = OUStringToOString( aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US );
+ OString strLinkFileName;
+ OString strSrcFileName;
+ strLinkFileName = OUStringToOString(aUStr_LnkFileSys, RTL_TEXTENCODING_ASCII_US);
+ strSrcFileName = OUStringToOString(aUStr_SrcFileSys, RTL_TEXTENCODING_ASCII_US);
// create a link file and link it to file "/tmp/PID/tmpdir/tmpname"
- fd = symlink( strSrcFileName.getStr(), strLinkFileName.getStr() );
- CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
+ fd = symlink(strSrcFileName.getStr(), strLinkFileName.getStr());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
// testDirectory is "/tmp/PID/tmpdir/"
- Directory testDirectory( aTmpName3 );
+ Directory testDirectory(aTmpName3);
testDirectory.open();
OUString aFileName ("link.file");
bool bOk = false;
while (true)
{
- osl::FileBase::RC nError1 = testDirectory.getNextItem( rItem_link, 4 );
+ osl::FileBase::RC nError1 = testDirectory.getNextItem(rItem_link, 4);
- if (FileBase::E_None == nError1)
+ if (osl::FileBase::E_None == nError1)
{
sal_uInt32 mask_link = osl_FileStatus_Mask_FileName | osl_FileStatus_Mask_LinkTargetURL;
- FileStatus rFileStatus( mask_link );
- rItem_link.getFileStatus( rFileStatus );
+ FileStatus rFileStatus(mask_link);
+ rItem_link.getFileStatus(rFileStatus);
- if ( compareFileName( rFileStatus.getFileName(), aFileName) )
+ if (compareFileName(rFileStatus.getFileName(), aFileName))
{
- if ( rFileStatus.isValid( osl_FileStatus_Mask_LinkTargetURL ) )
+ if (rFileStatus.isValid(osl_FileStatus_Mask_LinkTargetURL))
{
bOk = true;
break;
@@ -1473,8 +1472,8 @@ namespace osl_FileStatus
}
};
- fd = remove( strLinkFileName.getStr() );
- CPPUNIT_ASSERT_EQUAL( static_cast<sal_Int32>(0), fd );
+ fd = remove(strLinkFileName.getStr());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd);
CPPUNIT_ASSERT_MESSAGE("test for isValid function: link file, check for LinkTargetURL", bOk);
#endif
@@ -1483,25 +1482,25 @@ namespace osl_FileStatus
void isValid_004()
{
sal_uInt32 mask_file_all = osl_FileStatus_Mask_All;
- FileStatus rFileStatus_all( mask_file_all );
- FileBase::RC nError1 = rItem_file.getFileStatus( rFileStatus_all );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+ FileStatus rFileStatus_all(mask_file_all);
+ osl::FileBase::RC nError1 = rItem_file.getFileStatus(rFileStatus_all);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
check_FileStatus(rFileStatus_all);
sal_uInt32 mask_file_val = osl_FileStatus_Mask_Validate;
- FileStatus rFileStatus_val( mask_file_val );
- nError1 = rItem_file.getFileStatus( rFileStatus_val );
- CPPUNIT_ASSERT_EQUAL( nError1, FileBase::E_None );
+ FileStatus rFileStatus_val(mask_file_val);
+ nError1 = rItem_file.getFileStatus(rFileStatus_val);
+ CPPUNIT_ASSERT_EQUAL(nError1, osl::FileBase::E_None);
check_FileStatus(rFileStatus_val);
}
- CPPUNIT_TEST_SUITE( isValid );
- CPPUNIT_TEST( isValid_001 );
- CPPUNIT_TEST( isValid_002 );
- CPPUNIT_TEST( isValid_003 );
- CPPUNIT_TEST( isValid_004 );
+ CPPUNIT_TEST_SUITE(isValid);
+ CPPUNIT_TEST(isValid_001);
+ CPPUNIT_TEST(isValid_002);
+ CPPUNIT_TEST(isValid_003);
+ CPPUNIT_TEST(isValid_004);
CPPUNIT_TEST_SUITE_END();
};
@@ -1511,13 +1510,13 @@ namespace osl_FileStatus
class getFileType : public CppUnit::TestFixture
{
private:
- FileBase::RC nError1;
+ osl::FileBase::RC nError1;
- DirectoryItem m_aItem_1, m_aItem_2, m_aVolumeItem, m_aFifoItem;
- DirectoryItem m_aLinkItem, m_aSocketItem, m_aSpecialItem;
+ DirectoryItem m_aItem_1, m_aItem_2, m_aVolumeItem, m_aFifoItem;
+ DirectoryItem m_aLinkItem, m_aSocketItem, m_aSpecialItem;
public:
- getFileType() : nError1(FileBase::E_None) {}
+ getFileType() : nError1(osl::FileBase::E_None) {}
void setUp() override
{
@@ -1525,60 +1524,60 @@ namespace osl_FileStatus
// a tempdirectory: $TEMP/tmpdir/tmpdir.
// use $ROOT/staroffice as volume ---> use dev/fd as volume.
// and get their directory item.
- createTestDirectory( aTmpName3 );
- createTestFile( aTmpName3, aTmpName2 );
- createTestDirectory( aTmpName3, aTmpName1 );
+ createTestDirectory(aTmpName3);
+ createTestFile(aTmpName3, aTmpName2);
+ createTestDirectory(aTmpName3, aTmpName1);
- std::unique_ptr<Directory> xDir( new Directory( aTmpName3 ) );
+ std::unique_ptr<Directory> xDir(new Directory(aTmpName3));
nError1 = xDir->open();
- CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", nError1, FileBase::E_None );
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", nError1, osl::FileBase::E_None);
// getNextItem can not assure which item retrieved
- nError1 = xDir->getNextItem( m_aItem_1, 1 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE("get first item failed!", nError1, FileBase::E_None );
+ nError1 = xDir->getNextItem(m_aItem_1, 1);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("get first item failed!", nError1, osl::FileBase::E_None);
- nError1 = xDir->getNextItem( m_aItem_2 );
- CPPUNIT_ASSERT_EQUAL_MESSAGE("get second item failed!", nError1, FileBase::E_None );
+ nError1 = xDir->getNextItem(m_aItem_2);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("get second item failed!", nError1, osl::FileBase::E_None);
xDir->close();
// FIXME mindy: failed on my RH9,so removed temporaly
- // nError1 = DirectoryItem::get( aVolURL2, m_aVolumeItem );
- // CPPUNIT_ASSERT_MESSAGE("get volume item failed!", FileBase::E_None == nError1 );
+ // nError1 = DirectoryItem::get(aVolURL2, m_aVolumeItem);
+ // CPPUNIT_ASSERT_MESSAGE("get volume item failed!", osl::FileBase::E_None == nError1);
}
void tearDown() override
{
// remove all in $TEMP/tmpdir.
- deleteTestDirectory( aTmpName3, aTmpName1 );
- deleteTestFile( aTmpName3, aTmpName2 );
- deleteTestDirectory( aTmpName3 );
+ deleteTestDirectory(aTmpName3, aTmpName1);
+ deleteTestFile(aTmpName3, aTmpName2);
+ deleteTestDirectory(aTmpName3);
}
void getFileType_001()
{
- FileStatus rFileStatus( osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName );
- nError1 = m_aItem_1.getFileStatus( rFileStatus );
- CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", nError1, FileBase::E_None );
+ FileStatus rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName);
+ nError1 = m_aItem_1.getFileStatus(rFileStatus);
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", nError1, osl::FileBase::E_None);
check_FileType(rFileStatus);
}
- void check_FileType(osl::FileStatus const& _rFileStatus )
+ void check_FileType(osl::FileStatus const& _rFileStatus)
{
- if ( _rFileStatus.isValid(osl_FileStatus_Mask_FileName))
+ if (_rFileStatus.isValid(osl_FileStatus_Mask_FileName))
{
- rtl::OUString suFilename = _rFileStatus.getFileName();
+ OUString suFilename = _rFileStatus.getFileName();
- if ( _rFileStatus.isValid(osl_FileStatus_Mask_Type))
+ if (_rFileStatus.isValid(osl_FileStatus_Mask_Type))
{
osl::FileStatus::Type eType = _rFileStatus.getFileType();
bool bOK = false;
- if ( compareFileName( suFilename, aTmpName2) )
- bOK = ( eType == osl::FileStatus::Regular );
+ if (compareFileName(suFilename, aTmpName2))
+ bOK = (eType == osl::FileStatus::Regular);
- if ( compareFileName( suFilename, aTmpName1) )
- bOK = ( eType == FileStatus::Directory );
+ if (compareFileName(suFilename, aTmpName1))
+ bOK = (eType == FileStatus::Directory);
- CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: ", bOK );
+ CPPUNIT_ASSERT_MESSAGE("test for getFileType function: ", bOK);
}
}
// LLA: it's not a bug, if a FileStatus not exist, so no else
@@ -1586,10 +1585,10 @@ namespace osl_FileStatus
void getFileType_002()
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list