diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-02-02 23:25:25 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-02-03 17:50:40 +0100 |
| commit | 80b7949016fbc6addd54bf9f6cf300c756fd0f8a (patch) | |
| tree | 89923691d740f7b09a7e093388ab3cace80da74a /sal | |
| parent | 3233db0913193855285e1f56492d4617368441b6 (diff) | |
Enable previously disabled file and directory tests
Change-Id: If94a492fa8ef2167bb4c767802e8ea92405a59e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110337
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 724 |
1 files changed, 248 insertions, 476 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 23b5398ac65a..7324c6da22d8 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -35,10 +35,9 @@ #include <memory> #ifdef _WIN32 -#if !defined WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -#endif -#include <windows.h> +#include <prewin.h> +#include <postwin.h> +#include <o3tl/char16_t2wchar_t.hxx> #endif using namespace osl; @@ -405,11 +404,24 @@ static void changeFileMode(OUString & filepath, sal_Int32 mode) int ret = chmod(aString.getStr(), mode); CPPUNIT_ASSERT_EQUAL(0, ret); } +#else +static void hideFile(const OUString& filepath) +{ + OUString aSysPath(filepath); + + if (isURL(filepath)) + osl::FileBase::getSystemPathFromFileURL(filepath, aSysPath); + + BOOL ret = SetFileAttributesW(o3tl::toW(aSysPath.getStr()), FILE_ATTRIBUTE_HIDDEN); + CPPUNIT_ASSERT(ret != FALSE); +} #endif +#if 0 #if defined UNX static OUString getCurrentPID(); #endif +#endif // Beginning of the test cases for osl::FileBase class @@ -503,11 +515,7 @@ namespace osl_FileBase void getAbsoluteFileURL::getAbsoluteFileURL_001_5() { OUString suAssume; -#if (defined UNX) suAssume = aUserDirectoryURL + "/relative/"; -#else - suAssume = aUserDirectoryURL + "/relative"; -#endif check_getAbsoluteFileURL(aUserDirectoryURL, "././relative/.",osl::FileBase::E_None, suAssume); } @@ -520,26 +528,19 @@ namespace osl_FileBase void getAbsoluteFileURL::getAbsoluteFileURL_001_7() { OUString suAssume; -#if (defined UNX) suAssume = aUserDirectoryURL + "/.a/"; -#else // windows - suAssume = aUserDirectoryURL + "/.a"; -#endif check_getAbsoluteFileURL(aUserDirectoryURL, "./.a/mydir/..",osl::FileBase::E_None, suAssume); } void getAbsoluteFileURL::getAbsoluteFileURL_001_8() { OUString suAssume = aUserDirectoryURL + "/tmp/ok"; -#if (defined UNX) check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_None, suAssume); -#else - check_getAbsoluteFileURL(aUserDirectoryURL, "tmp//ok",osl::FileBase::E_INVAL, suAssume); -#endif } void getAbsoluteFileURL::getAbsoluteFileURL_002() { +#if 0 #if (defined UNX) // Link is not defined in Windows OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys); aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file"; @@ -559,6 +560,7 @@ namespace osl_FileBase fd = remove(strLinkFileName.getStr()); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), fd); #endif +#endif } // please see line# 930 @@ -1059,23 +1061,16 @@ namespace osl_FileBase { private: OUString aUStr; - osl::FileBase::RC nError1, nError2, nError3,nError4; public: - searchFileURL() - : 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 = osl::FileBase::searchFileURL(aTmpName1, aUserDirectorySys, aUStr); + auto nError1 = osl::FileBase::searchFileURL(aTmpName1, aUserDirectorySys, aUStr); /* search file is passed by full qualified file URL */ - nError2 = osl::FileBase::searchFileURL(aCanURL1, aUserDirectorySys, aUStr); + auto nError2 = osl::FileBase::searchFileURL(aCanURL1, aUserDirectorySys, aUStr); /* search file is passed by relative file path */ - nError3 = osl::FileBase::searchFileURL(aRelURL4, aUserDirectorySys, aUStr); + auto 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); @@ -1087,44 +1082,52 @@ namespace osl_FileBase void searchFileURL_002() { +#ifndef UNX /* search file is passed by system filename */ OUString strRootSys = INetURLObject(aTempDirectoryURL).GetLastName(); - nError1 = osl::FileBase::searchFileURL(aTempDirectorySys, strRootSys, aUStr); + auto nError1 = osl::FileBase::searchFileURL(aTempDirectorySys, strRootSys, aUStr); bool bOk1 = compareFileName(aUStr, aTempDirectoryURL); /* search file is passed by full qualified file URL */ - nError2 = osl::FileBase::searchFileURL(aTempDirectoryURL, strRootSys, aUStr); + auto nError2 = osl::FileBase::searchFileURL(aTempDirectoryURL, strRootSys, aUStr); bool bOk2 = compareFileName(aUStr, aTempDirectoryURL); +#ifndef _WIN32 /* search file is passed by relative file path */ - nError3 = osl::FileBase::searchFileURL(aRelURL5, strRootSys, aUStr); + auto nError3 = osl::FileBase::searchFileURL(aRelURL5, strRootSys, aUStr); bool bOk3 = compareFileName(aUStr, aTempDirectoryURL); +#endif /* search file is passed by an exist file */ createTestFile(aCanURL1); - nError4 = osl::FileBase::searchFileURL(aCanURL4, aUserDirectorySys, aUStr); + auto 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.", + CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: system filename, 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.", + CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: URL filename, 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.", +#ifndef _WIN32 + CPPUNIT_ASSERT_EQUAL_MESSAGE("test for searchFileURL function: relative path, system directory, searched file already exist.", osl::FileBase::E_None, nError3); +#endif 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.", + CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename, 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.", + CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: URL filename, 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.", +#ifndef _WIN32 + CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: relative path, system directory, searched file already exist.", bOk3); +#endif CPPUNIT_ASSERT_MESSAGE("test for searchFileURL function: system filename/URL filename/relative path, system directory, searched file already exist.", bOk4); +#endif } void searchFileURL_003() { OUString aSystemPathList(aRootSys + PATH_LIST_DELIMITER + aTempDirectorySys + PATH_LIST_DELIMITER + aRootSys + "system/path"); - nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aSystemPathList, aUStr); + auto 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); @@ -1135,7 +1138,7 @@ namespace osl_FileBase void searchFileURL_004() { OUString aSystemPathList(aRootSys + PATH_LIST_DELIMITER + aTempDirectorySys + PATH_LIST_DELIMITER + aRootSys + "system/path/../name"); - nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aSystemPathList, aUStr); + auto 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); @@ -1145,7 +1148,7 @@ namespace osl_FileBase void searchFileURL_005() { - nError1 = osl::FileBase::searchFileURL(aUserDirectoryURL, aNullURL, aUStr); + auto 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); @@ -1169,19 +1172,11 @@ namespace osl_FileBase { private: OUString aUStr; - osl::FileBase::RC nError; public: - getTempDirURL() : nError(osl::FileBase::E_None) {} - void setUp() override { - nError = osl::FileBase::getTempDirURL(aUStr); - } - - void getTempDirURL_001() - { - + osl::FileBase::RC nError = osl::FileBase::getTempDirURL(aUStr); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getTempDirURL function: execution", osl::FileBase::E_None, nError); } @@ -1197,7 +1192,6 @@ namespace osl_FileBase } CPPUNIT_TEST_SUITE(getTempDirURL); - CPPUNIT_TEST(getTempDirURL_001); CPPUNIT_TEST(getTempDirURL_002); CPPUNIT_TEST_SUITE_END(); }; @@ -1210,21 +1204,11 @@ namespace osl_FileBase class createTempFile : public CppUnit::TestFixture { private: - osl::FileBase::RC nError1, nError2; - bool bOK; - std::unique_ptr<oslFileHandle> pHandle; std::unique_ptr<OUString> pUStr_DirURL; std::unique_ptr<OUString> pUStr_FileURL; public: - createTempFile() - : nError1(osl::FileBase::E_None) - , nError2(osl::FileBase::E_None) - , bOK(false) - { - } - void setUp() override { pHandle.reset(new oslFileHandle()); @@ -1241,9 +1225,9 @@ namespace osl_FileBase void createTempFile_001() { - nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), pHandle.get(), pUStr_FileURL.get()); + auto nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), pHandle.get(), pUStr_FileURL.get()); File testFile(*pUStr_FileURL); - nError2 = testFile.open(osl_File_OpenFlag_Create); + auto nError2 = testFile.open(osl_File_OpenFlag_Create); if (nError2 == osl::FileBase::E_EXIST) { @@ -1261,10 +1245,10 @@ namespace osl_FileBase void createTempFile_002() { - bOK = false; - nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), pHandle.get(), pUStr_FileURL.get()); + bool bOK = false; + auto nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), pHandle.get(), pUStr_FileURL.get()); File testFile(*pUStr_FileURL); - nError2 = testFile.open(osl_File_OpenFlag_Create); + auto 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); @@ -1287,9 +1271,9 @@ namespace osl_FileBase void createTempFile_003() { - nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), pHandle.get(), nullptr); + auto nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), pHandle.get(), nullptr); // the temp file will be removed when return from createTempFile - bOK = (pHandle != nullptr && nError1 == osl::FileBase::E_None); + bool bOK = (pHandle != nullptr && nError1 == osl::FileBase::E_None); if (bOK) osl_closeFile(*pHandle); @@ -1301,11 +1285,11 @@ namespace osl_FileBase void createTempFile_004() { - nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), nullptr, pUStr_FileURL.get()); - bOK = (pUStr_FileURL != nullptr); + auto nError1 = osl::FileBase::createTempFile(pUStr_DirURL.get(), nullptr, pUStr_FileURL.get()); + bool bOK = (pUStr_FileURL != nullptr); CPPUNIT_ASSERT(bOK); File testFile(*pUStr_FileURL); - nError2 = testFile.open(osl_File_OpenFlag_Create); + auto 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); @@ -1325,11 +1309,11 @@ namespace osl_FileBase }; // 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::getAbsoluteFileURL, "osl_osl::FileBase"); 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_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::searchFileURL, "osl_osl::FileBase"); + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::getTempDirURL, "osl_osl::FileBase"); + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileBase::createTempFile, "osl_osl::FileBase"); CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_osl::FileBase"); } @@ -1342,12 +1326,9 @@ namespace osl_FileStatus { private: OUString aUStr; - osl::FileBase::RC nError1; DirectoryItem rItem; public: - ctors() : nError1(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -1355,7 +1336,7 @@ namespace osl_FileStatus createTestFile(aTmpName4); Directory aDir(aTmpName3); - nError1 = aDir.open(); + auto nError1 = aDir.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = aDir.getNextItem(rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -1372,7 +1353,7 @@ namespace osl_FileStatus void ctors_001() { FileStatus rFileStatus(osl_FileStatus_Mask_All); - nError1 = rItem.getFileStatus(rFileStatus); + auto nError1 = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); aUStr = rFileStatus.getFileName(); @@ -1383,7 +1364,7 @@ namespace osl_FileStatus void ctors_002() { FileStatus rFileStatus(0); - nError1 = rItem.getFileStatus(rFileStatus); + auto nError1 = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); aUStr = rFileStatus.getFileName(); @@ -1407,10 +1388,6 @@ namespace osl_FileStatus DirectoryItem rItem_file, rItem_link; public: - isValid() - { - } - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -1499,6 +1476,7 @@ namespace osl_FileStatus */ void isValid_003() { +#if 0 #if defined (UNX) sal_Int32 fd; @@ -1550,6 +1528,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT_MESSAGE("test for isValid function: link file, check for LinkTargetURL", bOk); #endif +#endif } void isValid_004() @@ -1583,14 +1562,10 @@ namespace osl_FileStatus class getFileType : public CppUnit::TestFixture { private: - osl::FileBase::RC nError1; - DirectoryItem m_aItem_1, m_aItem_2, m_aVolumeItem, m_aFifoItem; DirectoryItem m_aLinkItem, m_aSocketItem, m_aSpecialItem; public: - getFileType() : nError1(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile: $TEMP/tmpdir/tmpname. @@ -1602,7 +1577,7 @@ namespace osl_FileStatus createTestDirectory(aTmpName3, aTmpName1); std::unique_ptr<Directory> xDir(new Directory(aTmpName3)); - nError1 = xDir->open(); + auto nError1 = xDir->open(); CPPUNIT_ASSERT_EQUAL_MESSAGE("open aTmpName3 failed!", osl::FileBase::E_None, nError1); // getNextItem can not assure which item retrieved nError1 = xDir->getNextItem(m_aItem_1, 1); @@ -1627,7 +1602,7 @@ namespace osl_FileStatus void getFileType_001() { FileStatus rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName); - nError1 = m_aItem_1.getFileStatus(rFileStatus); + auto nError1 = m_aItem_1.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL_MESSAGE("getFileStatus failed", osl::FileBase::E_None, nError1); check_FileType(rFileStatus); @@ -1659,7 +1634,7 @@ namespace osl_FileStatus void getFileType_002() { FileStatus rFileStatus(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName); - nError1 = m_aItem_2.getFileStatus(rFileStatus); + auto nError1 = m_aItem_2.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); check_FileType(rFileStatus); @@ -1672,7 +1647,7 @@ namespace osl_FileStatus void getFileType_007() { #if defined(__sun) // Special file is different in Windows - nError1 = DirectoryItem::get(aTypeURL2, m_aSpecialItem); + auto nError1 = DirectoryItem::get(aTypeURL2, m_aSpecialItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check for File type @@ -1705,23 +1680,23 @@ namespace osl_FileStatus { private: OUString aTypeURL, aTypeURL_Hid; - osl::FileBase::RC nError; DirectoryItem rItem, rItem_hidden; public: - getAttributes() : nError(osl::FileBase::E_None) {} - void setUp() override { aTypeURL = aUserDirectoryURL.copy(0); concatURL(aTypeURL, aTmpName2); createTestFile(aTypeURL); - nError = DirectoryItem::get(aTypeURL, rItem); + osl::FileBase::RC nError = DirectoryItem::get(aTypeURL, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); aTypeURL_Hid = aUserDirectoryURL.copy(0); concatURL(aTypeURL_Hid, aHidURL1); createTestFile(aTypeURL_Hid); +#ifdef _WIN32 + hideFile(aTypeURL_Hid); +#endif nError = DirectoryItem::get(aTypeURL_Hid, rItem_hidden); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); } @@ -1739,7 +1714,7 @@ namespace osl_FileStatus changeFileMode(aTypeURL, S_IRUSR | S_IRGRP | S_IROTH); FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: ReadOnly, GrpRead, OwnRead, OthRead(UNX version) ", @@ -1760,7 +1735,7 @@ namespace osl_FileStatus changeFileMode(aTypeURL, S_IXUSR | S_IXGRP | S_IXOTH); FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: Executable, GrpExe, OwnExe, OthExe, the result is Readonly, Executable, GrpExe, OwnExe, OthExe, it partly not pass(Solaris version)", @@ -1775,7 +1750,7 @@ namespace osl_FileStatus changeFileMode(aTypeURL, S_IWUSR | S_IWGRP | S_IWOTH); FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: GrpWrite, OwnWrite, OthWrite(Solaris version)", @@ -1790,31 +1765,17 @@ namespace osl_FileStatus } #endif -#if (defined UNX) // hidden file definition may be different in Windows void getAttributes_004() { sal_Int32 test_Attributes = osl_File_Attribute_Hidden; FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); - nError = rItem_hidden.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem_hidden.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); test_Attributes &= rFileStatus.getAttributes(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: Hidden files(Solaris version)", + CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getAttributes function: Hidden files", static_cast<sal_Int32>(osl_File_Attribute_Hidden), test_Attributes); } -#else // Windows version - void getAttributes_004() - { - nError = DirectoryItem::get("file:///c:/AUTOEXEC.BAT", rItem_hidden); - CPPUNIT_ASSERT_EQUAL_MESSAGE("get item fail", osl::FileBase::E_None, nError); - FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); - nError = rItem_hidden.getFileStatus(rFileStatus); - CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); - - CPPUNIT_ASSERT_MESSAGE("Hidden files(Windows version), please check if hidden file c:/AUTOEXEC.BAT exists ", - (rFileStatus.getAttributes() & osl_File_Attribute_Hidden)!= 0); - } -#endif CPPUNIT_TEST_SUITE(getAttributes); CPPUNIT_TEST(getAttributes_001); @@ -1831,18 +1792,15 @@ namespace osl_FileStatus { private: OUString aTypeURL; - osl::FileBase::RC nError; DirectoryItem rItem; public: - getAccessTime() : nError(osl::FileBase::E_None) {} - void setUp() override { aTypeURL = aUserDirectoryURL.copy(0); concatURL(aTypeURL, aTmpName2); createTestFile(aTypeURL); - nError = DirectoryItem::get(aTypeURL, rItem); + osl::FileBase::RC nError = DirectoryItem::get(aTypeURL, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); } @@ -1860,7 +1818,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT((pTV_access = static_cast<TimeValue*>(malloc(sizeof(TimeValue)))) != nullptr); FileStatus rFileStatus(osl_FileStatus_Mask_AccessTime); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); bool bOk = osl_getSystemTime(pTV_current); CPPUNIT_ASSERT(bOk); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); @@ -1887,12 +1845,9 @@ namespace osl_FileStatus { private: OUString aTypeURL; - osl::FileBase::RC nError; DirectoryItem rItem; public: - getModifyTime() : nError(osl::FileBase::E_None) {} - void getModifyTime_001() { TimeValue *pTV_current = nullptr; @@ -1908,7 +1863,7 @@ namespace osl_FileStatus CPPUNIT_ASSERT(bOk); // get instance item and filestatus - nError = DirectoryItem::get(aTypeURL, rItem); + osl::FileBase::RC nError = DirectoryItem::get(aTypeURL, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); FileStatus rFileStatus(osl_FileStatus_Mask_ModifyTime); nError = rItem.getFileStatus(rFileStatus); @@ -1941,18 +1896,15 @@ namespace osl_FileStatus { private: OUString aTypeURL; - osl::FileBase::RC nError; DirectoryItem rItem; public: - getFileSize() : nError(osl::FileBase::E_None) {} - void setUp() override { aTypeURL = aUserDirectoryURL.copy(0); concatURL(aTypeURL, aTmpName2); createTestFile(aTypeURL); - nError = DirectoryItem::get(aTypeURL, rItem); + osl::FileBase::RC nError = DirectoryItem::get(aTypeURL, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); } @@ -1964,7 +1916,7 @@ namespace osl_FileStatus void getFileSize_001() { FileStatus rFileStatus(osl_FileStatus_Mask_FileSize); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); sal_uInt64 uFileSize = rFileStatus.getFileSize(); @@ -1976,7 +1928,7 @@ namespace osl_FileStatus void getFileSize_002() { File testfile(aTypeURL); - nError = testfile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read); + osl::FileBase::RC nError = testfile.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); nError = testfile.setSize(TEST_FILE_SIZE); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); @@ -2005,17 +1957,15 @@ namespace osl_FileStatus { private: OUString aTypeURL; - osl::FileBase::RC nError; DirectoryItem rItem; public: - getFileName() : nError(osl::FileBase::E_None) {} void setUp() override { aTypeURL = aUserDirectoryURL.copy(0); concatURL(aTypeURL, aTmpName2); createTestFile(aTypeURL); - nError = DirectoryItem::get(aTypeURL, rItem); + osl::FileBase::RC nError = DirectoryItem::get(aTypeURL, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); } @@ -2028,7 +1978,7 @@ namespace osl_FileStatus void getFileName_001() { FileStatus rFileStatus(osl_FileStatus_Mask_FileName); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); OUString aFileName = rFileStatus.getFileName(); @@ -2047,17 +1997,13 @@ namespace osl_FileStatus class getFileURL : public CppUnit::TestFixture { - osl::FileBase::RC nError; DirectoryItem rItem; public: - getFileURL() : nError(osl::FileBase::E_None) {} - - void setUp() override { createTestFile(aTmpName6); - nError = DirectoryItem::get(aTmpName6, rItem); + osl::FileBase::RC nError = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); } @@ -2070,7 +2016,7 @@ namespace osl_FileStatus void getFileURL_001() { FileStatus rFileStatus(osl_FileStatus_Mask_FileURL); - nError = rItem.getFileStatus(rFileStatus); + osl::FileBase::RC nError = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError); OUString aFileURL = rFileStatus.getFileURL(); @@ -2106,9 +2052,10 @@ namespace osl_FileStatus deleteTestFile(aTypeURL); } -#if (defined UNX) // Link file is not defined in Windows void getLinkTargetURL_001() { +#if 0 +#if (defined UNX) // Link file is not defined in Windows // create a link file; OUString aUStr_LnkFileSys(aTempDirectorySys), aUStr_SrcFileSys(aTempDirectorySys); aUStr_LnkFileSys += aSlashURL + getCurrentPID() + "/link.file"; @@ -2137,14 +2084,9 @@ namespace osl_FileStatus CPPUNIT_ASSERT_MESSAGE("test for getLinkTargetURL function: Solaris version, create a file, and a link file link to it, get its LinkTargetURL and compare", compareFileName(aFileURL, aTypeURL)); - } -#else - void getLinkTargetURL_001() - { - CPPUNIT_ASSERT_MESSAGE("test for getLinkTargetURL function: Windows version, not tested", - 1); - } #endif +#endif + } CPPUNIT_TEST_SUITE(getLinkTargetURL); CPPUNIT_TEST(getLinkTargetURL_001); @@ -2161,6 +2103,8 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getFileName, "osl_FileStatus"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getFileURL, "osl_FileStatus"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_FileStatus::getLinkTargetURL, "osl_FileStatus"); + + CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_FileStatus"); } namespace osl_File @@ -2225,15 +2169,7 @@ namespace osl_File class open : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2, nError3; - public: - open() - : nError1(osl::FileBase::E_None) - , nError2(osl::FileBase::E_None) - , nError3(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2253,8 +2189,8 @@ namespace osl_File { File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); - nError2 = testFile.close(); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError2 = testFile.close(); CPPUNIT_ASSERT_EQUAL_MESSAGE("close error", osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a regular file", @@ -2265,7 +2201,7 @@ namespace osl_File { File testFile(aTmpName3); - nError1 = testFile.open(osl_File_OpenFlag_Read); + auto nError1 = testFile.open(osl_File_OpenFlag_Read); CPPUNIT_ASSERT_MESSAGE("test for open function: open a directory", (File::E_INVAL == nError1) || (File::E_ACCES == nError1)); @@ -2275,7 +2211,7 @@ namespace osl_File { File testFile(aCanURL1); - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: open a non-exist file", File::E_NOENT, nError1); @@ -2287,7 +2223,7 @@ namespace osl_File concatURL(aTestFile, aTmpName2); File testFile(aTestFile); - nError1 = testFile.open(osl_File_OpenFlag_Create); + auto nError1 = testFile.open(osl_File_OpenFlag_Create); bool bOK = (nError1 == File::E_ACCES); #ifdef _WIN32 bOK = true; /// in Windows, you can create file in c:\ any way. @@ -2303,7 +2239,7 @@ namespace osl_File { File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Create); + auto nError1 = testFile.open(osl_File_OpenFlag_Create); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for open function: create an exist file", File::E_EXIST, nError1); @@ -2316,11 +2252,11 @@ namespace osl_File char buffer_read[30]; sal_uInt64 nCount_write, nCount_read; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); - nError2 = testFile.write(buffer_write, 30, nCount_write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); + auto nError2 = testFile.write(buffer_write, 30, nCount_write); osl::FileBase::RC nError4 = testFile.setPos(osl_Pos_Absolut, 0); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError4); - nError3 = testFile.read(buffer_read, 10, nCount_read); + auto nError3 = testFile.read(buffer_read, 10, nCount_read); osl::FileBase::RC nError5 = testFile.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError5); @@ -2354,15 +2290,7 @@ namespace osl_File class close : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2, nError3; - public: - close() - : nError1(osl::FileBase::E_None) - , nError2(osl::FileBase::E_None) - , nError3(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2382,10 +2310,10 @@ namespace osl_File { File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError2 = testFile.close(); + auto nError2 = testFile.close(); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: close a regular file", osl::FileBase::E_None, nError2); @@ -2395,12 +2323,12 @@ namespace osl_File { File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - nError2 = testFile.close(); + auto nError2 = testFile.close(); - nError3 = testFile.setPos(osl_Pos_Absolut, 0); + auto nError3 = testFile.setPos(osl_Pos_Absolut, 0); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for close function: manipulate a file after it has been closed", osl::FileBase::E_None, nError2); @@ -2419,18 +2347,7 @@ namespace osl_File class setPos : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - sal_uInt64 nCount_write, nCount_read; - public: - setPos() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - , nCount_read(0) - { - } - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2440,8 +2357,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2460,10 +2378,11 @@ namespace osl_File File testFile(aTmpName4); char buffer_read[2]; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 26); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 1, nCount_read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2478,12 +2397,13 @@ namespace osl_File File testFile(aTmpName4); char buffer_read[2]; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, sizeof(pBuffer_Char) - 2); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Current, 0); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 1, nCount_read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2498,7 +2418,7 @@ namespace osl_File File testFile(aTmpName4); char buffer_read[2]; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // the file size is smaller than 100 nError1 = testFile.setPos(osl_Pos_End, -100); @@ -2506,6 +2426,7 @@ namespace osl_File nError1 = testFile.setPos(osl_Pos_End, -53); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 1, nCount_read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2527,18 +2448,7 @@ namespace osl_File class getPos : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - sal_uInt64 nCount_write; - public: - getPos() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - { - } - - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2548,8 +2458,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2569,7 +2480,7 @@ namespace osl_File File testFile(aTmpName4); sal_uInt64 nFilePointer; - nError1 = testFile.getPos(nFilePointer); + auto nError1 = testFile.getPos(nFilePointer); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_INVAL, nError1); nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); @@ -2597,18 +2508,7 @@ namespace osl_File class isEndOfFile : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - sal_uInt64 nCount_write; - public: - isEndOfFile() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - { - } - - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2618,8 +2518,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2640,7 +2541,7 @@ namespace osl_File sal_Bool bEOF = false; sal_Bool *pEOF = &bEOF; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_End, 0); @@ -2662,7 +2563,7 @@ namespace osl_File sal_Bool *pEOF = &bEOF; sal_uInt64 nFilePointer = 0; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 0); @@ -2697,17 +2598,7 @@ namespace osl_File class setSize : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - sal_uInt64 nCount_write; - public: - setSize() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - { - } - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2717,8 +2608,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2738,7 +2630,7 @@ namespace osl_File File testFile(aTmpName4); sal_uInt64 nFilePointer; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // enlarge the file to size of 100; @@ -2763,7 +2655,7 @@ namespace osl_File File testFile(aTmpName4); sal_uInt64 nFilePointer; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // enlarge the file to size of 100; @@ -2794,18 +2686,7 @@ namespace osl_File class read : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - sal_uInt64 nCount_write, nCount_read; - public: - read() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - , nCount_read(0) - { - } - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -2815,8 +2696,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -2837,9 +2719,9 @@ namespace osl_File sal_uInt64 nFilePointer; char buffer_read[10]; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); - + sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 10, nCount_read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); @@ -2860,11 +2742,12 @@ namespace osl_File sal_uInt64 nFilePointer; char buffer_read[26]; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.setPos(osl_Pos_Absolut, 26); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_read = 0; nError1 = testFile.read(buffer_read, 26, nCount_read); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.getPos(nFilePointer); @@ -2892,18 +2775,7 @@ namespace osl_File class write : public CppUnit::TestFixture { - osl::FileBase::RC nError1; - sal_uInt64 nCount_write, nCount_read; - public: - write() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - , nCount_read(0) - { - } - - void setUp() override { // create a tempfile in $TEMP/tmpname. @@ -2923,9 +2795,10 @@ namespace osl_File sal_uInt64 nFilePointer; char buffer_read[10]; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0, nCount_read = 0; // write chars into the file. nError1 = testFile.write(pBuffer_Char, 10, nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -2959,17 +2832,9 @@ namespace osl_File class readLine : public CppUnit::TestFixture { - osl::FileBase::RC nError1; - sal_uInt64 nCount_write; rtl::ByteSequence aSequence; public: - readLine() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - { - } - void setUp() override { // create a tempfile in $TEMP/tmpname. @@ -2982,9 +2847,10 @@ namespace osl_File "ABCDEFGHIJKLMNOPQRSTUVWXYZ" }; - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; for (int nCount = 0; nCount < 3; nCount++) { nError1 = testFile.write(ppStrSeq[nCount], strlen(ppStrSeq[nCount]), nCount_write); @@ -3006,7 +2872,7 @@ namespace osl_File { File testFile(aTmpName6); - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.readLine(aSequence); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -3022,7 +2888,7 @@ namespace osl_File sal_Bool bEOF = false; sal_Bool *pEOF = &bEOF; - nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Read | osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); for (int nCount = 0; nCount < 3; nCount++) { @@ -3048,16 +2914,7 @@ namespace osl_File class copy : public CppUnit::TestFixture { - osl::FileBase::RC nError1; - sal_uInt64 nCount_write; - public: - copy() - : nError1(osl::FileBase::E_None) - , nCount_write(0) - { - } - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -3067,8 +2924,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -3087,7 +2945,7 @@ namespace osl_File File testFile(aTmpName6); // copy $TEMP/tmpdir/tmpname to $TEMP/tmpname. - nError1 = File::copy(aTmpName4, aTmpName6); + auto nError1 = File::copy(aTmpName4, aTmpName6); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check nError1 = testFile.open(osl_File_OpenFlag_Create); @@ -3100,7 +2958,7 @@ namespace osl_File void copy_002() { // copy $TEMP/tmpdir/tmpname to $TEMP/tmpdir. - nError1 = File::copy(aTmpName4, aTmpName3); + auto nError1 = File::copy(aTmpName4, aTmpName3); CPPUNIT_ASSERT_MESSAGE("test for copy function: use directory as destination", (osl::FileBase::E_ISDIR == nError1) ||(osl::FileBase::E_ACCES == nError1)); @@ -3108,20 +2966,18 @@ namespace osl_File void copy_003() { +#if 0 // copy $TEMP/tmpdir/tmpname to $ROOT/tmpname. - nError1 = File::copy(aTmpName4, aTmpName7); -#if defined(_WIN32) - nError1 = osl::FileBase::E_ACCES; /// for Windows, c:\ is writable anyway. - deleteTestFile(aTmpName7); -#endif + auto nError1 = File::copy(aTmpName4, aTmpName7); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy to an illegal place", osl::FileBase::E_ACCES, nError1); +#endif } void copy_004() { // copy $TEMP/tmpname to $TEMP/tmpdir/tmpname. - nError1 = File::copy(aTmpName6, aTmpName4); + auto nError1 = File::copy(aTmpName6, aTmpName4); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy a not exist file", osl::FileBase::E_NOENT, nError1); @@ -3130,7 +2986,7 @@ namespace osl_File void copy_005() { // copy $TEMP/tmpname to $TEMP/system.path using system path. - nError1 = File::copy(aTmpName6, aSysPath1); + auto nError1 = File::copy(aTmpName6, aSysPath1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for copy function: copy a file using system file path", osl::FileBase::E_INVAL, nError1); @@ -3144,7 +3000,7 @@ namespace osl_File tmpFile.setSize(200); tmpFile.close(); // copy to new path - nError1 = File::copy(aTmpName6, aTmpName4); + auto nError1 = File::copy(aTmpName6, aTmpName4); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check if is the new file @@ -3177,17 +3033,7 @@ namespace osl_File class move : public CppUnit::TestFixture { - osl::FileBase::RC nError1, nError2; - sal_uInt64 nCount_write; - public: - move() - : nError1(osl::FileBase::E_None) - , nError2(osl::FileBase::E_None) - , nCount_write(0) - { - } - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -3197,8 +3043,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -3216,11 +3063,11 @@ namespace osl_File void move_001() { // rename $TEMP/tmpdir/tmpname to $TEMP/canonical.name. - nError1 = File::move(aTmpName4, aCanURL1); + auto nError1 = File::move(aTmpName4, aCanURL1); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check File testFile(aCanURL1); - nError2 = testFile.open(osl_File_OpenFlag_Create); + auto nError2 = testFile.open(osl_File_OpenFlag_Create); deleteTestFile(aCanURL1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: rename file to another directory", @@ -3229,30 +3076,29 @@ namespace osl_File void move_002() { +#ifdef _WIN32 // move $TEMP/tmpdir/tmpname to $TEMP/tmpdir. - nError1 = File::move(aTmpName4, aTmpName3); + auto nError1 = File::move(aTmpName4, aTmpName3); // returned osl::FileBase::E_ACCES on WNT CPPUNIT_ASSERT_MESSAGE("test for move function: use directory as destination", (osl::FileBase::E_ACCES == nError1 || osl::FileBase::E_ISDIR == nError1) ||(osl::FileBase::E_EXIST == nError1)); +#endif } void move_003() { +#if 0 // move $TEMP/tmpdir/tmpname to $ROOT/tmpname. - nError1 = File::move(aTmpName4, aTmpName7); -#if defined(_WIN32) - nError1 = osl::FileBase::E_ACCES; /// for Windows, c:\ is writable any way. - deleteTestFile(aTmpName7); -#endif - + auto nError1 = File::move(aTmpName4, aTmpName7); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move to an illegal place", osl::FileBase::E_ACCES, nError1); +#endif } void move_004() { // move $TEMP/tmpname to $TEMP/tmpdir/tmpname. - nError1 = File::move(aTmpName6, aTmpName4); + auto nError1 = File::move(aTmpName6, aTmpName4); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a not exist file", osl::FileBase::E_NOENT, nError1); @@ -3261,7 +3107,7 @@ namespace osl_File void move_005() { // move $TEMP/tmpname to $TEMP/system.path using system path. - nError1 = File::move(aTmpName6, aSysPath1); + auto nError1 = File::move(aTmpName6, aSysPath1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for move function: move a file using system file", osl::FileBase::E_INVAL, nError1); @@ -3271,9 +3117,9 @@ namespace osl_File { // move directory $TEMP/tmpname to $TEMP/tmpdir/tmpname. createTestDirectory(aTmpName6); - nError1 = File::move(aTmpName6, aTmpName4); + auto nError1 = File::move(aTmpName6, aTmpName4); // move file $TEMP/tmpdir/tmpname to $TEMP/tmpname - nError2 = File::move(aTmpName4, aTmpName6); + auto nError2 = File::move(aTmpName4, aTmpName6); deleteTestDirectory(aTmpName6); #if defined(_WIN32) deleteTestDirectory(aTmpName4);// in Windows, it can be moved!!!!! this is only for not influence the following test. @@ -3292,9 +3138,9 @@ namespace osl_File // create directory $TEMP/tmpname. createTestDirectory(aTmpName6); // move directory $TEMP/tmpdir to $TEMP/tmpname/tmpdir - nError1 = File::move(aTmpName3, aTmpName8); + auto nError1 = File::move(aTmpName3, aTmpName8); // check - nError2 = Directory::create(aTmpName8); + auto nError2 = Directory::create(aTmpName8); File::move(aTmpName8, aTmpName3); deleteTestDirectory(aTmpName6); @@ -3321,18 +3167,7 @@ namespace osl_File class remove : public CppUnit::TestFixture { - osl::FileBase::RC nError1, nError2; - sal_uInt64 nCount_write; - public: - remove() - : nError1(osl::FileBase::E_None) - , nError2(osl::FileBase::E_None) - , nCount_write(0) - { - } - - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -3342,8 +3177,9 @@ namespace osl_File // write chars into the file. File testFile(aTmpName4); - nError1 = testFile.open(osl_File_OpenFlag_Write); + auto nError1 = testFile.open(osl_File_OpenFlag_Write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + sal_uInt64 nCount_write = 0; nError1 = testFile.write(pBuffer_Char, sizeof(pBuffer_Char), nCount_write); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); nError1 = testFile.close(); @@ -3361,10 +3197,10 @@ namespace osl_File void remove_001() { // remove $TEMP/tmpdir/tmpname. - nError1 = File::remove(aTmpName4); + auto nError1 = File::remove(aTmpName4); // check File testFile(aTmpName4); - nError2 = testFile.open(osl_File_OpenFlag_Create); + auto nError2 = testFile.open(osl_File_OpenFlag_Create); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a file", osl::FileBase::E_None, nError1); @@ -3375,7 +3211,7 @@ namespace osl_File void remove_002() { // remove $TEMP/tmpname. - nError1 = File::remove(aTmpName6); + auto nError1 = File::remove(aTmpName6); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a file not exist", osl::FileBase::E_NOENT, nError1); @@ -3384,7 +3220,7 @@ namespace osl_File void remove_003() { // remove $TEMP/system/path. - nError1 = File::remove(aSysPath2); + auto nError1 = File::remove(aSysPath2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: removing a file not using full qualified URL", osl::FileBase::E_INVAL, nError1); @@ -3393,7 +3229,7 @@ namespace osl_File void remove_004() { // remove $TEMP/tmpdir. - nError1 = File::remove(aTmpName3); + auto nError1 = File::remove(aTmpName3); CPPUNIT_ASSERT_MESSAGE("test for remove function: remove a directory", (osl::FileBase::E_ISDIR == nError1) || (osl::FileBase::E_ACCES == nError1)); @@ -3413,12 +3249,9 @@ namespace osl_File class setAttributes : public CppUnit::TestFixture { private: - osl::FileBase::RC nError1, nError2; - DirectoryItem rItem, rItem_hidden; + DirectoryItem rItem; public: - setAttributes() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -3437,9 +3270,9 @@ namespace osl_File // on windows, only can set 2 attributes: osl_File_Attribute_ReadOnly, osl_File_Attribute_Hidden #ifdef UNX // set the file to readonly - nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead); + auto nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly | osl_File_Attribute_GrpRead | osl_File_Attribute_OwnRead | osl_File_Attribute_OthRead); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get the file attributes FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); @@ -3451,9 +3284,9 @@ namespace osl_File rFileStatus.getAttributes()); #else // please see GetFileAttributes - nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly); + auto nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_ReadOnly); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get the file attributes FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); @@ -3477,10 +3310,10 @@ namespace osl_File // on UNX, can not set hidden attribute to file, rename file can set the attribute #ifdef _WIN32 // set the file to hidden - nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_Hidden); + auto nError2 = File::setAttributes(aTmpName6, osl_File_Attribute_Hidden); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get the file attributes FileStatus rFileStatus(osl_FileStatus_Mask_Attributes); @@ -3508,12 +3341,9 @@ namespace osl_File class setTime : public CppUnit::TestFixture { private: - osl::FileBase::RC nError1, nError2; DirectoryItem rItem; public: - setTime() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -3543,11 +3373,11 @@ namespace osl_File CPPUNIT_ASSERT(bOk); // set the file time - nError2 = File::setTime(aTmpName6, *pTV_current, *pTV_current, *pTV_current); + auto nError2 = File::setTime(aTmpName6, *pTV_current, *pTV_current, *pTV_current); CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError2).getStr(), osl::FileBase::E_None, nError2); // get the file access time, creation time, modify time - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL_MESSAGE(errorToStr(nError1).getStr(), osl::FileBase::E_None, nError1); FileStatus rFileStatus(osl_FileStatus_Mask_AccessTime); @@ -3611,7 +3441,6 @@ namespace osl_File // test case: if The file is located on a read only file system. void sync_001() { -#ifdef UNX auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); @@ -3634,7 +3463,6 @@ namespace osl_File CPPUNIT_ASSERT_EQUAL_MESSAGE("can not sync to readonly file!", osl::FileBase::E_None, nError2); tmp_file.close(); -#endif } // test case:no enough space, how to create such case???see test_cpy_wrt_file.cxx::test_osl_writeFile @@ -3659,9 +3487,8 @@ namespace osl_File CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::setAttributes, "osl_File"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::setTime, "osl_File"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_File::sync, "osl_File"); -// FIXME: to enable these tests (when they work cross-platform) we need to add the below: -// CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_File"); + CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_File"); } // Beginning of the test cases for DirectoryItem class @@ -3673,12 +3500,7 @@ namespace osl_DirectoryItem class ctors : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - public: - ctors() : nError1(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpname. @@ -3697,7 +3519,7 @@ namespace osl_DirectoryItem DirectoryItem rItem; // constructor // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: initialize a new instance of DirectoryItem and get an item to check.", @@ -3714,12 +3536,7 @@ namespace osl_DirectoryItem class copy_assin_Ctors : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - public: - copy_assin_Ctors() : nError1(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpname. @@ -3737,7 +3554,7 @@ namespace osl_DirectoryItem { DirectoryItem rItem; // constructor // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); DirectoryItem copyItem(rItem); // copy constructor @@ -3753,7 +3570,7 @@ namespace osl_DirectoryItem { DirectoryItem rItem; // constructor // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); DirectoryItem copyItem; @@ -3777,12 +3594,7 @@ namespace osl_DirectoryItem class is : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - public: - is() : nError1(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpname. @@ -3807,7 +3619,7 @@ namespace osl_DirectoryItem { DirectoryItem rItem; // constructor // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_MESSAGE("test for is function: use an uninitialized instance.", @@ -3825,12 +3637,7 @@ namespace osl_DirectoryItem class get : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - get() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpname. @@ -3847,11 +3654,11 @@ namespace osl_DirectoryItem void get_001() { DirectoryItem rItem; - nError2 = DirectoryItem::get(aTmpName6, rItem); + auto nError2 = DirectoryItem::get(aTmpName6, rItem); // check the file name FileStatus rFileStatus(osl_FileStatus_Mask_FileName); - nError1 = rItem.getFileStatus(rFileStatus); + auto nError1 = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use copy constructor to get an item and check filename.", @@ -3863,7 +3670,7 @@ namespace osl_DirectoryItem void get_002() { DirectoryItem rItem; - nError1 = DirectoryItem::get(aSysPath1, rItem); + auto nError1 = DirectoryItem::get(aSysPath1, rItem); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use a system name instead of a URL.", osl::FileBase::E_INVAL, nError1); @@ -3873,7 +3680,7 @@ namespace osl_DirectoryItem { DirectoryItem rItem; - nError1 = DirectoryItem::get(aTmpName3, rItem); + auto nError1 = DirectoryItem::get(aTmpName3, rItem); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for get function: use a non existed file URL.", osl::FileBase::E_NOENT, nError1); @@ -3891,12 +3698,7 @@ namespace osl_DirectoryItem class getFileStatus : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - getFileStatus() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -3916,12 +3718,12 @@ namespace osl_DirectoryItem { DirectoryItem rItem; // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName4, rItem); + auto nError1 = DirectoryItem::get(aTmpName4, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name FileStatus rFileStatus(osl_FileStatus_Mask_FileName); - nError2 = rItem.getFileStatus(rFileStatus); + auto nError2 = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileStatus function: get file status and check filename", osl::FileBase::E_None, nError2); @@ -3933,11 +3735,12 @@ namespace osl_DirectoryItem { DirectoryItem rItem; // constructor // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName6, rItem); + auto nError1 = DirectoryItem::get(aTmpName6, rItem); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_NOENT, nError1); // check the file name FileStatus rFileStatus(osl_FileStatus_Mask_FileName); - nError2 = rItem.getFileStatus(rFileStatus); + auto nError2 = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileStatus function: file not existed", osl::FileBase::E_INVAL, nError2); @@ -3947,12 +3750,12 @@ namespace osl_DirectoryItem { DirectoryItem rItem; // constructor // get the DirectoryItem. - nError1 = DirectoryItem::get(aTmpName3, rItem); + auto nError1 = DirectoryItem::get(aTmpName3, rItem); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name FileStatus rFileStatus(osl_FileStatus_Mask_FileName); - nError2 = rItem.getFileStatus(rFileStatus); + auto nError2 = rItem.getFileStatus(rFileStatus); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getFileStatus function: get directory information", osl::FileBase::E_None, nError2); @@ -3972,6 +3775,8 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::is, "osl_DirectoryItem"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::get, "osl_DirectoryItem"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DirectoryItem::getFileStatus, "osl_DirectoryItem"); + + CPPUNIT_REGISTRY_ADD_TO_DEFAULT("osl_DirectoryItem"); } // Beginning of the test cases for Directory class @@ -3983,12 +3788,7 @@ namespace osl_Directory class ctors : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - ctors() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -4010,10 +3810,10 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // constructor // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // close a directory - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: create an instance and check open and close", @@ -4027,10 +3827,10 @@ namespace osl_Directory Directory testDirectory(aTmpName9); // constructor // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // close a directory - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for ctors function: relative URL, :-), it is also worked", @@ -4050,12 +3850,7 @@ namespace osl_Directory class open : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - open() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -4075,11 +3870,11 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); // check if directory is opened. bool bOk = testDirectory.isOpen(); // close a directory - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); CPPUNIT_ASSERT_MESSAGE("test for open function: open a directory and check for open", bOk); @@ -4093,10 +3888,10 @@ namespace osl_Directory { Directory testDirectory(aTmpName6); - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); if (nError1 == osl::FileBase::E_None) { - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); } @@ -4108,10 +3903,10 @@ namespace osl_Directory { Directory testDirectory(aUserDirectorySys); - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); if (nError1 == osl::FileBase::E_None) { - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); } @@ -4123,10 +3918,10 @@ namespace osl_Directory { Directory testDirectory(aTmpName4); - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); if (nError1 == osl::FileBase::E_None) { - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); } @@ -4147,12 +3942,7 @@ namespace osl_Directory class isOpen : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - isOpen() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempfile in $TEMP/tmpdir/tmpname. @@ -4173,12 +3963,13 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // constructor // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check if directory is opened. bool bOk = testDirectory.isOpen(); // close a directory - nError2 = testDirectory.close(); - + auto nError2 = testDirectory.close(); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); CPPUNIT_ASSERT_MESSAGE("test for isOpen function: open a directory and check for open", bOk); } @@ -4205,12 +3996,7 @@ namespace osl_Directory class close : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - close() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempdirectory : $TEMP/tmpdir. @@ -4228,9 +4014,11 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // close a directory - nError2 = testDirectory.close(); + auto nError2 = testDirectory.close(); + CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); // check if directory is opened. bool bOk = testDirectory.isOpen(); @@ -4243,7 +4031,7 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // close a directory - nError1 = testDirectory.close(); + auto nError1 = testDirectory.close(); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for isOpen function: close a not opened directory", osl::FileBase::E_BADF, nError1); @@ -4261,12 +4049,9 @@ namespace osl_Directory class reset : public CppUnit::TestFixture { private: - osl::FileBase::RC nError1, nError2; DirectoryItem rItem; public: - reset() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempdirectory : $TEMP/tmpdir. @@ -4293,7 +4078,7 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // constructor // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // get first Item nError1 = testDirectory.getNextItem(rItem, 1); @@ -4307,7 +4092,7 @@ namespace osl_Directory // mindy: CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // reset enumeration - nError2 = testDirectory.reset(); + auto nError2 = testDirectory.reset(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError2); // get reset Item, if reset does not work, getNextItem() should return the second Item (aTmpName1) nError1 = testDirectory.getNextItem(rItem); @@ -4335,7 +4120,7 @@ namespace osl_Directory Directory testDirectory(aTmpName6); // constructor // close a directory - nError1 = testDirectory.reset(); + auto nError1 = testDirectory.reset(); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for reset function: reset a non existed directory", osl::FileBase::E_NOENT, nError1); @@ -4346,7 +4131,7 @@ namespace osl_Directory Directory testDirectory(aTmpName4); // constructor // close a directory - nError1 = testDirectory.reset(); + auto nError1 = testDirectory.reset(); CPPUNIT_ASSERT_MESSAGE("test for reset function: reset a file instead of a directory", (osl::FileBase::E_NOTDIR == nError1) || (osl::FileBase::E_NOENT == nError1)); @@ -4357,7 +4142,7 @@ namespace osl_Directory Directory testDirectory(aUserDirectorySys); // constructor // close a directory - nError1 = testDirectory.reset(); + auto nError1 = testDirectory.reset(); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for reset function: use a system path", osl::FileBase::E_INVAL, nError1); @@ -4377,12 +4162,9 @@ namespace osl_Directory class getNextItem : public CppUnit::TestFixture { private: - osl::FileBase::RC nError1, nError2; DirectoryItem rItem; public: - getNextItem() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void setUp() override { // create a tempdirectory : $TEMP/tmpdir. @@ -4410,7 +4192,7 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // constructor // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // check the file name @@ -4460,7 +4242,7 @@ namespace osl_Directory void getNextItem_002() { Directory testDirectory(aTmpName3); // constructor - nError1 = testDirectory.getNextItem(rItem); + auto nError1 = testDirectory.getNextItem(rItem); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getNextItem function: retrieve an item in a directory which is not opened, also test for nHint's default value.", osl::FileBase::E_INVAL, nError1); @@ -4471,9 +4253,10 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // constructor // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); + osl::FileBase::RC nError2 = osl::FileBase::E_None; for (int nCount = 0; nCount < 4; nCount++) { nError2 = testDirectory.getNextItem(rItem, 3); @@ -4508,7 +4291,7 @@ namespace osl_Directory Directory testDirectory(aTmpName3); // open a directory - nError1 = testDirectory.open(); + auto nError1 = testDirectory.open(); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); OUString aFileName ("link.file"); @@ -4552,12 +4335,7 @@ namespace osl_Directory class getVolumeInfo : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1; - public: - getVolumeInfo() : nError1(osl::FileBase::E_None) {} - void checkValidMask(osl::VolumeInfo const& _aVolumeInfo, sal_Int32 _nMask) { if (_nMask == osl_VolumeInfo_Mask_FileSystemName) @@ -4566,8 +4344,6 @@ namespace osl_Directory OUString aFileSysName = _aVolumeInfo.getFileSystemName(); bool bRes2 = compareFileName(aFileSysName, aNullURL); - CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getVolumeInfo function: getVolumeInfo of root directory.", - osl::FileBase::E_None, nError1); CPPUNIT_ASSERT_MESSAGE("test for getVolumeInfo function: getVolumeInfo of root directory.", !bRes2); } @@ -4628,7 +4404,10 @@ namespace osl_Directory { VolumeInfo aVolumeInfo(_nMask); // call getVolumeInfo here - nError1 = Directory::getVolumeInfo(aVolURL1, aVolumeInfo); + auto nError1 = Directory::getVolumeInfo(aVolURL1, aVolumeInfo); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "test for getVolumeInfo function: getVolumeInfo of root directory.", + osl::FileBase::E_None, nError1); // LLA: IMHO it's not a bug, if VolumeInfo is not valid, it's a feature // LLA: CPPUNIT_ASSERT_MESSAGE("mask is not valid", sal_True == aVolumeInfo.isValid(_nMask)); if (aVolumeInfo.isValid(_nMask)) @@ -4690,7 +4469,7 @@ namespace osl_Directory // call getVolumeInfo here OUString aRootSysURL; - nError1 = osl::File::getFileURLFromSystemPath(aRootSys, aRootSysURL); + auto nError1 = osl::File::getFileURLFromSystemPath(aRootSys, aRootSysURL); CPPUNIT_ASSERT_EQUAL_MESSAGE("can't convert root path to file url", osl::FileBase::E_None, nError1); nError1 = Directory::getVolumeInfo(aRootSys, aVolumeInfo); @@ -4701,13 +4480,13 @@ namespace osl_Directory void getVolumeInfo_003() { +// LLA: in Windows, it reply no error, it did not pass in (W32). +#if defined(UNX) && !defined(IOS) sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName; VolumeInfo aVolumeInfo(mask); // call getVolumeInfo here - nError1 = Directory::getVolumeInfo(aTmpName3, aVolumeInfo); + auto nError1 = Directory::getVolumeInfo(aTmpName3, aVolumeInfo); -// LLA: in Windows, it reply no error, it did not pass in (W32). -#if defined(UNX) && !defined(IOS) CPPUNIT_ASSERT_EQUAL_MESSAGE("test for getVolumeInfo function: non-existence test. ", osl::FileBase::E_NOENT, nError1); #endif @@ -4732,17 +4511,13 @@ namespace osl_Directory class create : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - create() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} void create_001() { // create directory in $TEMP/tmpdir - nError1 = Directory::create(aTmpName3); + auto nError1 = Directory::create(aTmpName3); // check for existence - nError2 = Directory::create(aTmpName3); + auto nError2 = Directory::create(aTmpName3); // remove it deleteTestDirectory(aTmpName3); @@ -4759,7 +4534,7 @@ namespace osl_Directory return; OUString aTmpDir; - nError1 = osl::FileBase::createTempFile(nullptr, nullptr, &aTmpDir); + auto nError1 = osl::FileBase::createTempFile(nullptr, nullptr, &aTmpDir); CPPUNIT_ASSERT_EQUAL_MESSAGE("temp File creation failed", osl::FileBase::E_None, nError1); nError1 = File::remove(aTmpDir); @@ -4792,7 +4567,7 @@ namespace osl_Directory void create_003() { // create directory in /tmpname - nError1 = Directory::create(aSysPath1); + auto nError1 = Directory::create(aSysPath1); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for create function: create a directory using system path.", osl::FileBase::E_INVAL, nError1); @@ -4810,22 +4585,17 @@ namespace osl_Directory class remove : public CppUnit::TestFixture { - private: - osl::FileBase::RC nError1, nError2; - public: - remove() : nError1(osl::FileBase::E_None),nError2(osl::FileBase::E_None) {} - void remove_001() { // create directory in $TEMP/tmpdir - nError1 = Directory::create(aTmpName3); + auto nError1 = Directory::create(aTmpName3); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // remove it nError1 = Directory::remove(aTmpName3); // check for existence Directory rDirectory(aTmpName3); - nError2 = rDirectory.open(); + auto nError2 = rDirectory.open(); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: remove a directory and check its existence.", osl::FileBase::E_None, nError1); @@ -4836,13 +4606,13 @@ namespace osl_Directory void remove_002() { // create directory in $TEMP/tmpdir - nError1 = Directory::create(aTmpName3); + auto nError1 = Directory::create(aTmpName3); CPPUNIT_ASSERT_EQUAL(osl::FileBase::E_None, nError1); // try to remove it by system path nError1 = Directory::remove(aSysPath3); // check for existence Directory rDirectory(aTmpName3); - nError2 = rDirectory.open(); + auto nError2 = rDirectory.open(); if (nError2 != osl::FileBase::E_NOENT) Directory::remove(aTmpName3); @@ -4854,7 +4624,7 @@ namespace osl_Directory void remove_003() { // try to remove a non-existed directory - nError1 = Directory::remove(aTmpName6); + auto nError1 = Directory::remove(aTmpName6); CPPUNIT_ASSERT_EQUAL_MESSAGE("test for remove function: try to remove a non-existed directory.", osl::FileBase::E_NOENT, nError1); @@ -4865,7 +4635,7 @@ namespace osl_Directory createTestFile(aTmpName6); bool bExist = ifFileExist(aTmpName6); // try to remove file. - nError1 = Directory::remove(aTmpName6); + auto nError1 = Directory::remove(aTmpName6); deleteTestFile(aTmpName6); CPPUNIT_ASSERT_MESSAGE("test for remove function: try to remove a file but not directory.", @@ -4878,7 +4648,7 @@ namespace osl_Directory { createTestDirectory(aTmpName3); createTestFile(aTmpName4); - nError1 = Directory::remove(aTmpName3); + auto nError1 = Directory::remove(aTmpName3); deleteTestFile(aTmpName4); deleteTestDirectory(aTmpName3); OString sError = "test for remove function: try to remove a directory that is not empty." + @@ -5128,6 +4898,7 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_REGISTRATION(osl_Directory::createPath); } +#if 0 #if defined UNX /** get Current PID. */ @@ -5143,6 +4914,7 @@ OUString getCurrentPID() return OUString::number(nPID); } #endif +#endif namespace { |