diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-22 21:20:15 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-23 03:38:49 +0000 |
| commit | 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch) | |
| tree | 5024cba9f9ea5e3b23ea26025323f6aef39488d0 /sal | |
| parent | b81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff) | |
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb
Reviewed-on: https://gerrit.libreoffice.org/8182
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sal')
46 files changed, 764 insertions, 764 deletions
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index f056ce191771..5d2e5a0b752c 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -97,10 +97,10 @@ namespace /* private */ class sum_of_string_lengths { public: - //-------------------------------- + sum_of_string_lengths() : sum_(0) {} - //-------------------------------- + void operator() (const rtl::OUString& string) { OSL_ASSERT(string.getLength()); @@ -110,7 +110,7 @@ namespace /* private */ sum_ += string.getLength() + 1; } - //-------------------------------- + operator size_t () const { return sum_; diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index d81c463220a1..1369421c2f9b 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -34,9 +34,9 @@ using ::rtl::OString; // This file contains cppunit tests for the // OString and OStringBuffer classes -//------------------------------------------------------------------------ + // testing constructors -//------------------------------------------------------------------------ + namespace rtl_OStringBuffer { @@ -166,7 +166,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class makeStringAndClear : public CppUnit::TestFixture { @@ -372,7 +372,7 @@ namespace rtl_OStringBuffer }; -// ----------------------------------------------------------------------------- + class getLength : public CppUnit::TestFixture { @@ -505,7 +505,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class getCapacity : public CppUnit::TestFixture { @@ -689,7 +689,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( getCapacity_013 ); CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class ensureCapacity : public CppUnit::TestFixture { @@ -969,7 +969,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class setLength : public CppUnit::TestFixture { @@ -1459,7 +1459,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class csuc : public CppUnit::TestFixture { @@ -1505,7 +1505,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class getStr : public CppUnit::TestFixture { @@ -1551,7 +1551,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class append_001 : public CppUnit::TestFixture { @@ -1960,7 +1960,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class append_002 : public CppUnit::TestFixture { @@ -2347,7 +2347,7 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + class append_003 : public CppUnit::TestFixture { @@ -2733,7 +2733,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_003_024 ); CPPUNIT_TEST_SUITE_END(); }; -//----------------------------------------------------------------------------- + class append_004 : public CppUnit::TestFixture { @@ -2967,9 +2967,9 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append(sal_Char c) -//------------------------------------------------------------------------ + class append_005 : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -5177,7 +5177,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int32 i, sal_Int16 radix=2 ) // where i = large constants // testing the method append( sal_Int32 i, sal_Int16 radix=8 ) @@ -5188,7 +5188,7 @@ namespace rtl_OStringBuffer // where i = large constants // testing the method append( sal_Int32 i, sal_Int16 radix=36 ) // where i = large constants -//------------------------------------------------------------------------ + class append_006_Int32_Bounderies : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -6188,7 +6188,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_049 ); CPPUNIT_TEST( append_050 ); CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int32 i, sal_Int16 radix=2 ) // for negative value // testing the method append( sal_Int32 i, sal_Int16 radix=8 ) @@ -6199,7 +6199,7 @@ namespace rtl_OStringBuffer // for negative value // testing the method append( sal_Int32 i, sal_Int16 radix=36 ) // for negative value -//------------------------------------------------------------------------ + class append_006_Int32_Negative : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -8246,9 +8246,9 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int32 i, sal_Int16 radix ) where radix = -5 -//------------------------------------------------------------------------ + class append_006_Int32_WrongRadix : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -8377,7 +8377,7 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + class append_006_Int32_defaultParam : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -8945,13 +8945,13 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int64 l, sal_Int16 radix=2 ) // testing the method append( sal_Int64 l, sal_Int16 radix=8 ) // testing the method append( sal_Int64 l, sal_Int16 radix=10 ) // testing the method append( sal_Int64 l, sal_Int16 radix=16 ) // testing the method append( sal_Int64 l, sal_Int16 radix=36 ) -//------------------------------------------------------------------------ + class append_007_Int64 : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -10926,7 +10926,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int64 i, sal_Int16 radix=2 ) // where i = large constants // testing the method append( sal_Int64 i, sal_Int16 radix=8 ) @@ -10937,7 +10937,7 @@ namespace rtl_OStringBuffer // where i = large constants // testing the method append( sal_Int64 i, sal_Int16 radix=36 ) // where i = large constants -//------------------------------------------------------------------------ + class append_007_Int64_Bounderies : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -11937,7 +11937,7 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_049 ); CPPUNIT_TEST( append_050 ); CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int64 i, sal_Int16 radix=2 ) // for negative value // testing the method append( sal_Int64 i, sal_Int16 radix=8 ) @@ -11948,7 +11948,7 @@ namespace rtl_OStringBuffer // for negative value // testing the method append( sal_Int64 i, sal_Int16 radix=36 ) // for negative value -//------------------------------------------------------------------------ + class append_007_Int64_Negative : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -13998,9 +13998,9 @@ namespace rtl_OStringBuffer CPPUNIT_TEST( append_099 ); CPPUNIT_TEST( append_100 ); CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( sal_Int64 i, sal_Int16 radix ) where radix = -5 -//------------------------------------------------------------------------ + class append_007_Int64_WrongRadix : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -14127,7 +14127,7 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + class append_007_Int64_defaultParam : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -14690,9 +14690,9 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( float f ) -//------------------------------------------------------------------------ + class checkfloat : public CppUnit::TestFixture { public: @@ -14710,7 +14710,7 @@ namespace rtl_OStringBuffer return false; } }; -// ----------------------------------------------------------------------------- + class append_008_float : public checkfloat { OString* arrOUS[5]; @@ -15444,9 +15444,9 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( float f ) for negative value -//------------------------------------------------------------------------ + class append_008_Float_Negative : public checkfloat { OString* arrOUS[5]; @@ -16176,9 +16176,9 @@ namespace rtl_OStringBuffer #endif CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( double d ) -//------------------------------------------------------------------------ + class checkdouble : public CppUnit::TestFixture { @@ -16257,9 +16257,9 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; -//------------------------------------------------------------------------ + // testing the method append( double f ) for negative value -//------------------------------------------------------------------------ + class append_009_Double_Negative : public checkdouble { OString* arrOUS[5]; @@ -16320,7 +16320,7 @@ namespace rtl_OStringBuffer }; } // namespace rtl_OStringBuffer -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::makeStringAndClear); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OStringBuffer::getLength); diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx index 1b5cf71c7d0b..592935f16a6b 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx @@ -77,7 +77,7 @@ sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ) return ( dst ); } -//------------------------------------------------------------------------ + bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ) { const sal_Char* pBuf1 = str1; @@ -92,7 +92,7 @@ bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ) } return( i == len ); } -//----------------------------------------------------------------------- + bool cmpstr( const sal_Char* str1, const sal_Char* str2 ) { const sal_Char* pBuf1 = str1; @@ -110,7 +110,7 @@ bool cmpstr( const sal_Char* str1, const sal_Char* str2 ) res = false; return (res); } -//------------------------------------------------------------------------ + bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len ) { const sal_Unicode* pBuf1 = str1; @@ -126,7 +126,7 @@ bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len ) return( i == len ); } -//----------------------------------------------------------------------- + bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ) { const sal_Unicode* pBuf1 = str1; diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx index 470ffaf4dae4..48e04011e38a 100644 --- a/sal/qa/osl/condition/osl_Condition.cxx +++ b/sal/qa/osl/condition/osl_Condition.cxx @@ -18,9 +18,9 @@ */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <osl_Condition_Const.h> #include <stdlib.h> @@ -28,9 +28,9 @@ using namespace osl; using namespace rtl; -//------------------------------------------------------------------------ + // helper functions and classes -//------------------------------------------------------------------------ + /** print Boolean value. */ @@ -93,9 +93,9 @@ protected: }; -//------------------------------------------------------------------------ + // test code start here -//------------------------------------------------------------------------ + namespace osl_Condition { @@ -339,18 +339,18 @@ namespace osl_Condition }; // class check -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::set); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::reset); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::wait); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Condition::check); -// ----------------------------------------------------------------------------- + } // namespace osl_Condition -// ----------------------------------------------------------------------------- + CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 48fab3d84afd..b5c5faaf05e8 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> @@ -47,9 +47,9 @@ using ::rtl::OUStringToOString; using ::rtl::OString; using ::rtl::OStringToOUString; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + /** detailed wrong message. */ @@ -638,18 +638,18 @@ inline ::rtl::OUString getCurrentPID( void ); -//------------------------------------------------------------------------ + // Beginning of the test cases for FileBase class -//------------------------------------------------------------------------ + namespace osl_FileBase { - //--------------------------------------------------------------------- + // testing the method // static inline RC getAbsoluteFileURL( const ::rtl::OUString& ustrBaseDirectoryURL, // const ::rtl::OUString& ustrRelativeFileURL, // ::rtl::OUString& ustrAbsoluteFileURL ) - //--------------------------------------------------------------------- + class getAbsoluteFileURL:public CppUnit::TestFixture { @@ -799,13 +799,13 @@ namespace osl_FileBase deleteTestDirectory( aUStrBase ); deleteTestDirectory( aUStrUpBase ); } - //--------------------------------------------------------------------- + // testing two methods: // static inline RC getSystemPathFromFileURL( const ::rtl::OUString& ustrFileURL, // ::rtl::OUString& ustrSystemPath ) // static RC getFileURLFromSystemPath( const ::rtl::OUString & ustrSystemPath, // ::rtl::OUString & ustrFileURL ); - //--------------------------------------------------------------------- + class SystemPath_FileURL:public CppUnit::TestFixture { //::osl::FileBase aFileBase; @@ -1193,12 +1193,12 @@ namespace osl_FileBase - //--------------------------------------------------------------------- + // testing the method // static inline RC searchFileURL( const ::rtl::OUString& ustrFileName, // const ::rtl::OUString& ustrSearchPath, // ::rtl::OUString& ustrFileURL ) - //--------------------------------------------------------------------- + class searchFileURL:public CppUnit::TestFixture { //::osl::FileBase aFileBase; @@ -1293,10 +1293,10 @@ namespace osl_FileBase };// class searchFileURL - //--------------------------------------------------------------------- + // testing the method // static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL ) - //--------------------------------------------------------------------- + class getTempDirURL:public CppUnit::TestFixture { //::osl::FileBase aFileBase; @@ -1338,12 +1338,12 @@ namespace osl_FileBase };// class getTempDirURL - //--------------------------------------------------------------------- + // testing the method // static inline RC createTempFile( ::rtl::OUString* pustrDirectoryURL, // oslFileHandle* pHandle, // ::rtl::OUString* pustrTempFileURL) - //--------------------------------------------------------------------- + class createTempFile:public CppUnit::TestFixture { //::osl::FileBase aFileBase; @@ -1441,7 +1441,7 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class createTempFile - // ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getAbsoluteFileURL, "osl_FileBase" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::SystemPath_FileURL, "osl_FileBase" ); // CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::getFileURLFromSystemPath, "osl_FileBase" ); @@ -1451,16 +1451,16 @@ namespace osl_FileBase }// namespace osl_FileBase -//------------------------------------------------------------------------ + // Beginning of the test cases for VolumeInfo class -//------------------------------------------------------------------------ + namespace osl_VolumeInfo { - //--------------------------------------------------------------------- + // testing the method // VolumeInfo( sal_uInt32 nMask ): _nMask( nMask ) - //--------------------------------------------------------------------- + class ctors : public CppUnit::TestFixture { ::rtl::OUString aUStr; @@ -1554,10 +1554,10 @@ namespace osl_VolumeInfo };// class ctors - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool isValid( sal_uInt32 nMask ) const - //--------------------------------------------------------------------- + class isValid : public CppUnit::TestFixture { ::osl::VolumeDevice aVolumeDevice; @@ -1633,10 +1633,10 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class isValid - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool getRemoteFlag() const - //--------------------------------------------------------------------- + class getRemoteFlag : public CppUnit::TestFixture { ::osl::VolumeDevice aVolumeDevice; @@ -1684,10 +1684,10 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRemoteFlag - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool getRemoveableFlag() const - //--------------------------------------------------------------------- + class getRemoveableFlag : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -1725,10 +1725,10 @@ namespace osl_VolumeInfo };// class getRemoveableFlag - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool getCompactDiscFlag() const - //--------------------------------------------------------------------- + class getCompactDiscFlag : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -1766,10 +1766,10 @@ namespace osl_VolumeInfo };// class getCompactDiscFlag - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool getFloppyDiskFlag() const - //--------------------------------------------------------------------- + class getFloppyDiskFlag : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -1807,10 +1807,10 @@ namespace osl_VolumeInfo };// class getFloppyDiskFlag - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool getFixedDiskFlag() const - //--------------------------------------------------------------------- + class getFixedDiskFlag : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -1847,10 +1847,10 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFixedDiskFlag - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool getRAMDiskFlag() const - //--------------------------------------------------------------------- + class getRAMDiskFlag : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -1888,10 +1888,10 @@ namespace osl_VolumeInfo };// class getRAMDiskFlag - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt64 getTotalSpace() const - //--------------------------------------------------------------------- + class getTotalSpace : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -1970,10 +1970,10 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getTotalSpace - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt64 getFreeSpace() const - //--------------------------------------------------------------------- + class getFreeSpace : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -2052,10 +2052,10 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFreeSpace - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt64 getUsedSpace() const - //--------------------------------------------------------------------- + class getUsedSpace : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -2136,10 +2136,10 @@ namespace osl_VolumeInfo };// class getUsedSpace - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt32 getMaxNameLength() const - //--------------------------------------------------------------------- + class getMaxNameLength : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -2196,10 +2196,10 @@ namespace osl_VolumeInfo };// class getMaxNameLength - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt32 getMaxPathLength() const - //--------------------------------------------------------------------- + class getMaxPathLength : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -2250,10 +2250,10 @@ namespace osl_VolumeInfo };// class getMaxPathLength - //--------------------------------------------------------------------- + // testing the method // inline ::rtl::OUString getFileSystemName() const - //--------------------------------------------------------------------- + class getFileSystemName : public CppUnit::TestFixture { ::rtl::OUString aUStr; @@ -2311,10 +2311,10 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFileSystemName - //--------------------------------------------------------------------- + // testing the method // inline VolumeDevice getDeviceHandle() const - //--------------------------------------------------------------------- + class getDeviceHandle : public CppUnit::TestFixture { ::rtl::OUString aUStr; @@ -2342,7 +2342,7 @@ namespace osl_VolumeInfo };// class getDeviceHandle - // ----------------------------------------------------------------------------- + /*CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::ctors, "osl_VolumeInfo" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::isValid, "osl_VolumeInfo" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::getRemoteFlag, "osl_VolumeInfo" ); @@ -2362,16 +2362,16 @@ namespace osl_VolumeInfo -//------------------------------------------------------------------------ + // Beginning of the test cases for VolumeDevice class -//------------------------------------------------------------------------ + namespace osl_FileStatus { - //--------------------------------------------------------------------- + // testing the method // FileStatus( sal_uInt32 nMask ): _nMask( nMask ) - //--------------------------------------------------------------------- + class ctors : public CppUnit::TestFixture { ::rtl::OUString aUStr; @@ -2440,10 +2440,10 @@ namespace osl_FileStatus };// class ctors - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool isValid( sal_uInt32 nMask ) const - //--------------------------------------------------------------------- + class isValid : public CppUnit::TestFixture { ::rtl::OUString aUStr; @@ -2643,10 +2643,10 @@ namespace osl_FileStatus };// class ctors - //--------------------------------------------------------------------- + // testing the method // inline Type getFileType() const - //--------------------------------------------------------------------- + class getFileType : public CppUnit::TestFixture { ::rtl::OUString aUStr; @@ -2774,10 +2774,10 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileType - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt64 getAttributes() const - //--------------------------------------------------------------------- + class getAttributes : public CppUnit::TestFixture { ::rtl::OUString aTypeURL, aTypeURL_Hid; @@ -2904,10 +2904,10 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getAttributes - //--------------------------------------------------------------------- + // testing the method // inline TimeValue getAccessTime() const - //--------------------------------------------------------------------- + class getAccessTime : public CppUnit::TestFixture { ::rtl::OUString aTypeURL; @@ -2960,10 +2960,10 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getAccessTime - //--------------------------------------------------------------------- + // testing the method // inline TimeValue getModifyTime() const - //--------------------------------------------------------------------- + class getModifyTime : public CppUnit::TestFixture { ::rtl::OUString aTypeURL; @@ -3016,10 +3016,10 @@ namespace osl_FileStatus };// class getModifyTime - //--------------------------------------------------------------------- + // testing the method // inline sal_uInt64 getFileSize() const - //--------------------------------------------------------------------- + class getFileSize : public CppUnit::TestFixture { ::rtl::OUString aTypeURL; @@ -3082,10 +3082,10 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileSize - //--------------------------------------------------------------------- + // testing the method // inline ::rtl::OUString getFileName() const - //--------------------------------------------------------------------- + class getFileName : public CppUnit::TestFixture { ::rtl::OUString aTypeURL; @@ -3127,10 +3127,10 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileName - //--------------------------------------------------------------------- + // testing the method // inline ::rtl::OUString getFileURL() const - //--------------------------------------------------------------------- + class getFileURL : public CppUnit::TestFixture { ::rtl::OUString aTypeURL; @@ -3171,10 +3171,10 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileURL - //--------------------------------------------------------------------- + // testing the method // inline ::rtl::OUString getLinkTargetURL() const - //--------------------------------------------------------------------- + class getLinkTargetURL : public CppUnit::TestFixture { ::rtl::OUString aTypeURL; @@ -3243,7 +3243,7 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getLinkTargetURL - // ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::ctors, "osl_FileStatus" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::isValid, "osl_FileStatus" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getFileType, "osl_FileStatus" ); @@ -3258,15 +3258,15 @@ namespace osl_FileStatus -//------------------------------------------------------------------------ + // Beginning of the test cases for File class -//------------------------------------------------------------------------ + namespace osl_File { - //--------------------------------------------------------------------- + // testing the method // File( const ::rtl::OUString& ustrFileURL ) - //--------------------------------------------------------------------- + class ctors : public CppUnit::TestFixture { // ::osl::FileBase::RC nError1; @@ -3318,10 +3318,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class ctors - //--------------------------------------------------------------------- + // testing the method // inline RC open( sal_uInt32 uFlags ) - //--------------------------------------------------------------------- + class open : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2, nError3; @@ -3443,10 +3443,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class open - //--------------------------------------------------------------------- + // testing the method // inline RC close() - //--------------------------------------------------------------------- + class close : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2, nError3; @@ -3508,10 +3508,10 @@ namespace osl_File };// class close - //--------------------------------------------------------------------- + // testing the method // inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) - //--------------------------------------------------------------------- + class setPos : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -3613,10 +3613,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setPos - //--------------------------------------------------------------------- + // testing the method // inline RC getPos( sal_uInt64& uPos ) - //--------------------------------------------------------------------- + class getPos : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -3679,10 +3679,10 @@ namespace osl_File };// class getPos - //--------------------------------------------------------------------- + // testing the method // inline RC isEndOfFile( sal_Bool *pIsEOF ) - //--------------------------------------------------------------------- + class isEndOfFile : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -3774,10 +3774,10 @@ namespace osl_File };// class isEndOfFile - //--------------------------------------------------------------------- + // testing the method // inline RC setSize( sal_uInt64 uSize ) - //--------------------------------------------------------------------- + class setSize : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -3874,10 +3874,10 @@ namespace osl_File };// class setSize - //--------------------------------------------------------------------- + // testing the method // inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead ) - //--------------------------------------------------------------------- + class read : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -3963,10 +3963,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class read - //--------------------------------------------------------------------- + // testing the method // inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten) - //--------------------------------------------------------------------- + class write : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -4023,10 +4023,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class write - //--------------------------------------------------------------------- + // testing the method // inline RC readLine( ::rtl::ByteSequence& aSeq ) - //--------------------------------------------------------------------- + class readLine : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -4136,10 +4136,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class readLine - //--------------------------------------------------------------------- + // testing the method // inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) - //--------------------------------------------------------------------- + class copy : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -4271,10 +4271,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class copy - //--------------------------------------------------------------------- + // testing the method // inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) - //--------------------------------------------------------------------- + class move : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -4433,10 +4433,10 @@ namespace osl_File };// class move - //--------------------------------------------------------------------- + // testing the method // inline static RC remove( const ::rtl::OUString& ustrFileURL ) - //--------------------------------------------------------------------- + class remove : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -4519,10 +4519,10 @@ namespace osl_File };// class remove - //--------------------------------------------------------------------- + // testing the method // inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes ) - //--------------------------------------------------------------------- + class setAttributes : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -4611,14 +4611,14 @@ namespace osl_File };// class setAttributes - //--------------------------------------------------------------------- + // testing the method // inline static RC setTime( // const ::rtl::OUString& ustrFileURL, // const TimeValue& rCreationTime, // const TimeValue& rLastAccessTime, // const TimeValue& rLastWriteTime ) - //--------------------------------------------------------------------- + class setTime : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -4699,10 +4699,10 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setTime - //--------------------------------------------------------------------- + // testing the method // inline static RC sync() - //--------------------------------------------------------------------- + class sync : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -4761,7 +4761,7 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setTime - // ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::ctors, "osl_File" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::open, "osl_File" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_File::close, "osl_File" ); @@ -4784,15 +4784,15 @@ namespace osl_File }// namespace osl_File -//------------------------------------------------------------------------ + // Beginning of the test cases for DirectoryItem class -//------------------------------------------------------------------------ + namespace osl_DirectoryItem { - //--------------------------------------------------------------------- + // testing the method // DirectoryItem(): _pData( NULL ) - //--------------------------------------------------------------------- + class ctors : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -4831,10 +4831,10 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class ctors - //--------------------------------------------------------------------- + // testing the method // DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData) - //--------------------------------------------------------------------- + class copy_assin_Ctors : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -4894,10 +4894,10 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class copy_assin_Ctors - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool is() - //--------------------------------------------------------------------- + class is : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -4943,10 +4943,10 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class is - //--------------------------------------------------------------------- + // testing the method // static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem ) - //--------------------------------------------------------------------- + class get : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5010,10 +5010,10 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class get - //--------------------------------------------------------------------- + // testing the method // inline RC getFileStatus( FileStatus& rStatus ) - //--------------------------------------------------------------------- + class getFileStatus : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5099,15 +5099,15 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::getFileStatus, "osl_DirectoryItem" ); }// namespace osl_DirectoryItem -//------------------------------------------------------------------------ + // Beginning of the test cases for Directory class -//------------------------------------------------------------------------ + namespace osl_Directory { - //--------------------------------------------------------------------- + // testing the method // Directory( const ::rtl::OUString& strPath ): _pData( 0 ), _aPath( strPath ) - //--------------------------------------------------------------------- + class ctors : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5169,10 +5169,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class ctors - //--------------------------------------------------------------------- + // testing the method // inline RC open() - //--------------------------------------------------------------------- + class open : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5268,10 +5268,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class open - //--------------------------------------------------------------------- + // testing the method // inline sal_Bool isOpen() { return _pData != NULL; }; - //--------------------------------------------------------------------- + class isOpen : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5326,10 +5326,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class isOpen - //--------------------------------------------------------------------- + // testing the method // inline RC close() - //--------------------------------------------------------------------- + class close : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5383,10 +5383,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class close - //--------------------------------------------------------------------- + // testing the method // inline RC reset() - //--------------------------------------------------------------------- + class reset : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5499,10 +5499,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class reset - //--------------------------------------------------------------------- + // testing the method // inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 ) - //--------------------------------------------------------------------- + class getNextItem : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5670,10 +5670,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class getNextItem - //--------------------------------------------------------------------- + // testing the method // inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo ) - //--------------------------------------------------------------------- + class getVolumeInfo : public CppUnit::TestFixture { ::osl::FileBase::RC nError1; @@ -5849,10 +5849,10 @@ namespace osl_Directory };// class getVolumeInfo - //--------------------------------------------------------------------- + // testing the method // inline static RC create( const ::rtl::OUString& ustrDirectoryURL ) - //--------------------------------------------------------------------- + class create : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -5928,10 +5928,10 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class create - //--------------------------------------------------------------------- + // testing the method // inline static RC remove( const ::rtl::OUString& ustrDirectoryURL ) - //--------------------------------------------------------------------- + class remove : public CppUnit::TestFixture { ::osl::FileBase::RC nError1, nError2; @@ -6249,7 +6249,7 @@ namespace osl_Directory }; // class createPath - // ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::ctors ); CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::open ); CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::isOpen ); diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index d46a8c6fa5ca..172ff028d372 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -38,7 +38,7 @@ namespace osl_test_file { -// ----------------------------------------------------------------------------- + class oldtestfile : public CppUnit::TestFixture { @@ -144,10 +144,10 @@ void oldtestfile::test_file_004() } // namespace osl_test_file -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION( osl_test_file::oldtestfile); -// ----------------------------------------------------------------------------- + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index 1ffb63cb5bd0..84e851e6bc30 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -18,9 +18,9 @@ */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <osl_Module_Const.h> using namespace osl; @@ -28,9 +28,9 @@ using namespace osl; using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -//------------------------------------------------------------------------ + // helper functions and classes -//------------------------------------------------------------------------ + /** print Boolean value. */ @@ -143,9 +143,9 @@ inline void deleteTestFile( const ::rtl::OUString filename ) } -//------------------------------------------------------------------------ + // test code start here -//------------------------------------------------------------------------ + namespace osl_Module { @@ -449,7 +449,7 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class getFunctionSymbol -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getUrlFromAddress); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::load); @@ -458,11 +458,11 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::is); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getSymbol); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::optr_oslModule); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Module::getFunctionSymbol); -// ----------------------------------------------------------------------------- + } // namespace osl_Module -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index 1e26c62ae85e..096de9c9b8c9 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include "cppunit/TestAssert.h" #include "cppunit/TestFixture.h" @@ -30,9 +30,9 @@ using namespace osl; using namespace rtl; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + /** print a UNI_CODE String. */ @@ -76,9 +76,9 @@ namespace ThreadHelper } -//------------------------------------------------------------------------ + // Beginning of the test cases for osl_Mutex class -//------------------------------------------------------------------------ + /** mutually exclusive data @@ -263,7 +263,7 @@ protected: }; -//-------------------------------------------------------------- + namespace osl_Mutex { @@ -548,7 +548,7 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END(); }; // class getGlobalMutex -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::ctor, "osl_Mutex"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::acquire, "osl_Mutex"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::tryToAcquire, "osl_Mutex"); @@ -557,9 +557,9 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::getGlobalMutex, "osl_Mutex"); } // namespace osl_Mutex -//------------------------------------------------------------------------ + // Beginning of the test cases for osl_Guard class -//------------------------------------------------------------------------ + class GuardThread : public Thread { @@ -636,14 +636,14 @@ namespace osl_Guard CPPUNIT_TEST_SUITE_END(); }; // class ctor -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Guard::ctor, "osl_Guard"); } // namespace osl_Guard -//------------------------------------------------------------------------ + // Beginning of the test cases for osl_ClearableGuard class -//------------------------------------------------------------------------ + /** Thread for test ClearableGuard */ @@ -673,7 +673,7 @@ protected: } }; -// ----------------------------------------------------------------------------- + namespace osl_ClearableGuard { @@ -777,15 +777,15 @@ namespace osl_ClearableGuard CPPUNIT_TEST_SUITE_END( ); }; // class clear -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::ctor, "osl_ClearableGuard" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_ClearableGuard::clear, "osl_ClearableGuard" ); } // namespace osl_ClearableGuard -//------------------------------------------------------------------------ + // Beginning of the test cases for osl_ResettableGuard class -//------------------------------------------------------------------------ + /** Thread for test ResettableGuard */ @@ -813,7 +813,7 @@ protected: } }; -// ----------------------------------------------------------------------------- + namespace osl_ResettableGuard { class ctor : public CppUnit::TestFixture @@ -903,7 +903,7 @@ namespace osl_ResettableGuard CPPUNIT_TEST_SUITE_END(); }; // class reset -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::ctor); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ResettableGuard::reset); } // namespace osl_ResettableGuard diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 6e109b7a3c97..58cce66b1b52 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include "cppunit/TestAssert.h" @@ -47,9 +47,9 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + /** print Boolean value. */ @@ -118,9 +118,9 @@ inline void printPipeError( ::osl::Pipe aPipe ) -//------------------------------------------------------------------------ + // pipe name and transfer contents -//------------------------------------------------------------------------ + const rtl::OUString aTestPipeName("testpipe2"); const rtl::OUString aTestPipe1("testpipe1"); const rtl::OUString aTestString("Sun Microsystems"); @@ -128,16 +128,16 @@ const rtl::OUString aTestString("Sun Microsystems"); const OString m_pTestString1("Sun Microsystems"); const OString m_pTestString2("test pipe PASS/OK"); -//------------------------------------------------------------------------ + // test code start here -//------------------------------------------------------------------------ + namespace osl_Pipe { -//------------------------------------------------------------------------ + // most return value -1 denote a fail of operation. -//------------------------------------------------------------------------ + #define OSL_PIPE_FAIL -1 /** testing the methods: @@ -623,7 +623,7 @@ namespace osl_Pipe }; // class getHandle -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::is); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::create); @@ -633,7 +633,7 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::close); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getError); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getHandle); -// ----------------------------------------------------------------------------- + } // namespace osl_Pipe @@ -781,7 +781,7 @@ namespace osl_StreamPipe osl_waitThread(&nTV); } // test read/write & send/recv data to pipe - // ----------------------------------------------------------------------------- + class Pipe_DataSink_Thread : public Thread { @@ -922,11 +922,11 @@ namespace osl_StreamPipe CPPUNIT_TEST_SUITE_END( ); }; // class recv -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::ctors); //CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::assign); CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamPipe::recv); -// ----------------------------------------------------------------------------- + } // namespace osl_StreamPipe diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index 756df0bf2adb..e13797b475cf 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -24,9 +24,9 @@ #include <time.h> #endif -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <rtl/string.hxx> @@ -50,7 +50,7 @@ using namespace osl; using ::rtl::OString; -// ----------------------------------------------------------------------------- + // Small stopwatch class StopWatch { TimeValue t1,t2; // Start and stoptime @@ -155,7 +155,7 @@ double StopWatch::getTenthSec() const return nValue ; } -// ----------------------------------------------------------------------------- + template <class T> class ThreadSafeValue { @@ -179,7 +179,7 @@ public: void release() {m_aMutex.release();} }; -// ----------------------------------------------------------------------------- + namespace ThreadHelper { void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) @@ -266,7 +266,7 @@ public: }; -// ----------------------------------------------------------------------------- + /** Thread which has a flag add 1 every second until 20 */ class OCountThread : public Thread @@ -1867,7 +1867,7 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class schedule -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::create, "osl_Thread"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::createSuspended, "osl_Thread"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::suspend, "osl_Thread"); @@ -1885,7 +1885,7 @@ namespace osl_Thread } // namespace osl_Thread -// ----------------------------------------------------------------------------- + // destroy function when the binding thread terminate void SAL_CALL destroyCallback(void * data) { @@ -2185,7 +2185,7 @@ namespace osl_ThreadData CPPUNIT_TEST_SUITE_END(); }; // class getData -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::setData); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ThreadData::getData); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 5dcd55561884..36ecf045c65a 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -318,7 +318,7 @@ typedef string_container_t::iterator string_container_iter_t; class exclude : public std::unary_function<std::string, bool> { public: - //------------------------------------------------ + exclude(const string_container_t& exclude_list) { string_container_const_iter_t iter = exclude_list.begin(); @@ -327,7 +327,7 @@ public: exclude_list_.push_back(env_var_name(*iter)); } - //------------------------------------------------ + bool operator() (const std::string& env_var) const { return (exclude_list_.end() != @@ -338,7 +338,7 @@ public: } private: - //------------------------------------------------- + // extract the name from an environment variable // that is given in the form "NAME=VALUE" std::string env_var_name(const std::string& env_var) const @@ -419,7 +419,7 @@ class Test_osl_executeProcess : public CppUnit::TestFixture public: - //------------------------------------------------ + // ctor Test_osl_executeProcess() : env_param_(OUString("-env")), @@ -432,7 +432,7 @@ public: suExecutableFileURL += EXECUTABLE_NAME; } - //------------------------------------------------ + virtual void setUp() { temp_file_path_ = create_temp_file(temp_file_url_); @@ -444,7 +444,7 @@ public: osl::File::remove(temp_file_url_); } - //------------------------------------------------ + OUString create_temp_file(OUString &temp_file_url) { FileBase::RC rc = FileBase::createTempFile(0, 0, &temp_file_url); @@ -457,7 +457,7 @@ public: return temp_file_path; } - //------------------------------------------------ + void read_child_environment(string_container_t* env_container) { OString temp_file_name = OUStringToOString(OUString( @@ -477,7 +477,7 @@ public: tidy_container(*env_container); } - //------------------------------------------------ + // environment of the child process that was // started. The child process writes his // environment into a file @@ -493,7 +493,7 @@ public: (std::equal(child_env.begin(), child_env.end(), parent_env.begin()))); } - //------------------------------------------------ + // compare the equal environment parts and the // different part of the child environment bool compare_merged_environments(const string_container_t& different_env_vars) @@ -563,7 +563,7 @@ public: different_env_size_equals && different_env_content_equals); } - //------------------------------------------------ + // test that parent and child process have the // same environment when osl_executeProcess will // be called with out setting new environment @@ -605,7 +605,7 @@ public: ); } - //------------------------------------------------ + #define ENV1 "PAT=a:\\" #define ENV2 "PATHb=b:\\" #define ENV3 "Patha=c:\\" diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index cbc488a39f02..68c8bd3f75e4 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -27,7 +27,7 @@ #include <osl/profile.h> //================================================================================================== -// ----------------------------------------------------------------------------- + namespace osl_Profile { class oldtests : public CppUnit::TestFixture @@ -76,10 +76,10 @@ void oldtests::test_profile(void) } // namespace osl_Profile -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION( osl_Profile::oldtests ); -// ----------------------------------------------------------------------------- + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/security/osl_Security.cxx b/sal/qa/osl/security/osl_Security.cxx index 3e6ddf5261e5..54fb89c7d435 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------ + // header file -//------------------------------------------------------------------------ + #ifdef WNT #include <windows.h> #undef min @@ -33,9 +33,9 @@ using namespace osl; using namespace rtl; -//------------------------------------------------------------------------ + // helper functions and classes -//------------------------------------------------------------------------ + /** print Boolean value. */ @@ -57,9 +57,9 @@ inline void printUString( const ::rtl::OUString & str ) } -//------------------------------------------------------------------------ + // test code start here -//------------------------------------------------------------------------ + namespace osl_Security { @@ -310,7 +310,7 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class loginUserOnFileServer -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::logonUser); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getUserIdent); @@ -321,7 +321,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::loginUserOnFileServer); -// ----------------------------------------------------------------------------- + } // namespace osl_Security diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index 30390fd72ac8..5a70fdacf600 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -43,9 +43,9 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <cppunit/TestFixture.h> @@ -63,9 +63,9 @@ using ::rtl::OUString; #define IP_PORT_MYPORT4 8885 #define IP_PORT_MYPORT3 8884 -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + // just used to test socket::close() when accepting class AcceptorThread : public Thread @@ -238,7 +238,7 @@ namespace osl_AcceptorSocket }; // class listen_accept -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::ctors); //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket"); @@ -246,7 +246,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::listen_accept); } // namespace osl_AcceptorSocket -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index 50f19b19d5af..1765b3d394a1 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -43,9 +43,9 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <cppunit/TestFixture.h> @@ -62,9 +62,9 @@ using ::rtl::OUString; #define IP_PORT_FTP 21 #define IP_PORT_MYPORT3 8884 -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + class CloseSocketThread : public Thread { @@ -242,14 +242,14 @@ namespace osl_ConnectorSocket }; // class connect -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::connect); } // namespace osl_ConnectorSocket -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 9bfe6234b596..b72a4d289449 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -60,9 +60,9 @@ using ::rtl::OUString; const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + class CloseSocketThread : public Thread { @@ -88,9 +88,9 @@ public: } }; -//------------------------------------------------------------------------ + // tests cases begins here -//------------------------------------------------------------------------ + namespace osl_DatagramSocket { @@ -293,14 +293,14 @@ public: }; // class sendTo_recvFrom -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); } // namespace osl_DatagramSocket -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 7f126f6ad24e..f1597a329e14 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -44,9 +44,9 @@ */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <osl_Socket_Const_orig.h> @@ -79,9 +79,9 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + /** compare two OUString. */ @@ -450,7 +450,7 @@ public: } }; -// ----------------------------------------------------------------------------- + // Helper functions, to create buffers, check buffers class ValueCheckProvider { @@ -504,7 +504,7 @@ public: }; -// ----------------------------------------------------------------------------- + /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -647,7 +647,7 @@ public: }; -// ----------------------------------------------------------------------------- + // just used to test socket::close() when accepting class AcceptorThread : public Thread { @@ -726,9 +726,9 @@ public: } }; -//------------------------------------------------------------------------ + // tests cases begins here -//------------------------------------------------------------------------ + namespace osl_SocketAddr { @@ -1468,7 +1468,7 @@ namespace osl_SocketAddr }; // class gettheServicePort -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::ctors, "osl_SocketAddr"); @@ -2773,7 +2773,7 @@ namespace osl_Socket }; // class getHandle -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::ctors, "osl_Socket"); @@ -3175,7 +3175,7 @@ protected: CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::ctors, "osl_StreamSocket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::send_recv, "osl_StreamSocket"); @@ -3337,7 +3337,7 @@ namespace osl_ConnectorSocket }; // class connect -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::ctors, "osl_ConnectorSocket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_ConnectorSocket"); @@ -3467,7 +3467,7 @@ namespace osl_AcceptorSocket }; // class listen_accept -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::ctors, "osl_AcceptorSocket"); //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket"); @@ -3677,7 +3677,7 @@ public: }; // class sendTo_recvFrom -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); @@ -3685,7 +3685,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); } // namespace osl_DatagramSocket -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index 86fdf91ec7ea..f8f005a5371e 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -67,9 +67,9 @@ using ::rtl::OUString; #define IP_PORT_MYPORT8 8896 #define IP_PORT_MYPORT9 8897 -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + // just used to test socket::close() when accepting class AcceptorThread : public Thread @@ -1411,7 +1411,7 @@ namespace osl_Socket }; // class getHandle -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::ctors); @@ -1435,7 +1435,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getHandle); } // namespace osl_Socket -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 50e6c16743fb..3a64cfc18551 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -850,7 +850,7 @@ namespace osl_SocketAddr }; // class getFamilyOfSocketAddr -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::ctors); @@ -870,7 +870,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr); } // namespace osl_SocketAddr -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 83b556da1c78..21384786e83b 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <osl_Socket_Const.h> @@ -27,13 +27,13 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> #include <osl/socket.hxx> -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ + + // tests cases begins here -//------------------------------------------------------------------------ + namespace osl_Socket { @@ -59,7 +59,7 @@ namespace osl_Socket } -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 42fb7e156e22..0d1e56d40547 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -62,9 +62,9 @@ using ::rtl::OString; const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + // just used to test socket::close() when accepting class AcceptorThread : public Thread @@ -256,7 +256,7 @@ public: }; -// ----------------------------------------------------------------------------- + // Helper functions, to create buffers, check buffers class ValueCheckProvider { @@ -309,7 +309,7 @@ public: }; -// ----------------------------------------------------------------------------- + /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -487,7 +487,7 @@ public: } }; -// ----------------------------------------------------------------------------- + namespace osl_StreamSocket { @@ -692,7 +692,7 @@ namespace osl_StreamSocket CPPUNIT_TEST_SUITE_END(); }; // class send_recv -// ----------------------------------------------------------------------------- + class SendClientThread : public Thread { @@ -897,7 +897,7 @@ namespace osl_StreamSocket CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending -// ----------------------------------------------------------------------------- + /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -1017,7 +1017,7 @@ namespace osl_StreamSocket }; - // ----------------------------------------------------------------------------- + class justtest : public CppUnit::TestFixture { @@ -1075,7 +1075,7 @@ namespace osl_StreamSocket aSocket.close(); } - // ----------------------------------------------------------------------------- + void send_Connector(rtl::OString const& _sAddr, osl::Condition &/*_aCondition*/ ) { @@ -1178,7 +1178,7 @@ namespace osl_StreamSocket send_Connector_2_margritte(sAddr); } - // ----------------------------------------------------------------------------- + void send_recv() { @@ -1372,7 +1372,7 @@ namespace osl_StreamSocket aSocket.close(); } -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::send_recv); @@ -1383,7 +1383,7 @@ namespace osl_StreamSocket } // namespace osl_StreamSocket -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 217cc89afabc..3f822fa46d42 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -35,14 +35,14 @@ # define t_print printf #endif -//------------------------------------------------------------------------ + // Ip version definition -//------------------------------------------------------------------------ + #define IP_VER 4 /// currently only IPv4 is considered. -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + /** compare two OUString. */ diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 6737fdcba39e..2bfa2f52355d 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -134,7 +134,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::TestZeroMemory); } // namespace rtl_alloc diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index f80777b9dc80..4e39fbdf7095 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -135,7 +135,7 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) #endif } -// ----------------------------------------------------------------------------- + namespace rtl_Bootstrap { @@ -767,7 +767,7 @@ namespace rtl_Bootstrap } // namespace rtl_Bootstrap -// ----------------------------------------------------------------------------- + static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString const& _sContent) { @@ -800,7 +800,7 @@ static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString co OSL_ASSERT(t_fileExist(_suFileURL) == true); } -// ----------------------------------------------------------------------------- + static void create_rtlrc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -823,7 +823,7 @@ static void create_rtlrc() removeAndCreateFile(aFileURL, sLines); } -// ----------------------------------------------------------------------------- + static void create_testshl2rc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -862,7 +862,7 @@ static void create_testshl2rc() SAL_CONFIGFILE("rtl")); } -// ----------------------------------------------------------------------------- + static void create_pseudorc() { @@ -880,7 +880,7 @@ static void create_pseudorc() removeAndCreateFile(aFileURL, sLines); } -// ----------------------------------------------------------------------------- + void create_bootstrap_processrc() { rtl::OUString aDirURL(getModulePath()); @@ -896,7 +896,7 @@ void create_bootstrap_processrc() removeAndCreateFile(aDirURL, sLines); } -// ----------------------------------------------------------------------------- + void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc) { diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 18b1f5134577..3c1b51ca4065 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -27,7 +27,7 @@ #include <rtl/strbuf.hxx> #include <rtl/cipher.h> -// ----------------------------------------------------------------------------- + namespace rtl_cipher { @@ -103,7 +103,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class createBF : public CppUnit::TestFixture { public: @@ -151,7 +151,7 @@ public: CPPUNIT_TEST(createBF_004); CPPUNIT_TEST_SUITE_END(); }; // class createBF -// ----------------------------------------------------------------------------- + class decode : public CppUnit::TestFixture { public: @@ -288,7 +288,7 @@ public: CPPUNIT_TEST(decode_002); CPPUNIT_TEST_SUITE_END(); }; // class decode -// ----------------------------------------------------------------------------- + class decodeBF : public CppUnit::TestFixture { public: @@ -312,7 +312,7 @@ public: CPPUNIT_TEST(decodeBF_001); CPPUNIT_TEST_SUITE_END(); }; // class decodeBF -// ----------------------------------------------------------------------------- + class destroy : public CppUnit::TestFixture { public: @@ -339,7 +339,7 @@ public: CPPUNIT_TEST(destroy_001); CPPUNIT_TEST_SUITE_END(); }; // class destroy -// ----------------------------------------------------------------------------- + class destroyBF : public CppUnit::TestFixture { public: @@ -368,7 +368,7 @@ public: CPPUNIT_TEST(destroyBF_001); CPPUNIT_TEST_SUITE_END(); }; // class destroyBF -// ----------------------------------------------------------------------------- + class encode : public CppUnit::TestFixture { public: @@ -441,7 +441,7 @@ public: CPPUNIT_TEST(encode_001); CPPUNIT_TEST_SUITE_END(); }; // class encode -// ----------------------------------------------------------------------------- + class encodeBF : public CppUnit::TestFixture { public: @@ -465,7 +465,7 @@ public: CPPUNIT_TEST(encodeBF_001); CPPUNIT_TEST_SUITE_END(); }; // class encodeBF -// ----------------------------------------------------------------------------- + class init : public CppUnit::TestFixture { public: @@ -578,7 +578,7 @@ public: CPPUNIT_TEST(init_004); CPPUNIT_TEST_SUITE_END(); }; // class init -// ----------------------------------------------------------------------------- + class initBF : public CppUnit::TestFixture { public: @@ -605,7 +605,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class initBF -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::create); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::createBF); @@ -621,7 +621,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::initBF); } // namespace rtl_cipher -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 3ac869cc4e3a..63e68d73c8c9 100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -159,12 +159,12 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class test -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_CRC32::test); } // namespace rtl_CRC32 -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 3d4353fb2d19..b41929236603 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -62,7 +62,7 @@ rtl::OUString CreateMD5FromString( const rtl::OUString& aMsg ) return rtl::OUString(); } -// ----------------------------------------------------------------------------- + namespace rtl_digest { @@ -151,7 +151,7 @@ public: -// ----------------------------------------------------------------------------- + class createMD5 : public CppUnit::TestFixture { @@ -180,7 +180,7 @@ public: }; // class create -// ----------------------------------------------------------------------------- + class createMD2 : public CppUnit::TestFixture { @@ -208,7 +208,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class createSHA : public CppUnit::TestFixture { @@ -235,7 +235,7 @@ public: CPPUNIT_TEST(createSHA_001); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class createSHA1 : public CppUnit::TestFixture { @@ -262,7 +262,7 @@ public: CPPUNIT_TEST(createSHA1_001); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class createHMAC_MD5 : public CppUnit::TestFixture { @@ -289,7 +289,7 @@ public: CPPUNIT_TEST(createHMAC_MD5_001); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class createHMAC_SHA1 : public CppUnit::TestFixture { @@ -319,7 +319,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class queryAlgorithm : public CppUnit::TestFixture { @@ -413,7 +413,7 @@ public: }; // class create -// ----------------------------------------------------------------------------- + class queryLength : public CppUnit::TestFixture { public: @@ -513,7 +513,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + rtl::OString createHex(sal_uInt8 *_pMD5KeyBuffer, sal_uInt32 _nMD5KeyLen) { @@ -531,7 +531,7 @@ rtl::OString createHex(sal_uInt8 *_pMD5KeyBuffer, sal_uInt32 _nMD5KeyLen) } -// ----------------------------------------------------------------------------- + class init : public CppUnit::TestFixture { public: @@ -564,7 +564,7 @@ public: rtl_digest_destroy( handle ); } - // ------------------------------------ + void init_MD2() { rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD2 ); @@ -755,7 +755,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class init -// ------------------------------------ + rtl::OString getMD5Sum(rtl::OString const& _aMsg ) { @@ -778,7 +778,7 @@ rtl::OString getMD5Sum(rtl::OString const& _aMsg ) return aMD5Sum; } -// ----------------------------------------------------------------------------- + class equalTests : public CppUnit::TestFixture { @@ -792,7 +792,7 @@ public: { } - // ------------------------------------ + void equal_001() { rtl::OString aMsg1 = sSampleString; @@ -804,7 +804,7 @@ public: CPPUNIT_ASSERT_MESSAGE("md5sum must have a length", aMsgMD5Sum1.getLength() == 32 && aMsgMD5Sum2.getLength() == 32 ); CPPUNIT_ASSERT_MESSAGE("source is the same, dest must be also the same", aMsgMD5Sum1.equals(aMsgMD5Sum2) == sal_True); } - // ------------------------------------ + void equal_002() { rtl::OString aMsg1 = sSampleString; @@ -828,7 +828,7 @@ public: }; // class create -// ----------------------------------------------------------------------------- + class digest_MD2 : public CppUnit::TestFixture { public: @@ -841,7 +841,7 @@ public: { } - // ------------------------------------ + void MD2_001() { rtl::OString aMsg1 = sSampleString; @@ -872,7 +872,7 @@ public: CPPUNIT_TEST( MD2_001 ); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class digest_MD5 : public CppUnit::TestFixture { public: @@ -884,7 +884,7 @@ public: void tearDown() { } - // ------------------------------------ + void MD5_001() { rtl::OString aMsg1 = sSampleString; @@ -916,7 +916,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class digest_SHA : public CppUnit::TestFixture { public: @@ -929,7 +929,7 @@ public: { } - // ------------------------------------ + void SHA_001() { rtl::OString aMsg1 = sSampleString; @@ -961,7 +961,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class digest_SHA1 : public CppUnit::TestFixture { public: @@ -974,7 +974,7 @@ public: { } - // ------------------------------------ + void SHA1_001() { rtl::OString aMsg1 = sSampleString; @@ -1004,7 +1004,7 @@ public: CPPUNIT_TEST( SHA1_001 ); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class digest_HMAC_MD5 : public CppUnit::TestFixture { public: @@ -1017,7 +1017,7 @@ public: { } - // ------------------------------------ + void HMAC_MD5_001() { rtl::OString aMsg1 = sSampleString; @@ -1051,7 +1051,7 @@ public: CPPUNIT_TEST( HMAC_MD5_001 ); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class digest_HMAC_SHA1 : public CppUnit::TestFixture { public: @@ -1064,7 +1064,7 @@ public: { } - // ------------------------------------ + void HMAC_SHA1_001() { rtl::OString aMsg1 = sSampleString; @@ -1099,7 +1099,7 @@ public: CPPUNIT_TEST( HMAC_SHA1_001 ); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class digest_PBKDF2 : public CppUnit::TestFixture { public: @@ -1112,7 +1112,7 @@ public: { } - // ------------------------------------ + rtl::OString /* key */ run_check_PBKDF2(rtl::OString const& _sPassword, bool _bClearSalt, sal_uInt32 _nCount) { sal_uInt32 nKeyLen = RTL_DIGEST_LENGTH_HMAC_SHA1; @@ -1173,7 +1173,7 @@ public: CPPUNIT_TEST( PBKDF2_001 ); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class update : public CppUnit::TestFixture { @@ -1301,7 +1301,7 @@ public: CPPUNIT_TEST(updateHMAC_SHA1_000); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class get : public CppUnit::TestFixture { @@ -1375,7 +1375,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + class destroy : public CppUnit::TestFixture { public: @@ -1406,7 +1406,7 @@ public: CPPUNIT_TEST(destroy_001); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::create); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_digest::createMD2); diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 462a549e7440..169c0d8ab337 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------------ + // include files -//------------------------------------------------------------------------ + #include <sal/types.h> #include <osl/thread.hxx> @@ -39,7 +39,7 @@ #include <time.h> #endif -// ----------------------------------------------------------------------------- + #define CONST_TEST_STRING "gregorian" namespace { @@ -50,7 +50,7 @@ struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> { }; } -// ----------------------------------------------------------------------------- + namespace ThreadHelper { // typedef enum { @@ -81,7 +81,7 @@ namespace ThreadHelper } } -// ----------------------------------------------------------------------------- + /** Simple thread for testing Thread-create. * Just add 1 of value 0, and after running, result is 1. @@ -142,7 +142,7 @@ public: } }; -// ----------------------------------------------------------------------------- + namespace rtl_DoubleLocking { @@ -238,7 +238,7 @@ namespace rtl_DoubleLocking CPPUNIT_TEST(getValue_002); CPPUNIT_TEST_SUITE_END(); }; // class create -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_DoubleLocking::getValue); } // namespace rtl_DoubleLocking diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index 85941d9b9e3a..6c7127844f09 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -300,7 +300,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class equals -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getDefault); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::setDefault); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::getLanguage); @@ -311,7 +311,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::equals); } // namespace rtl_locale -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx index 0f0f311ba8f2..460d001be5fc 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -93,7 +93,7 @@ inline ::rtl::OUString getCurrentPID( ) } -// ----------------------------------------------------------------------------- + /* * LLA: * check if logfile is create @@ -196,10 +196,10 @@ namespace rtl_logfile } // namespace rtl_logfile -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION( rtl_logfile::logfile); -// ----------------------------------------------------------------------------- + CPPUNIT_PLUGIN_IMPLEMENT(); //~ do some clean up work after all test completed. diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx index 0ea73cdcbd43..e0fd0a26a40f 100644 --- a/sal/qa/rtl/ostring/rtl_OString2.cxx +++ b/sal/qa/rtl/ostring/rtl_OString2.cxx @@ -198,9 +198,9 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class valueOf -// ----------------------------------------------------------------------------- + // - toDouble (tests) -// ----------------------------------------------------------------------------- + class toDouble : public CppUnit::TestFixture { @@ -351,9 +351,9 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class toDouble -// ----------------------------------------------------------------------------- + // - getToken (tests) -// ----------------------------------------------------------------------------- + class getToken : public CppUnit::TestFixture { @@ -368,7 +368,7 @@ public: { } - // ----------------------------------------------------------------------------- + void getToken_000() { @@ -463,10 +463,10 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getToken -// ----------------------------------------------------------------------------- + // testing the method replaceAt( sal_Int32 index, sal_Int32 count, // const OString& newStr ) -// ----------------------------------------------------------------------------- + // Developer note: Mindy Liu, 2004-04-23 // stollen from sal/qa/rtl_strings/rtl_OString.cxx @@ -494,7 +494,7 @@ public: sal_Bool bRes = ( expVal->compareTo(aStr1) == 0 ); return bRes; } - // ----------------------------------------------------------------------------- + void replaceAt_001() { @@ -543,7 +543,7 @@ public: }; // class replaceAt -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::valueOf); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::toDouble); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::getToken); @@ -552,7 +552,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::replaceAt); } // namespace rtl_OString -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 6bb2be638fb0..2f871da395ab 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -147,7 +147,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compareIgnoreAsciiCase -// ----------------------------------------------------------------------------- + class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { @@ -232,7 +232,7 @@ namespace rtl_str }; // class compare -// ----------------------------------------------------------------------------- + class hashCode : public CppUnit::TestFixture { @@ -286,7 +286,7 @@ namespace rtl_str }; // class compare -// ----------------------------------------------------------------------------- + class indexOfChar : public CppUnit::TestFixture { @@ -333,7 +333,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare -// ----------------------------------------------------------------------------- + class lastIndexOfChar : public CppUnit::TestFixture { public: @@ -380,7 +380,7 @@ namespace rtl_str }; // class lastIndexOfChar -// ----------------------------------------------------------------------------- + class indexOfStr : public CppUnit::TestFixture { @@ -432,7 +432,7 @@ namespace rtl_str CPPUNIT_TEST(indexOfStr_002); CPPUNIT_TEST_SUITE_END(); }; // class compare -// ----------------------------------------------------------------------------- + class lastIndexOfStr : public CppUnit::TestFixture @@ -497,7 +497,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfStr -// ----------------------------------------------------------------------------- + class replaceChar : public CppUnit::TestFixture { @@ -533,7 +533,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar -// ----------------------------------------------------------------------------- + class replaceChar_WithLength : public CppUnit::TestFixture { @@ -575,7 +575,7 @@ namespace rtl_str }; // class replaceChar -// ----------------------------------------------------------------------------- + class toAsciiLowerCase : public CppUnit::TestFixture { @@ -647,7 +647,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar -// ----------------------------------------------------------------------------- + class toAsciiUpperCase : public CppUnit::TestFixture { @@ -720,7 +720,7 @@ namespace rtl_str }; // class replaceChar - // ----------------------------------------------------------------------------- + class trim_WithLength : public CppUnit::TestFixture { @@ -822,7 +822,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; - // ----------------------------------------------------------------------------- + class valueOfChar : public CppUnit::TestFixture { @@ -854,7 +854,7 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compare); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::compareIgnoreAsciiCase); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::shortenedCompareIgnoreAsciiCase_WithLength); @@ -878,7 +878,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_str::valueOfChar); } // namespace rtl_str -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index bdf50f0441e3..a8b2244217ad 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -60,7 +60,7 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class getLength -// ----------------------------------------------------------------------------- + class newFromString : public CppUnit::TestFixture { @@ -94,7 +94,7 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class newFromString - // ----------------------------------------------------------------------------- + class convertUStringToString : public CppUnit::TestFixture { @@ -166,12 +166,12 @@ namespace rtl_string } // namespace rtl_string -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::getLength); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::newFromString); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_string::convertUStringToString); -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 2654e3dc0f3e..7e6721160546 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -237,9 +237,9 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class number -//------------------------------------------------------------------------ + // testing the method toDouble() -//------------------------------------------------------------------------ + template<class T> sal_Int16 SAL_CALL checkPrecisionSize() { @@ -977,7 +977,7 @@ void convertToString::test() { } // - string construction & interning (tests) -// ----------------------------------------------------------------------------- + class construction : public CppUnit::TestFixture { public: diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index 07b3ba6f22c2..9235a910c7c4 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -161,7 +161,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compareIgnoreAsciiCase -// ----------------------------------------------------------------------------- + class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { @@ -246,7 +246,7 @@ namespace rtl_ustr }; // class compare -// // ----------------------------------------------------------------------------- +// // // class hashCode : public CppUnit::TestFixture // { @@ -301,7 +301,7 @@ namespace rtl_ustr // }; // class compare // // -// // ----------------------------------------------------------------------------- +// // class indexOfChar : public CppUnit::TestFixture { @@ -348,7 +348,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class indexOfChar -// // ----------------------------------------------------------------------------- +// class lastIndexOfChar : public CppUnit::TestFixture { public: @@ -395,7 +395,7 @@ namespace rtl_ustr }; // class lastIndexOfChar -// ----------------------------------------------------------------------------- + class indexOfStr : public CppUnit::TestFixture { @@ -452,7 +452,7 @@ namespace rtl_ustr CPPUNIT_TEST(indexOfStr_002); CPPUNIT_TEST_SUITE_END(); }; // class compare -// ----------------------------------------------------------------------------- + class lastIndexOfStr : public CppUnit::TestFixture @@ -517,7 +517,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfStr -// ----------------------------------------------------------------------------- + class replaceChar : public CppUnit::TestFixture { @@ -556,7 +556,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar -// ----------------------------------------------------------------------------- + class replaceChar_WithLength : public CppUnit::TestFixture { @@ -618,7 +618,7 @@ namespace rtl_ustr }; // class replaceChar -// ----------------------------------------------------------------------------- + class toAsciiLowerCase : public CppUnit::TestFixture { @@ -700,7 +700,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar -// ----------------------------------------------------------------------------- + class toAsciiUpperCase : public CppUnit::TestFixture { @@ -778,7 +778,7 @@ namespace rtl_ustr }; // class replaceChar - // ----------------------------------------------------------------------------- + class trim_WithLength : public CppUnit::TestFixture { @@ -887,7 +887,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - // ----------------------------------------------------------------------------- + class valueOfChar : public CppUnit::TestFixture { @@ -1067,7 +1067,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_shortenedCompareIgnoreAsciiCase_WithLength -// ----------------------------------------------------------------------------- + class ascii_compareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { @@ -1133,7 +1133,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase_WithLength -// ----------------------------------------------------------------------------- + class ascii_compare : public CppUnit::TestFixture { @@ -1191,7 +1191,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compare -// ----------------------------------------------------------------------------- + class ascii_compareIgnoreAsciiCase : public CppUnit::TestFixture { @@ -1377,7 +1377,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::compare); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::compareIgnoreAsciiCase); @@ -1409,7 +1409,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_ustr::ascii_shortenedCompareIgnoreAsciiCase_ } // namespace rtl_ustr -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions("") // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index 93d0769830ad..f9606d4d778f 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -394,7 +394,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getBytes -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::createPool); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::destroyPool); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_random::addBytes); diff --git a/sal/qa/rtl/textenc/rtl_tencinfo.cxx b/sal/qa/rtl/textenc/rtl_tencinfo.cxx index dd1e24490a19..f7917a7f2bc4 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -467,7 +467,7 @@ namespace CPPUNIT_TEST_SUITE_END( ); }; - // ----------------------------------------------------------------------------- + class testBestUnix : public CppUnit::TestFixture { diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index f91747326746..e8c4e764b72c 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -28,11 +28,11 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -// ----------------------------------------------------------------------------- + namespace Stringtest { - // ----------------------------------------------------------------------------- + class Convert : public CppUnit::TestFixture { diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index df41381ed549..dc3b60f159b1 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -204,7 +204,7 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createUuid); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_Uuid::createNamedUuid); } // namespace rtl_Uuid -// ----------------------------------------------------------------------------- + // this macro creates an empty function, which will called by the RegisterAllFunctions() // to let the user the possibility to also register some functions by hand. diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx index 915301943fe9..22069c9acbe7 100644 --- a/sal/qa/systools/test_comtools.cxx +++ b/sal/qa/systools/test_comtools.cxx @@ -228,7 +228,7 @@ namespace test_comtools CPPUNIT_TEST_SUITE_END(); }; -// ----------------------------------------------------------------------------- + CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReference, "test_comtools"); } // namespace rtl_OUString diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 43275c37d55c..e33df5e1d2ef 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -116,7 +116,7 @@ rtl::OUString recursivelyExpandMacros( } -//---------------------------------------------------------------------------- + struct rtl_bootstrap_NameValue { @@ -156,7 +156,7 @@ namespace { public rtl::Static< NameValueList, rtl_bootstrap_set_list > {}; } -//---------------------------------------------------------------------------- + static bool getFromCommandLineArgs( rtl::OUString const & key, rtl::OUString * value ) @@ -219,7 +219,7 @@ static bool getFromCommandLineArgs( return found; } -//---------------------------------------------------------------------------- + extern "C" oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( rtl_uString ** ppFileURL) SAL_THROW_EXTERN_C(); @@ -229,7 +229,7 @@ inline void getExecutableFile_Impl (rtl_uString ** ppFileURL) osl_bootstrap_getExecutableFile_Impl (ppFileURL); } -//---------------------------------------------------------------------------- + static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL) { @@ -242,7 +242,7 @@ static void getExecutableDirectory_Impl (rtl_uString ** ppDirURL) rtl_uString_newFromStr_WithLength(ppDirURL,fileName.getStr(),nDirEnd); } -//---------------------------------------------------------------------------- + static OUString & getIniFileName_Impl() { @@ -309,7 +309,7 @@ static OUString & getIniFileName_Impl() return *pStaticName; } -//---------------------------------------------------------------------------- + // #111772# // ensure the given file url has no final slash @@ -353,7 +353,7 @@ struct Bootstrap_Impl ExpandRequestLink const * requestStack) const; }; -//---------------------------------------------------------------------------- + Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) : _nRefCount( 0 ), @@ -420,7 +420,7 @@ Bootstrap_Impl::Bootstrap_Impl( OUString const & rIniName ) #endif /* OSL_DEBUG_LEVEL > 1 */ } -//---------------------------------------------------------------------------- + Bootstrap_Impl::~Bootstrap_Impl() { @@ -428,7 +428,7 @@ Bootstrap_Impl::~Bootstrap_Impl() rtl_bootstrap_args_close( _base_ini ); } -//---------------------------------------------------------------------------- + namespace { @@ -657,7 +657,7 @@ bootstrap_map::t * bootstrap_map::m_map = NULL; } -//---------------------------------------------------------------------------- + rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open ( rtl_uString * pIniName @@ -713,7 +713,7 @@ rtlBootstrapHandle SAL_CALL rtl_bootstrap_args_open ( return static_cast< rtlBootstrapHandle >( that ); } -//---------------------------------------------------------------------------- + void SAL_CALL rtl_bootstrap_args_close ( rtlBootstrapHandle handle @@ -750,7 +750,7 @@ void SAL_CALL rtl_bootstrap_args_close ( } } -//---------------------------------------------------------------------------- + sal_Bool SAL_CALL rtl_bootstrap_get_from_handle( rtlBootstrapHandle handle, @@ -773,7 +773,7 @@ sal_Bool SAL_CALL rtl_bootstrap_get_from_handle( return found; } -//---------------------------------------------------------------------------- + void SAL_CALL rtl_bootstrap_get_iniName_from_handle ( rtlBootstrapHandle handle, @@ -795,7 +795,7 @@ void SAL_CALL rtl_bootstrap_get_iniName_from_handle ( } } -//---------------------------------------------------------------------------- + void SAL_CALL rtl_bootstrap_setIniFileName ( rtl_uString * pName @@ -806,7 +806,7 @@ void SAL_CALL rtl_bootstrap_setIniFileName ( file = pName; } -//---------------------------------------------------------------------------- + sal_Bool SAL_CALL rtl_bootstrap_get ( rtl_uString * pName, @@ -817,7 +817,7 @@ sal_Bool SAL_CALL rtl_bootstrap_get ( return rtl_bootstrap_get_from_handle(0, pName, ppValue, pDefault); } -//---------------------------------------------------------------------------- + void SAL_CALL rtl_bootstrap_set ( rtl_uString * pName, @@ -852,7 +852,7 @@ void SAL_CALL rtl_bootstrap_set ( r_rtl_bootstrap_set_list.push_back( rtl_bootstrap_NameValue( name, value ) ); } -//---------------------------------------------------------------------------- + void SAL_CALL rtl_bootstrap_expandMacros_from_handle ( rtlBootstrapHandle handle, @@ -868,7 +868,7 @@ void SAL_CALL rtl_bootstrap_expandMacros_from_handle ( rtl_uString_assign( macro, expanded.pData ); } -//---------------------------------------------------------------------------- + void SAL_CALL rtl_bootstrap_expandMacros( rtl_uString ** macro ) diff --git a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx index 317bc460273a..063cccdcf022 100644 --- a/sal/workben/clipboardwben/testcopy/XTDataObject.cxx +++ b/sal/workben/clipboardwben/testcopy/XTDataObject.cxx @@ -24,35 +24,35 @@ #include <windows.h> #include <ole2.h> -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + //============================================================================ // OTWrapperDataObject //============================================================================ -//------------------------------------------------------------------------ + // ctor -//------------------------------------------------------------------------ + CXTDataObject::CXTDataObject( LONG nRefCntInitVal ) : m_nRefCnt( nRefCntInitVal ) { } -//------------------------------------------------------------------------ + // dtor -//------------------------------------------------------------------------ + CXTDataObject::~CXTDataObject( ) { } -//------------------------------------------------------------------------ + // IUnknown->QueryInterface -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) { @@ -75,18 +75,18 @@ STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject ) return hr; } -//------------------------------------------------------------------------ + // IUnknown->AddRef -//------------------------------------------------------------------------ + STDMETHODIMP_(ULONG) CXTDataObject::AddRef( ) { return static_cast< ULONG >( InterlockedIncrement( &m_nRefCnt ) ); } -//------------------------------------------------------------------------ + // IUnknown->Release -//------------------------------------------------------------------------ + STDMETHODIMP_(ULONG) CXTDataObject::Release( ) { @@ -103,10 +103,10 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( ) return nRefCnt; } -//------------------------------------------------------------------------ + // IDataObject->GetData // warning: 'goto' ahead (to easy error handling without using exceptions) -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) { @@ -178,9 +178,9 @@ STDMETHODIMP CXTDataObject::GetData(LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium return hr; } -//------------------------------------------------------------------------ + // IDataObject->EnumFormatEtc -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) { @@ -201,72 +201,72 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** p return hr; } -//------------------------------------------------------------------------ + // IDataObject->QueryGetData -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // IDataObject->GetDataHere -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // IDataObject->GetCanonicalFormatEtc -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // IDataObject->SetData -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // IDataObject->DAdvise -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // IDataObject->DUnadvise -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::DUnadvise( DWORD ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // IDataObject->EnumDAdvise -//------------------------------------------------------------------------ + STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * ) { return E_NOTIMPL; } -//------------------------------------------------------------------------ + // for our convenience -//------------------------------------------------------------------------ + CXTDataObject::operator IDataObject*( ) { @@ -279,9 +279,9 @@ CXTDataObject::operator IDataObject*( ) //============================================================================ -//---------------------------------------------------------------------------- + // ctor -//---------------------------------------------------------------------------- + CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) : m_nRefCnt( 0 ), @@ -292,17 +292,17 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN pUnkDataObj ) : m_cfFormats[1] = CF_TEXT; } -//---------------------------------------------------------------------------- + // dtor -//---------------------------------------------------------------------------- + CEnumFormatEtc::~CEnumFormatEtc( ) { } -//---------------------------------------------------------------------------- + // IUnknown->QueryInterface -//---------------------------------------------------------------------------- + STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject ) { @@ -323,9 +323,9 @@ STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject ) return hr; } -//---------------------------------------------------------------------------- + // IUnknown->AddRef -//---------------------------------------------------------------------------- + STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( ) { @@ -334,9 +334,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::AddRef( ) return InterlockedIncrement( &m_nRefCnt ); } -//---------------------------------------------------------------------------- + // IUnknown->Release -//---------------------------------------------------------------------------- + STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( ) { @@ -353,9 +353,9 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( ) return nRefCnt; } -//---------------------------------------------------------------------------- + // IEnumFORMATETC->Next -//---------------------------------------------------------------------------- + STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFetched ) { @@ -397,9 +397,9 @@ STDMETHODIMP CEnumFormatEtc::Next( ULONG celt, LPFORMATETC rgelt, ULONG* pceltFe return hr; } -//---------------------------------------------------------------------------- + // IEnumFORMATETC->Skip -//---------------------------------------------------------------------------- + STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt ) { @@ -414,9 +414,9 @@ STDMETHODIMP CEnumFormatEtc::Skip( ULONG celt ) return hr; } -//---------------------------------------------------------------------------- + // IEnumFORMATETC->Reset -//---------------------------------------------------------------------------- + STDMETHODIMP CEnumFormatEtc::Reset( ) { @@ -424,9 +424,9 @@ STDMETHODIMP CEnumFormatEtc::Reset( ) return S_OK; } -//---------------------------------------------------------------------------- + // IEnumFORMATETC->Clone -//---------------------------------------------------------------------------- + STDMETHODIMP CEnumFormatEtc::Clone( IEnumFORMATETC** ppenum ) { diff --git a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx index 030faaa9d98e..b359d48687ff 100644 --- a/sal/workben/clipboardwben/testcopy/cbcpytest.cxx +++ b/sal/workben/clipboardwben/testcopy/cbcpytest.cxx @@ -67,9 +67,9 @@ HWND g_hWnd; HANDLE g_hEvent; BOOL g_bEnd; -//---------------------------------------------------- + // a thread function -//---------------------------------------------------- + unsigned int _stdcall ThreadProc(LPVOID pParam) { @@ -82,9 +82,9 @@ unsigned int _stdcall ThreadProc(LPVOID pParam) return 0; } -//---------------------------------------------------- + // WinMain -//---------------------------------------------------- + int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -142,7 +142,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, -//---------------------------------------------------------------- + // FUNCTION: MyRegisterClass() // // PURPOSE: Registers the window class. @@ -152,7 +152,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, // needs to be compatible with Win32 systems prior to 'RegisterClassEx' // function, which was added to Windows 95. If it important to call // this function to allow the use of small icons in the correct proportions. -//---------------------------------------------------------------- + ATOM MyRegisterClass( HINSTANCE hInstance ) { @@ -175,7 +175,7 @@ ATOM MyRegisterClass( HINSTANCE hInstance ) return RegisterClassEx(&wcex); } -//---------------------------------------------------------------- + // FUNCTION: InitInstance(HANDLE, int) // // PURPOSE: Saves instance access number and creates main window @@ -183,7 +183,7 @@ ATOM MyRegisterClass( HINSTANCE hInstance ) // Comments: // In this function, the instance access number is stored in a global variable // and the main program window is displayed. -//---------------------------------------------------------------- + BOOL InitInstance( HINSTANCE hInstance, int nCmdShow ) { @@ -203,7 +203,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow ) return TRUE; } -//---------------------------------------------------------------- + // FUNCTION: WndProc(HWND, unsigned, WORD, LONG) // // PURPOSE: Processes messages for the main window. @@ -211,7 +211,7 @@ BOOL InitInstance( HINSTANCE hInstance, int nCmdShow ) // WM_COMMAND - Handle application menu // WM_PAINT - Display main windows // WM_DESTROY - Output completion message and return -//---------------------------------------------------------------- + LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { @@ -279,9 +279,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) return 0; } -//---------------------------------------------- + // copy data into the clipboard -//---------------------------------------------- + void CopyClipboardData( HWND hWnd ) { @@ -293,9 +293,9 @@ void CopyClipboardData( HWND hWnd ) #endif } -//---------------------------------------------- + // flush the content into the clipboard -//---------------------------------------------- + void FlushClipboard( ) { diff --git a/sal/workben/clipboardwben/testpaste/cbptest.cxx b/sal/workben/clipboardwben/testpaste/cbptest.cxx index 9db93203d006..f4cf9cd94ea2 100644 --- a/sal/workben/clipboardwben/testpaste/cbptest.cxx +++ b/sal/workben/clipboardwben/testpaste/cbptest.cxx @@ -55,9 +55,9 @@ LPSTREAM g_pStm = NULL; char* pTextBuff = NULL; DWORD lData = 0; -//---------------------------------------------------- + // a thread function -//---------------------------------------------------- + unsigned int _stdcall ThreadProc(LPVOID pParam) { @@ -119,9 +119,9 @@ unsigned int _stdcall ThreadProc(LPVOID pParam) return 0; } -//---------------------------------------------------- + // WinMain -//---------------------------------------------------- + int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, @@ -348,9 +348,9 @@ void PasteClipboardData2(HWND hwndParent) } } -//---------------------------------------------------- + // clipboard handling -//---------------------------------------------------- + /* void PasteClipboardData(HWND hwndParent) diff --git a/sal/workben/clipboardwben/testviewer/cbvtest.cxx b/sal/workben/clipboardwben/testviewer/cbvtest.cxx index 663a083cc99d..e39a71e6405e 100644 --- a/sal/workben/clipboardwben/testviewer/cbvtest.cxx +++ b/sal/workben/clipboardwben/testviewer/cbvtest.cxx @@ -65,9 +65,9 @@ void CALLBACK OnClipboardContentChange( void ); LRESULT CALLBACK WndProc( HWND, UINT, WPARAM, LPARAM ); LRESULT CALLBACK About( HWND, UINT, WPARAM, LPARAM ); -//---------------------------------------------------- + // WinMain -//---------------------------------------------------- + int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, diff --git a/sal/workben/testfile.cxx b/sal/workben/testfile.cxx index f4b1df974112..b4392a4136b1 100644 --- a/sal/workben/testfile.cxx +++ b/sal/workben/testfile.cxx @@ -78,9 +78,9 @@ void printFileName(const ::rtl::OUString& str) return; } -//-------------------------------------------------- + // Initialization -//-------------------------------------------------- + sal_Bool testLineBreak( sal_Char *pCount , sal_uInt64 nLen , sal_uInt32 *cLineBreak ) { @@ -267,9 +267,9 @@ sal_Bool Initialize( void ) return sal_True; } -//-------------------------------------------------- + // Shutdown -//-------------------------------------------------- + sal_Bool Shutdown( void ) { @@ -318,9 +318,9 @@ sal_Bool Shutdown( void ) return fSuccess; } -//-------------------------------------------------- + // helper functions -//-------------------------------------------------- + // Show FileType void showFileType( FileStatus::Type aType ) @@ -440,9 +440,9 @@ TimeValue getSystemTime() } -//-------------------------------------------------- + // DirectoryOpenAndCloseTest -//-------------------------------------------------- + void DirectoryOpenAndCloseTest( void ) { @@ -453,9 +453,9 @@ void DirectoryOpenAndCloseTest( void ) printf( "Directory-Open-And-Close-Test\n"); printf( "--------------------------------------------\n\n"); - //-------------------------------------------------- + // open an existing directory - //-------------------------------------------------- + pDir=new Directory( dir1 ); printf( "Open an existing directory: "); @@ -477,9 +477,9 @@ void DirectoryOpenAndCloseTest( void ) delete pDir; printf( "\n" ); - //-------------------------------------------------- + // open a not existing directory - //-------------------------------------------------- + pDir=new Directory( dir_not_exist ); @@ -495,9 +495,9 @@ void DirectoryOpenAndCloseTest( void ) printf( "\n" ); - //-------------------------------------------------- + // open a directory with a wrong semantic - //-------------------------------------------------- + pDir=new Directory( dir_wrong_semantic ); printf( "Open a directory with a wrong semantic: "); @@ -511,9 +511,9 @@ void DirectoryOpenAndCloseTest( void ) printf( "\n" ); - //-------------------------------------------------- + // open an existing directory on a server - //-------------------------------------------------- + pDir=new Directory( dir_on_server ); @@ -531,9 +531,9 @@ void DirectoryOpenAndCloseTest( void ) delete pDir; printf( "\n" ); - //-------------------------------------------------- + // open a not existing directory on a server - //-------------------------------------------------- + pDir=new Directory( dir_not_exist_on_server ); @@ -547,9 +547,9 @@ void DirectoryOpenAndCloseTest( void ) delete pDir; printf( "\n" ); - //-------------------------------------------------- + // Close a not existing directory - //-------------------------------------------------- + pDir=new Directory( dir_not_exist ); printf( "Close a not existing directory: "); @@ -564,9 +564,9 @@ void DirectoryOpenAndCloseTest( void ) } -//-------------------------------------------------- + // DirectoryCreateAndRemoveTest -//-------------------------------------------------- + void DirectoryCreateAndRemoveTest( void ) { @@ -577,9 +577,9 @@ void DirectoryCreateAndRemoveTest( void ) printf( "Directory-Create-And-Remove-Test\n" ); printf( "--------------------------------------------\n\n" ); - //-------------------------------------------------- + // Create directory - //-------------------------------------------------- + printf( "Create a not existing directory: "); printFileName( dir_not_exist ); printf( "\n" ); @@ -597,9 +597,9 @@ void DirectoryCreateAndRemoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Create a directory on a server - //-------------------------------------------------- + printf( "Create a not existing directory on a server: "); printFileName( dir_not_exist_on_server ); @@ -617,9 +617,9 @@ void DirectoryCreateAndRemoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Remove Directories - //-------------------------------------------------- + printf( "Remove the created directories: \n" ); @@ -636,9 +636,9 @@ void DirectoryCreateAndRemoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Remove a not existing directory - //-------------------------------------------------- + printf( "Remove a not existing directory: "); printFileName( dir_not_exist ); @@ -651,9 +651,9 @@ void DirectoryCreateAndRemoveTest( void ) return; } -//-------------------------------------------------- + // FileOpenAndCloseTest -//-------------------------------------------------- + static void FileOpenAndCloseTest( void ) { @@ -671,41 +671,41 @@ static void FileOpenAndCloseTest( void ) printFileName( file1 ); printf( "\n" ); - //-------------------------------------------------- + // open an existing file (Read) - //-------------------------------------------------- + rc=pFile->open( osl_File_OpenFlag_Read ); print_error( rtl::OString( "Open File (Read)" ), rc ); - //-------------------------------------------------- + // close the file - //-------------------------------------------------- + rc=pFile->close(); print_error( rtl::OString( "Close File" ), rc ); printf( "\n" ); - //-------------------------------------------------- + // open an existing file (Write) - //-------------------------------------------------- + rc=pFile->open( osl_File_OpenFlag_Write ); print_error( rtl::OString( "Open File (Write)" ), rc ); - //-------------------------------------------------- + // close the file - //-------------------------------------------------- + rc=pFile->close(); print_error( rtl::OString( "Close File" ), rc ); printf( "\n" ); - //-------------------------------------------------- + // close the file a second time - //-------------------------------------------------- + rc=pFile->close(); print_error( rtl::OString( "Close the file a second time" ), rc ); @@ -714,9 +714,9 @@ static void FileOpenAndCloseTest( void ) PressKey(); } -//-------------------------------------------------- + // FileCreateAndRemoveTest -//-------------------------------------------------- + void FileCreateAndRemoveTest() { @@ -733,39 +733,39 @@ void FileCreateAndRemoveTest() printFileName( file_not_exist ); printf( "\n" ); - //---------------------------------------------------- + // open (create) a not existing file (Read and write) - //---------------------------------------------------- + rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); print_error( rtl::OString( "Create and Open File (Read & Write)" ), rc ); - //---------------------------------------------------- + // close the file - //---------------------------------------------------- + rc=pFile->close(); print_error( rtl::OString( "Close File" ), rc ); - //---------------------------------------------------- + // remove the file - //---------------------------------------------------- + rc=pFile->remove( file_not_exist ); print_error( rtl::OString(" Remove File" ), rc ); printf( "\n" ); - //---------------------------------------------------- + // remove the same file a second time - //---------------------------------------------------- + rc=pFile->remove( file_not_exist ); print_error( rtl::OString( "Remove a not existing File" ), rc ); - //---------------------------------------------------- + // remove an open file - //---------------------------------------------------- + pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); @@ -780,9 +780,9 @@ void FileCreateAndRemoveTest() return; } -//-------------------------------------------------- + // FileWriteAndReadTest -//-------------------------------------------------- + void FileWriteAndReadTest( void ) { @@ -806,9 +806,9 @@ void FileWriteAndReadTest( void ) printFileName( file_not_exist ); printf("\n"); - //---------------------------------------------------- + // open (create) a not existing file (Read and write) - //---------------------------------------------------- + rc = pFile->open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write | osl_File_OpenFlag_Create ); @@ -816,9 +816,9 @@ void FileWriteAndReadTest( void ) printf( "\n" ); - //---------------------------------------------------- + // write a string to the file - //---------------------------------------------------- + rc=pFile->write( pWriteBuffer , nLen , uWritten ); print_error( rtl::OString( "Write File" ), rc ); @@ -829,18 +829,18 @@ void FileWriteAndReadTest( void ) printf( "\n" ); - //---------------------------------------------------- + // move the filepointer to the beginning - //---------------------------------------------------- + rc=pFile->setPos( osl_Pos_Absolut , 0 ); print_error( rtl::OString( "Set FilePointer to the beginning of the file" ), rc ); printf( "\n" ); - //---------------------------------------------------- + // read the string - //---------------------------------------------------- + pReadBuffer=(sal_Char*) rtl_allocateMemory( (sal_uInt32)(nLen+1)*sizeof(sal_Char) ); memset( pReadBuffer, 0, (sal_uInt32)(nLen+1)*sizeof(sal_Char) ); @@ -873,9 +873,9 @@ void FileWriteAndReadTest( void ) } -//-------------------------------------------------- + // FileCopyMoveTest -//-------------------------------------------------- + void FileCopyAndMoveTest( void ) { @@ -889,9 +889,9 @@ void FileCopyAndMoveTest( void ) File *pFile; rtl::OUString destPath(dir2); - //-------------------------------------------------- + // FileCopyTest - //-------------------------------------------------- + destPath+=rtl::OUString("/"); destPath+=file3; @@ -922,9 +922,9 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Copy a file to a not existing directory - //-------------------------------------------------- + destPath=rtl::OUString( dir_not_exist ); destPath+=rtl::OUString("/"); @@ -940,9 +940,9 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Copy a directory - //-------------------------------------------------- + printf( "Copy the directory: "); printFileName( dir1 ); @@ -955,9 +955,9 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // FileMoveTest - //-------------------------------------------------- + destPath=rtl::OUString( dir2 ); destPath+=rtl::OUString("/"); @@ -1004,9 +1004,9 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Move a file to a not existing directory - //-------------------------------------------------- + destPath=rtl::OUString( dir_not_exist ); destPath+=rtl::OUString("/"); @@ -1024,9 +1024,9 @@ void FileCopyAndMoveTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Move a directory - //-------------------------------------------------- + printf( "Move a directory: \n"); @@ -1050,9 +1050,9 @@ void FileCopyAndMoveTest( void ) return; } -//---------------------------------------------------- + // FileSizeTest -//---------------------------------------------------- + void FileSizeTest( void ) { @@ -1077,9 +1077,9 @@ void FileSizeTest( void ) if ( rc == FileBase::E_None ) { - //---------------------------------------------------- + // Set Filesize to 5000 - //---------------------------------------------------- + printf( "Set FileSize to 5000\n" ); rc=aFile.setSize( 5000 ); @@ -1088,9 +1088,9 @@ void FileSizeTest( void ) printf( "\n" ); printf( "Verify:\n" ); - //---------------------------------------------------- + // Check whether Filesize is set to 5000 - //---------------------------------------------------- + rc=DirectoryItem::get( file_not_exist, aItem ); print_error( rtl::OString( "Get DirectoryItem" ), rc ); @@ -1114,9 +1114,9 @@ void FileSizeTest( void ) printf( "\n" ); - //---------------------------------------------------- + // Set Filesize to -1 - //---------------------------------------------------- + printf( "Set FileSize to -1\n" ); rc=aFile.setSize( -1 ); @@ -1139,9 +1139,9 @@ void FileSizeTest( void ) } -//---------------------------------------------------- + // FilePointerTest -//---------------------------------------------------- + void FilePointerTest( void ) { @@ -1166,9 +1166,9 @@ void FilePointerTest( void ) if ( rc==FileBase::E_None ) { - //---------------------------------------------------- + // get the position of the filepointer - //---------------------------------------------------- + rc =rFile.getPos( filepointer ); print_error( rtl::OString( "GetPos" ), rc ); @@ -1176,9 +1176,9 @@ void FilePointerTest( void ) printf( "\n" ); - //---------------------------------------------------- + // set the filepointer at the end of a file - //---------------------------------------------------- + printf( "Set FileSize to 5000\n" ); rFile.setSize( 5000 ); @@ -1218,9 +1218,9 @@ void FilePointerTest( void ) return; } -//-------------------------------------------------- + // FileAttributesTest -//-------------------------------------------------- + void verifyFileAttributes( void ) { @@ -1408,9 +1408,9 @@ void FileAttributesTest( void ) } #endif -//-------------------------------------------------- + // FileTimeTest -//-------------------------------------------------- + void FileTimeTest( void ) { @@ -1472,17 +1472,17 @@ void FileTimeTest( void ) printf( "\nModifyTime \t : "); showTime( aModifyTime ); - //-------------------------------------------------- + // setTime - //-------------------------------------------------- + printf( "\n" ); rc=File::setTime( file1 , aCreationTime , aAccessTime , aModifyTime ); print_error( rtl::OString( "SetTime" ), rc ); - //-------------------------------------------------- + // Verify - //-------------------------------------------------- + FileStatus rStatus( osl_FileStatus_Mask_CreationTime | osl_FileStatus_Mask_AccessTime | osl_FileStatus_Mask_ModifyTime); @@ -1499,9 +1499,9 @@ void FileTimeTest( void ) if ( rc==FileBase::E_None ) { - //-------------------------------------------------- + // GetCreationTime - //-------------------------------------------------- + aCreationTimeRead=rStatus.getCreationTime(); #ifdef WNT @@ -1513,9 +1513,9 @@ void FileTimeTest( void ) showTime( aCreationTimeRead ); printf( "\n" ); #endif - //-------------------------------------------------- + // GetAccessTime - //-------------------------------------------------- + aAccessTimeRead=rStatus.getAccessTime(); @@ -1527,9 +1527,9 @@ void FileTimeTest( void ) showTime( aAccessTimeRead ); printf( "\n" ); - //-------------------------------------------------- + // GetModifyTime - //-------------------------------------------------- + aModifyTimeRead=rStatus.getModifyTime(); @@ -1548,9 +1548,9 @@ void FileTimeTest( void ) } -//-------------------------------------------------- + // DirectoryItemTest -//-------------------------------------------------- + void DirectoryItemTest( void ) { @@ -1564,9 +1564,9 @@ void DirectoryItemTest( void ) printf( "Directory-Item-Test\n" ); printf( "--------------------------------------------\n\n" ); - //-------------------------------------------------- + // get DirectoryItem from an existing directory - //-------------------------------------------------- + printf( "Get DirectoryItem from an existing Directory: "); printFileName( dir1 ); @@ -1589,9 +1589,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //-------------------------------------------------- + // get DirectoryItem from a not existing directory - //-------------------------------------------------- + printf( "Get DirectoryItem from a not existing Directory: "); printFileName( dir_not_exist ); @@ -1602,9 +1602,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //-------------------------------------------------- + // get DirectoryItem from an existing file - //-------------------------------------------------- + printf( "Get DirectoryItem from an existing File: "); printFileName( file1 ); @@ -1627,9 +1627,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //-------------------------------------------------- + // get DirectoryItem from a not existing file - //-------------------------------------------------- + printf( "Get DirectoryItem from a not existing File: "); printFileName( file_not_exist ); @@ -1640,9 +1640,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //---------------------------------------------------------- + // get DirectoryItem from a directory with a wrong semantic - //---------------------------------------------------------- + printf( "Get DirectoryItem from a Directory with a wrong semantic: "); printFileName( dir_not_exist ); @@ -1653,9 +1653,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //--------------------------------------------------- + // get DirectoryItem from a file-handle - //-------------------------------------------------- + pFile=new File( file1 ); @@ -1688,9 +1688,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //--------------------------------------------------- + // get DirectoryItem - //-------------------------------------------------- + printf( "Get DirectoryItem from an empty File-Handle\n" ); rc=DirectoryItem::get( file1 , aItem ); @@ -1698,9 +1698,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //-------------------------------------------------- + // GetNextItem from a directory - //-------------------------------------------------- + pDir=new Directory( dir1 ); printf( "Get next DirectoryItem from a directory: "); @@ -1714,9 +1714,9 @@ void DirectoryItemTest( void ) if ( pDir->isOpen() ) { - //-------------------------------------------------- + // get all files from the directory - //-------------------------------------------------- + rtl::OUString str; rtl::OUString str1[2]; @@ -1743,9 +1743,9 @@ void DirectoryItemTest( void ) printf( "\n" ); - //-------------------------------------------------- + // Reset-Test - //-------------------------------------------------- + for (int i=0; i<2; i++) { @@ -1774,9 +1774,9 @@ void DirectoryItemTest( void ) printf( "\n"); - //-------------------------------------------------- + // GetNextItem from a closed directory - //-------------------------------------------------- + printf( "Get next DirectoryItem from a closed directory: "); printFileName( dir1 ); @@ -1792,15 +1792,15 @@ void DirectoryItemTest( void ) return; } -//-------------------------------------------------- + // FileStatusTest (for different types) -//-------------------------------------------------- + void FileStatusTest( FileStatus *pStatus ) { - //-------------------------------------------------- + // GetFileType of the directory - //-------------------------------------------------- + FileStatus::Type aType; @@ -1808,9 +1808,9 @@ void FileStatusTest( FileStatus *pStatus ) aType=pStatus->getFileType(); showFileType( aType ); - //-------------------------------------------------- + // GetAttributes - //-------------------------------------------------- + sal_uInt64 uAttributes; @@ -1818,9 +1818,9 @@ void FileStatusTest( FileStatus *pStatus ) uAttributes=pStatus->getAttributes(); showAttributes( uAttributes ); - //-------------------------------------------------- + // GetCreationTime - //-------------------------------------------------- + TimeValue aCreationTime; @@ -1830,9 +1830,9 @@ void FileStatusTest( FileStatus *pStatus ) printf( "CreationTime: " ); showTime( aCreationTime ); - //-------------------------------------------------- + // GetAccessTime - //-------------------------------------------------- + TimeValue aAccessTime; @@ -1842,9 +1842,9 @@ void FileStatusTest( FileStatus *pStatus ) printf( "AccessTime: " ); showTime( aAccessTime ); - //-------------------------------------------------- + // GetModifyTime - //-------------------------------------------------- + TimeValue aModifyTime; @@ -1854,9 +1854,9 @@ void FileStatusTest( FileStatus *pStatus ) printf( "ModifyTime: " ); showTime( aModifyTime ); - //-------------------------------------------------- + // GetFileSize - //-------------------------------------------------- + sal_uInt64 FileSize; @@ -1865,9 +1865,9 @@ void FileStatusTest( FileStatus *pStatus ) FileSize=pStatus->getFileSize(); printf( "FileSize: %" SAL_PRIuUINT64 "\n", FileSize); - //-------------------------------------------------- + // GetFileName - //-------------------------------------------------- + rtl::OUString FileName; @@ -1878,9 +1878,9 @@ void FileStatusTest( FileStatus *pStatus ) printFileName( FileName ); printf( "\n" ); - //-------------------------------------------------- + // GetFileURL - //-------------------------------------------------- + rtl::OUString FileURL; @@ -1891,9 +1891,9 @@ void FileStatusTest( FileStatus *pStatus ) printFileName( FileURL ); printf( "\n" ); - //-------------------------------------------------- + // GetLinkTargetURL - //-------------------------------------------------- + rtl::OUString LinkTargetURL; @@ -1907,9 +1907,9 @@ void FileStatusTest( FileStatus *pStatus ) return; } -//-------------------------------------------------- + // DirectoryFileStatusTest -//-------------------------------------------------- + void DirectoryFileStatusTest( void ) { @@ -1946,9 +1946,9 @@ void DirectoryFileStatusTest( void ) return; } -//-------------------------------------------------- + // FileFileStatusTest -//-------------------------------------------------- + void FileFileStatusTest( void ) { @@ -1985,9 +1985,9 @@ void FileFileStatusTest( void ) return; } -//-------------------------------------------------- + // VolumeFileStatusTest -//-------------------------------------------------- + void VolumeFileStatusTest( void ) { @@ -2025,9 +2025,9 @@ void VolumeFileStatusTest( void ) } -//-------------------------------------------------- + // VolumeInfoTest -//-------------------------------------------------- + void VolumeInfoTest( void ) { @@ -2048,67 +2048,67 @@ void VolumeInfoTest( void ) printf( "\n" ); - //-------------------------------------------------- + // getRemoteFlag - //-------------------------------------------------- + if ( rInfo.getRemoteFlag() ) printf( "RemoteFlag: Yes\n" ); else printf( "RemoteFlag: No\n" ); - //-------------------------------------------------- + // getRemoveableFlag - //-------------------------------------------------- + if ( rInfo.getRemoveableFlag() ) printf( "RemoveableFlag: Yes\n" ); else printf( "RemoveableFlag: No\n" ); - //-------------------------------------------------- + // getTotalSpace - //-------------------------------------------------- + sal_uInt64 TotalSpace; TotalSpace=rInfo.getTotalSpace(); printf( "Total Space: %" SAL_PRIuUINT64 "\n",TotalSpace ); - //-------------------------------------------------- + // getFreeSpace - //-------------------------------------------------- + sal_uInt64 FreeSpace; FreeSpace=rInfo.getFreeSpace(); printf( "Free Space: %" SAL_PRIuUINT64 "\n",FreeSpace ); - //-------------------------------------------------- + // getUsedSpace - //-------------------------------------------------- + sal_uInt64 UsedSpace; UsedSpace=rInfo.getUsedSpace(); printf( "Used Space: %" SAL_PRIuUINT64 "\n",UsedSpace ); - //-------------------------------------------------- + // getMaxNameLength - //-------------------------------------------------- + sal_uInt32 MaxNameLength; MaxNameLength=rInfo.getMaxNameLength(); printf( "MaxNameLength: %" SAL_PRIuUINT32 "\n",MaxNameLength ); - //-------------------------------------------------- + // getMaxPathLength - //-------------------------------------------------- + sal_uInt32 MaxPathLength; MaxPathLength=rInfo.getMaxPathLength(); printf( "MaxPathLength: %" SAL_PRIuUINT32 "\n",MaxPathLength ); - //-------------------------------------------------- + // getFileSystemName - //-------------------------------------------------- + rtl::OUString FileSystemName; FileSystemName=rInfo.getFileSystemName(); @@ -2120,9 +2120,9 @@ void VolumeInfoTest( void ) return; } -//-------------------------------------------------- + // FileBaseTest -//-------------------------------------------------- + void ConvertPathTest(rtl::OUString& strPath) { @@ -2133,9 +2133,9 @@ void ConvertPathTest(rtl::OUString& strPath) rtl::OUString strNormPathFromFileURL; rtl::OUString strSystemPath; - //-------------------------------------------------- + // normalizePath - //-------------------------------------------------- + rc=FileBase::getFileURLFromSystemPath( strPath, strNormPath ); @@ -2148,9 +2148,9 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "normalizePath: Error \n" ); - //-------------------------------------------------- + // getFileURLFromSystemPath - //-------------------------------------------------- + if ( !strNormPath.isEmpty() ) { @@ -2168,9 +2168,9 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "getFileURLFromSystemPath: not tested \n" ); - //-------------------------------------------------- + // getNormalizedPathFromFileURL - //-------------------------------------------------- + if ( !strFileURL.isEmpty() ) { @@ -2189,9 +2189,9 @@ void ConvertPathTest(rtl::OUString& strPath) printf( "getNormalizedPathFromFileURL: not tested \n" ); - //-------------------------------------------------- + // getSystemPathFromFileURL - //-------------------------------------------------- + if ( !strNormPath.isEmpty() ) { @@ -2209,9 +2209,9 @@ void ConvertPathTest(rtl::OUString& strPath) else printf( "getSystemPathFromFileURL: not tested \n" ); - //-------------------------------------------------- + // Verify - //-------------------------------------------------- + if ( strNormPathFromFileURL == strNormPath ) printf( "\nVerify: OK ! ( Normalized-Path == Normalized-Path-From-File-URL )\n" ); @@ -2227,9 +2227,9 @@ void FileBaseTest() printf( "FileBase-Test\n" ); printf( "--------------------------------------------\n\n" ); - //-------------------------------------------------- + // ConvertPath-Test (Local File) - //-------------------------------------------------- + printf( "- Local File: "); printFileName( file1 ); @@ -2237,9 +2237,9 @@ void FileBaseTest() ConvertPathTest(file1); - //-------------------------------------------------- + // ConvertPath-Test (File on a server) - //-------------------------------------------------- + printf( "\n- File on server: "); printFileName( file_on_server ); @@ -2252,9 +2252,9 @@ void FileBaseTest() } -//-------------------------------------------------- + // AbsolutePathTest -//-------------------------------------------------- + void DoAbsolutePathTest(rtl::OUString strDirBase, rtl::OUString strRelative) { FileBase::RC rc; @@ -2304,9 +2304,9 @@ void AbsolutePathTest(void) } -//-------------------------------------------------- + // searchPathTest -//-------------------------------------------------- + void SearchPathTest(void) { @@ -2327,9 +2327,9 @@ void SearchPathTest(void) rc=FileBase::getSystemPathFromFileURL( strNormPath, strSystemPath ); print_error( rtl::OString( "getSystemPathFromFileURL" ), rc ); - //-------------------------------------------------- + // searchFileURL (with a normalized path) - //-------------------------------------------------- + if ( !strNormPath.isEmpty() ) { @@ -2351,9 +2351,9 @@ void SearchPathTest(void) else printf( "searchFileURL (with a normalized path): not tested\n" ); - //-------------------------------------------------- + // searchFileURL (with a File-URL) - //-------------------------------------------------- + if ( !strFileURL.isEmpty() ) { @@ -2375,9 +2375,9 @@ void SearchPathTest(void) else printf( "searchFileURL (with a FileURL path): not tested\n" ); - //-------------------------------------------------- + // searchFileURL (with a systempath) - //-------------------------------------------------- + if ( !strSystemPath.isEmpty() ) { @@ -2399,9 +2399,9 @@ void SearchPathTest(void) else printf( "searchFileURL (with a systempath): not tested\n" ); - //-------------------------------------------------- + // searchFileURL (File and no searchpath) - //-------------------------------------------------- + printf( "\nsearchFileURL: File (no searchpath) : "); printFileName( file3 ); @@ -2418,9 +2418,9 @@ void SearchPathTest(void) else printf( "searchFileURL: File not found: OK ! \n" ); - //-------------------------------------------------- + // searchFileURL (File and Path) - //-------------------------------------------------- + printf( "\nsearchFileURL: File : "); printFileName( file3 ); @@ -2439,9 +2439,9 @@ void SearchPathTest(void) else printf( "searchFileURL: File not found: Error\n" ); - //------------------------------------------------------------ + // searchFileURL (File and searchpath with two entries) - //------------------------------------------------------------ + rtl::OUString strSearchPath( dir_not_exist ); strSearchPath+=rtl::OUString(";"); @@ -2464,9 +2464,9 @@ void SearchPathTest(void) else printf( "searchFileURL: File not found: Error\n" ); - //------------------------------------------------------------------- + // searchFileURL (File and searchpath (with a wrong semantic)) - //------------------------------------------------------------------- + strSearchPath=rtl::OUString( dir_wrong_semantic ); @@ -2486,9 +2486,9 @@ void SearchPathTest(void) return; } -//-------------------------------------------------- + // CanonicalNameTest -//-------------------------------------------------- + void getCanonicalNameTest(rtl::OUString strPath) { @@ -2531,9 +2531,9 @@ void CanonicalNameTest(void) return; } -//-------------------------------------------------- + // print_error -//-------------------------------------------------- + void print_error( const ::rtl::OString& str, FileBase::RC rc ) { @@ -2680,9 +2680,9 @@ void print_error( const ::rtl::OString& str, FileBase::RC rc ) return; } -//-------------------------------------------------- + // main -//-------------------------------------------------- + #if defined WNT #define MAIN _cdecl main #else |