diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-03 10:00:55 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-03 10:00:55 +0300 |
commit | 335cd830b0bd430d282687df58a91a69dac2c528 (patch) | |
tree | 3d49d43ed0c07d643b9fd081e6eb0522b57851c2 /sal/qa | |
parent | c04f4393f5ec63dbd546b5c503ddc82d9cd2377e (diff) |
Kill superfluous vertical whitespace
Change-Id: I8c37b9ec45836f9c0e2dc0cf232f96f23c7c36d3
Diffstat (limited to 'sal/qa')
57 files changed, 0 insertions, 878 deletions
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index dabfb3afb9d6..7491bcf3a292 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -34,10 +34,8 @@ using ::rtl::OString; // This file contains cppunit tests for the // OString and OStringBuffer classes - // testing constructors - namespace rtl_OStringBuffer { class ctors : public CppUnit::TestFixture @@ -166,8 +164,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class makeStringAndClear : public CppUnit::TestFixture { OString* arrOUS[6]; @@ -325,7 +321,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - class remove : public CppUnit::TestFixture { public: @@ -371,9 +366,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - - class getLength : public CppUnit::TestFixture { OString* arrOUS[6]; @@ -505,8 +497,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class getCapacity : public CppUnit::TestFixture { OString* arrOUS[6]; @@ -690,7 +680,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - class ensureCapacity : public CppUnit::TestFixture { void ensureCapacity_001() @@ -969,8 +958,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class setLength : public CppUnit::TestFixture { OString* arrOUS[6]; @@ -1459,8 +1446,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class csuc : public CppUnit::TestFixture { void csuc_001() @@ -1505,8 +1490,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class getStr : public CppUnit::TestFixture { void getStr_001() @@ -1551,8 +1534,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class append_001 : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -1960,8 +1941,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - - class append_002 : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -2348,7 +2327,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - class append_003 : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -2734,7 +2712,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - class append_004 : public CppUnit::TestFixture { OString* arrOUS[5]; @@ -14031,7 +14008,6 @@ namespace rtl_OStringBuffer aStrBuf.append( intVal, -5 ); - CPPUNIT_ASSERT_MESSAGE ( "Appends the WrongRadix to the string buffer arrOUS[0]", @@ -16179,7 +16155,6 @@ namespace rtl_OStringBuffer // testing the method append( double d ) - class checkdouble : public CppUnit::TestFixture { public: @@ -16257,7 +16232,6 @@ namespace rtl_OStringBuffer CPPUNIT_TEST_SUITE_END(); }; - // testing the method append( double f ) for negative value class append_009_Double_Negative : public checkdouble @@ -16320,7 +16294,6 @@ 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_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index 19e25c1d25f3..c0c647eb757b 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -294,8 +294,6 @@ static const sal_Int32 kSInt32Max = INT_MAX; static const sal_Int64 kUInt32Max = UINT_MAX; static const sal_Int64 kSInt64Max = SAL_CONST_INT64(9223372036854775807); - - static const sal_Int32 kInt32MaxNumsCount = 5; static const sal_Int32 kInt32MaxNums[kInt32MaxNumsCount] = @@ -319,26 +317,18 @@ static const sal_Int32 kBinaryNumsCount = 16; static const sal_Int32 kBinaryMaxNumsCount = 7; - - static const sal_Int32 kOctolNumsCount = 16; static const sal_Int32 kOctolMaxNumsCount = 7; - - static const sal_Int32 kDecimalNumsCount = 16; static const sal_Int32 kDecimalMaxNumsCount = 7; - - static const sal_Int32 kHexDecimalNumsCount = 16; static const sal_Int32 kHexDecimalMaxNumsCount = 7; - - static const sal_Int32 kBase36NumsCount = 36; static const sal_Int32 kBase36MaxNumsCount = 7; diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx index 592935f16a6b..04404660cf3b 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx @@ -77,7 +77,6 @@ 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; @@ -126,7 +125,6 @@ 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/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index 276e3a29ebfc..3a674a8c64df 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -39,17 +39,12 @@ bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ); sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); - sal_uInt32 AStringLen( const sal_Char *pAStr ); - - bool AStringNIsValid( const sal_Char *pAStr, const sal_uInt32 nStrLen ); - - sal_Int32 AStringToUStringCompare( const sal_Unicode *pUStr, const sal_Char *pAStr ); @@ -64,9 +59,4 @@ sal_Int32 AStringToUStringNCompare( const sal_Unicode *pUStr, #endif /* _RTL_STRING_UTILS_HXX */ - - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h index e855199455b9..301c8a9f9b3c 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Utils_Const.h @@ -42,6 +42,4 @@ static const sal_Int32 kErrCompareNAStringToString = -9; #endif /* _RTL_STRING_UTILS_CONST_H_ */ - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/condition/osl_Condition.cxx b/sal/qa/osl/condition/osl_Condition.cxx index 417cc3bfb853..1f1a14b180e7 100644 --- a/sal/qa/osl/condition/osl_Condition.cxx +++ b/sal/qa/osl/condition/osl_Condition.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // include files #include <osl_Condition_Const.h> @@ -27,11 +25,8 @@ using namespace osl; using namespace rtl; - - // helper functions and classes - /** print Boolean value. */ inline void printBool( bool bOk ) @@ -92,11 +87,8 @@ protected: } }; - - // test code start here - namespace osl_Condition { @@ -133,7 +125,6 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the method: void set() */ @@ -171,14 +162,12 @@ namespace osl_Condition bRes && !bRes1 && bRes2 ); } - CPPUNIT_TEST_SUITE( set ); CPPUNIT_TEST( set_001 ); CPPUNIT_TEST( set_002 ); CPPUNIT_TEST_SUITE_END( ); }; // class set - /** testing the method: void reset() */ @@ -223,7 +212,6 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class reset - /** testing the method: Result wait(const TimeValue *pTimeout = 0) */ @@ -246,7 +234,6 @@ namespace osl_Condition delete tv1; } - void wait_001( ) { ::osl::Condition cond1; @@ -291,7 +278,6 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // class wait - /** testing the method: sal_Bool check() */ @@ -338,21 +324,14 @@ namespace osl_Condition CPPUNIT_TEST_SUITE_END( ); }; // 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(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index e2f746a5cbc9..88df6384f362 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -39,14 +39,12 @@ #define OSLTEST_DECLARE_USTRING( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( str_value ) - // condition names OSLTEST_DECLARE_USTRING( TestCon, "testcondition" ); const char pTestString[17] = "Sun Microsystems"; - #endif /* _OSL_CONDITION_CONST_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index df9d3a5046b3..fcf3a8b15739 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include <sal/types.h> @@ -47,10 +46,8 @@ using ::rtl::OUStringToOString; using ::rtl::OString; using ::rtl::OStringToOUString; - // helper functions - /** detailed wrong message. */ inline ::rtl::OString errorToString( const ::osl::FileBase::RC _nError ) @@ -458,7 +455,6 @@ inline void deleteTestDirectory( const ::rtl::OUString& basename, const ::rtl::O deleteTestDirectory( aBaseURL ); } - /** Check for the file and directory access right. */ typedef enum { @@ -636,21 +632,16 @@ inline void changeFileMode( ::rtl::OUString & filepath, sal_Int32 mode ) 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 { //::osl::FileBase aFileBase; @@ -884,7 +875,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class SystemPath_FileURL - // if bDirection==sal_True, check getSystemPathFromFileURL // if bDirection==sal_False, check getFileURLFromSystemPath void SystemPath_FileURL::check_SystemPath_FileURL(rtl::OString const& _sSource, ::osl::FileBase::RC _nAssumeError, rtl::OString const& _sAssumeResultStr, bool bDirection) @@ -1190,10 +1180,6 @@ namespace osl_FileBase // start with "~user", not impletment // void SystemPath_FileURL::getFileURLFromSystemPath_006() - - - - // testing the method // static inline RC searchFileURL( const ::rtl::OUString& ustrFileName, // const ::rtl::OUString& ustrSearchPath, @@ -1253,7 +1239,6 @@ namespace osl_FileBase bOk1 && bOk2 && bOk3 && bOk4 ); } - void searchFileURL_003() { OSLTEST_DECLARE( SystemPathList, TEST_PLATFORM_ROOT ":" TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ":" TEST_PLATFORM_ROOT "system/path" ); @@ -1292,8 +1277,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class searchFileURL - - // testing the method // static inline RC getTempDirURL( ::rtl::OUString& ustrTempDirURL ) @@ -1337,8 +1320,6 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_END(); };// class getTempDirURL - - // testing the method // static inline RC createTempFile( ::rtl::OUString* pustrDirectoryURL, // oslFileHandle* pHandle, @@ -1450,7 +1431,6 @@ 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" ); @@ -1459,14 +1439,11 @@ namespace osl_FileBase CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileBase::createTempFile, "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 ) @@ -1562,8 +1539,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class ctors - - // testing the method // inline sal_Bool isValid( sal_uInt32 nMask ) const @@ -1642,7 +1617,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class isValid - // testing the method // inline sal_Bool getRemoteFlag() const @@ -1693,7 +1667,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRemoteFlag - // testing the method // inline sal_Bool getRemoveableFlag() const @@ -1733,8 +1706,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRemoveableFlag - - // testing the method // inline sal_Bool getCompactDiscFlag() const @@ -1774,8 +1745,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getCompactDiscFlag - - // testing the method // inline sal_Bool getFloppyDiskFlag() const @@ -1815,8 +1784,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFloppyDiskFlag - - // testing the method // inline sal_Bool getFixedDiskFlag() const @@ -1856,7 +1823,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFixedDiskFlag - // testing the method // inline sal_Bool getRAMDiskFlag() const @@ -1896,8 +1862,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getRAMDiskFlag - - // testing the method // inline sal_uInt64 getTotalSpace() const @@ -1942,8 +1906,6 @@ namespace osl_VolumeInfo } #endif - - #if defined(SOLARIS) void getTotalSpace_003() { @@ -1979,7 +1941,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getTotalSpace - // testing the method // inline sal_uInt64 getFreeSpace() const @@ -2024,7 +1985,6 @@ namespace osl_VolumeInfo } #endif - #if defined(SOLARIS) void getFreeSpace_003() { @@ -2053,7 +2013,6 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getFreeSpace ); CPPUNIT_TEST( getFreeSpace_001 ); CPPUNIT_TEST( getFreeSpace_002 ); @@ -2061,7 +2020,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getFreeSpace - // testing the method // inline sal_uInt64 getUsedSpace() const @@ -2106,7 +2064,6 @@ namespace osl_VolumeInfo } #endif - #if defined(SOLARIS) void getUsedSpace_003() { @@ -2117,7 +2074,6 @@ namespace osl_VolumeInfo statvfs( name, &aStatFS); sal_uInt64 UsedSpace = ( aStatFS.f_blocks - aStatFS.f_bavail ) * aStatFS.f_frsize; - sal_Int32 mask = osl_VolumeInfo_Mask_UsedSpace; ::osl::VolumeInfo aVolumeInfo( mask ); nError1 = ::osl::Directory::getVolumeInfo( aVolURL1, aVolumeInfo ); @@ -2136,7 +2092,6 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getUsedSpace ); CPPUNIT_TEST( getUsedSpace_001 ); CPPUNIT_TEST( getUsedSpace_002 ); @@ -2144,8 +2099,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getUsedSpace - - // testing the method // inline sal_uInt32 getMaxNameLength() const @@ -2169,7 +2122,6 @@ namespace osl_VolumeInfo 0 != uiMaxNameLength ); } - #if defined(UNX) && !defined(ANDROID) void getMaxNameLength_002() { @@ -2204,8 +2156,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// class getMaxNameLength - - // testing the method // inline sal_uInt32 getMaxPathLength() const @@ -2229,7 +2179,6 @@ namespace osl_VolumeInfo 0 != uiMaxPathLength ); } - #if ( defined UNX ) void getMaxPathLength_002() { @@ -2251,15 +2200,12 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getMaxPathLength ); CPPUNIT_TEST( getMaxPathLength_001 ); CPPUNIT_TEST( getMaxPathLength_002 ); CPPUNIT_TEST_SUITE_END(); };// class getMaxPathLength - - // testing the method // inline ::rtl::OUString getFileSystemName() const @@ -2284,7 +2230,6 @@ namespace osl_VolumeInfo !compareFileName( aNullURL, aUStr ) ); } - #if defined(SOLARIS) void getFileSystemName_002() { @@ -2313,14 +2258,12 @@ namespace osl_VolumeInfo } #endif - CPPUNIT_TEST_SUITE( getFileSystemName ); CPPUNIT_TEST( getFileSystemName_001 ); CPPUNIT_TEST( getFileSystemName_002 ); CPPUNIT_TEST_SUITE_END(); };// class getFileSystemName - // testing the method // inline VolumeDevice getDeviceHandle() const @@ -2350,8 +2293,6 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_END(); };// 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" ); @@ -2369,15 +2310,11 @@ namespace osl_VolumeInfo CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_VolumeInfo::getDeviceHandle, "osl_VolumeInfo" );*/ }// namespace osl_VolumeInfo - - - // Beginning of the test cases for VolumeDevice class namespace osl_FileStatus { - // testing the method // FileStatus( sal_uInt32 nMask ): _nMask( nMask ) @@ -2448,8 +2385,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class ctors - - // testing the method // inline sal_Bool isValid( sal_uInt32 nMask ) const @@ -2647,7 +2582,6 @@ namespace osl_FileStatus // ( sal_False == bOk1 ) && ( sal_True == bOk2 ) ); } - CPPUNIT_TEST_SUITE( isValid ); CPPUNIT_TEST( isValid_001 ); CPPUNIT_TEST( isValid_002 ); @@ -2656,8 +2590,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class ctors - - // testing the method // inline Type getFileType() const @@ -2773,7 +2705,6 @@ namespace osl_FileStatus { osl::FileStatus::Type eType = rFileStatus.getFileType(); - CPPUNIT_ASSERT_MESSAGE( "test for getFileType function: Special, Solaris version ", ( eType == ::osl::FileStatus::Special ) ); } @@ -2788,7 +2719,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileType - // testing the method // inline sal_uInt64 getAttributes() const @@ -2845,7 +2775,6 @@ namespace osl_FileStatus } #endif - void getAttributes_002() { #if ( defined UNX ) @@ -2861,7 +2790,6 @@ namespace osl_FileStatus #endif } - #if ( defined UNX ) void getAttributes_003() { @@ -2918,7 +2846,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getAttributes - // testing the method // inline TimeValue getAccessTime() const @@ -2974,7 +2901,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getAccessTime - // testing the method // inline TimeValue getModifyTime() const @@ -2987,7 +2913,6 @@ namespace osl_FileStatus public: getModifyTime() :nError(FileBase::E_None) {} - // test code. void getModifyTime_001() { @@ -3029,8 +2954,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getModifyTime - - // testing the method // inline sal_uInt64 getFileSize() const @@ -3096,7 +3019,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileSize - // testing the method // inline ::rtl::OUString getFileName() const @@ -3141,7 +3063,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileName - // testing the method // inline ::rtl::OUString getFileURL() const @@ -3185,7 +3106,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_END(); };// class getFileURL - // testing the method // inline ::rtl::OUString getLinkTargetURL() const @@ -3257,7 +3177,6 @@ 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" ); @@ -3270,9 +3189,6 @@ namespace osl_FileStatus CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_FileStatus::getLinkTargetURL, "osl_FileStatus" ); }// namespace osl_FileStatus - - - // Beginning of the test cases for File class namespace osl_File @@ -3332,7 +3248,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class ctors - // testing the method // inline RC open( sal_uInt32 uFlags ) @@ -3457,7 +3372,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class open - // testing the method // inline RC close() @@ -3521,8 +3435,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class close - - // testing the method // inline RC setPos( sal_uInt32 uHow, sal_Int64 uPos ) @@ -3627,7 +3539,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setPos - // testing the method // inline RC getPos( sal_uInt64& uPos ) @@ -3692,8 +3603,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class getPos - - // testing the method // inline RC isEndOfFile( sal_Bool *pIsEOF ) @@ -3736,7 +3645,6 @@ namespace osl_File sal_Bool bEOF = sal_False; sal_Bool *pEOF = &bEOF; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3787,8 +3695,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class isEndOfFile - - // testing the method // inline RC setSize( sal_uInt64 uSize ) @@ -3832,7 +3738,6 @@ namespace osl_File // sal_Bool *pEOF = &bEOF; sal_uInt64 nFilePointer; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3860,7 +3765,6 @@ namespace osl_File // sal_Bool *pEOF = &bEOF; sal_uInt64 nFilePointer; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3887,8 +3791,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setSize - - // testing the method // inline RC read( void *pBuffer, sal_uInt64 uBytesRequested, sal_uInt64& rBytesRead ) @@ -3931,7 +3833,6 @@ namespace osl_File sal_uInt64 nFilePointer; sal_Char buffer_read[10]; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3953,7 +3854,6 @@ namespace osl_File sal_uInt64 nFilePointer; sal_Char buffer_read[26]; - nError1 = testFile.open( osl_File_OpenFlag_Read | osl_File_OpenFlag_Write ); CPPUNIT_ASSERT( ::osl::FileBase::E_None == nError1 ); @@ -3977,7 +3877,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class read - // testing the method // inline RC write(const void *pBuffer, sal_uInt64 uBytesToWrite, sal_uInt64& rBytesWritten) @@ -4037,7 +3936,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class write - // testing the method // inline RC readLine( ::rtl::ByteSequence& aSeq ) @@ -4150,7 +4048,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class readLine - // testing the method // inline static RC copy( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) @@ -4285,7 +4182,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class copy - // testing the method // inline static RC move( const ::rtl::OUString& ustrSourceFileURL, const ::rtl::OUString& ustrDestFileURL ) @@ -4446,8 +4342,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class move - - // testing the method // inline static RC remove( const ::rtl::OUString& ustrFileURL ) @@ -4532,8 +4426,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class remove - - // testing the method // inline static RC setAttributes( const ::rtl::OUString& ustrFileURL, sal_uInt64 uAttributes ) @@ -4624,8 +4516,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setAttributes - - // testing the method // inline static RC setTime( // const ::rtl::OUString& ustrFileURL, @@ -4713,7 +4603,6 @@ namespace osl_File CPPUNIT_TEST_SUITE_END(); };// class setTime - // testing the method // inline static RC sync() @@ -4768,14 +4657,11 @@ namespace osl_File } //test case:no enough space, how to create such case???see test_cpy_wrt_file.cxx::test_osl_writeFile - - CPPUNIT_TEST_SUITE( sync ); CPPUNIT_TEST( sync_001 ); 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" ); @@ -4797,8 +4683,6 @@ namespace osl_File }// namespace osl_File - - // Beginning of the test cases for DirectoryItem class namespace osl_DirectoryItem @@ -4845,7 +4729,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class ctors - // testing the method // DirectoryItem( const DirectoryItem& rItem ): _pData( rItem._pData) @@ -4908,7 +4791,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class copy_assin_Ctors - // testing the method // inline sal_Bool is() @@ -4957,7 +4839,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class is - // testing the method // static inline RC get( const ::rtl::OUString& ustrFileURL, DirectoryItem& rItem ) @@ -5024,7 +4905,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class get - // testing the method // inline RC getFileStatus( FileStatus& rStatus ) @@ -5096,7 +4976,6 @@ namespace osl_DirectoryItem compareFileName( rFileStatus.getFileName(), aTmpName1 ) ); } - CPPUNIT_TEST_SUITE( getFileStatus ); CPPUNIT_TEST( getFileStatus_001 ); CPPUNIT_TEST( getFileStatus_002 ); @@ -5104,8 +4983,6 @@ namespace osl_DirectoryItem CPPUNIT_TEST_SUITE_END(); };// class getFileStatus - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::ctors, "osl_DirectoryItem" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::copy_assin_Ctors, "osl_DirectoryItem" ); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_DirectoryItem::is, "osl_DirectoryItem" ); @@ -5113,7 +4990,6 @@ 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 @@ -5183,7 +5059,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class ctors - // testing the method // inline RC open() @@ -5282,7 +5157,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class open - // testing the method // inline sal_Bool isOpen() { return _pData != NULL; }; @@ -5340,7 +5214,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class isOpen - // testing the method // inline RC close() @@ -5390,14 +5263,12 @@ namespace osl_Directory ( ::osl::FileBase::E_BADF == nError1 ) ); } - CPPUNIT_TEST_SUITE( close ); CPPUNIT_TEST( close_001 ); CPPUNIT_TEST( close_002 ); CPPUNIT_TEST_SUITE_END(); };// class close - // testing the method // inline RC reset() @@ -5482,7 +5353,6 @@ namespace osl_Directory ( ::osl::FileBase::E_NOENT == nError1 ) ); } - void reset_003() { ::osl::Directory testDirectory( aTmpName4 ); //constructor @@ -5513,7 +5383,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class reset - // testing the method // inline RC getNextItem( DirectoryItem& rItem, sal_uInt32 nHint = 0 ) @@ -5684,7 +5553,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class getNextItem - // testing the method // inline static RC getVolumeInfo( const ::rtl::OUString& ustrDirectoryURL, VolumeInfo& rInfo ) @@ -5774,7 +5642,6 @@ namespace osl_Directory } } - void getVolumeInfo_001_1() { sal_Int32 mask = osl_VolumeInfo_Mask_FileSystemName; @@ -5862,8 +5729,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class getVolumeInfo - - // testing the method // inline static RC create( const ::rtl::OUString& ustrDirectoryURL ) @@ -5942,7 +5807,6 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class create - // testing the method // inline static RC remove( const ::rtl::OUString& ustrDirectoryURL ) @@ -6036,10 +5900,8 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class remove - // TEST Directory::createPath - #ifdef WNT # define PATH_BUFFER_SIZE MAX_PATH #else @@ -6048,7 +5910,6 @@ namespace osl_Directory #define TEST_PATH_POSTFIX "hello/world" - OUString get_test_path() { static OUString test_path; @@ -6102,7 +5963,6 @@ namespace osl_Directory return test_path; } - void rm_test_path(const OUString& path) { sal_Unicode buffer[PATH_BUFFER_SIZE]; @@ -6123,7 +5983,6 @@ namespace osl_Directory } } - class DirCreatedObserver : public DirectoryCreationObserver { public: @@ -6145,8 +6004,6 @@ namespace osl_Directory int i; }; - - class createPath : public CppUnit::TestFixture { public: @@ -6154,12 +6011,10 @@ namespace osl_Directory createPath() {} - void with_relative_path() { FileBase::RC rc = Directory::createPath( OUString(TEST_PATH_POSTFIX)); - CPPUNIT_ASSERT_MESSAGE ( "osl_createDirectoryPath contract broken", @@ -6167,7 +6022,6 @@ namespace osl_Directory ); } - void without_callback() { OUString tp_url = get_test_path(); @@ -6185,7 +6039,6 @@ namespace osl_Directory ); } - void with_callback() { OUString tp_url = get_test_path(); @@ -6209,7 +6062,6 @@ namespace osl_Directory #ifdef WNT - const char* get_unused_drive_letter() { static const char m_aBuff[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -6227,7 +6079,6 @@ namespace osl_Directory return NULL; } - void at_invalid_logical_drive() { const char* drv = get_unused_drive_letter(); @@ -6263,7 +6114,6 @@ 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 ); @@ -6276,12 +6126,8 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_REGISTRATION( osl_Directory::createPath ); }// namespace osl_Directory - - CPPUNIT_PLUGIN_IMPLEMENT(); - - /** get Current PID. */ inline ::rtl::OUString getCurrentPID( ) @@ -6296,7 +6142,6 @@ inline ::rtl::OUString getCurrentPID( ) return ( OUString::number( nPID ) ); } - //~ do some clean up work after all test completed. class GlobalObject { diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index ccb27f157992..6a27c86246b8 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -34,21 +34,16 @@ extern "C" { #endif - - - // common used string resource // these common used string will be used as assist resource in test // they are mostly OS independent, some of the resource can be reused // so, acommon test data repository will be better since it can be // shared among all test code - const sal_Char pBuffer_Char[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; const sal_Char pBuffer_Number[] = "1234567890"; const sal_Char pBuffer_Blank[] = ""; - // OS dependent/independent definitions/includes // we use FILE_PREFIX for URL prefix, // TEST_PLATFORM for test platform initial, @@ -58,14 +53,11 @@ const sal_Char pBuffer_Blank[] = ""; // PATH_SEPARATOR for separator in URL or system path in comrresponding platform, // PATH_MAX/MAX_PATH for max path length in comrresponding platform, - - // OS independent const definition # define FILE_PREFIX "file:///" # define TEST_FILE_SIZE 1024 - // OS dependent declaration and includes #if ( defined UNX ) //Unix @@ -105,21 +97,17 @@ const sal_Char pBuffer_Blank[] = ""; # define PATH_SEPARATOR "/" #endif - - // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length - #define OSLTEST_DECLARE( str_name, str_value ) \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( ( str_value ) ) #define OSLTEST_DECLARE_UTF8(str_name, str_value ) \ ::rtl::OUString a##str_name = ::rtl::Uri::decode( ::rtl::OUString::createFromAscii( ( str_value ) ), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8) - // OS independent file definition OSLTEST_DECLARE( NullURL, "" ); @@ -132,7 +120,6 @@ OSLTEST_DECLARE( TempDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP ); OSLTEST_DECLARE( UserDirectoryURL, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "" ); OSLTEST_DECLARE( UserDirectorySys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "" ); - // common used URL:temp, canonical, root, relative, link,etc OSLTEST_DECLARE( CanURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/canonical.name" ); @@ -158,7 +145,6 @@ OSLTEST_DECLARE( RelURL5, TEST_PLATFORM_TEMP "/./../" TEST_PLATFORM_TEMP ); OSLTEST_DECLARE( LnkURL1, FILE_PREFIX TEST_PLATFORM TEST_PLATFORM_TEMP "/link.file" ); OSLTEST_DECLARE( HidURL1, ".hiddenfile" ); - // common used System Path:temp, root,etc OSLTEST_DECLARE( RootSys, TEST_PLATFORM_ROOT ); @@ -170,7 +156,6 @@ OSLTEST_DECLARE_UTF8( SysPath5, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/%E6%9C%A OSLTEST_DECLARE( SysPathLnk, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/link.file" ); OSLTEST_DECLARE( FifoSys, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/tmpdir/fifo" ); - // FileType URL, we pick some canonical file in corresponding system for test: // socket, link, etc. // Note that this may be changed in the different platform, so be careful to use. @@ -185,7 +170,6 @@ OSLTEST_DECLARE( TypeURL2, FILE_PREFIX "" ); OSLTEST_DECLARE( TypeURL3, FILE_PREFIX "" ); #endif - // Volume device URL, we pick some canonical volume device for test: // UNIX file system, Floppy Disk, Proc file system, Temp file system, Compact Disk. diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx index 172ff028d372..402bbfb483d1 100644 --- a/sal/qa/osl/file/osl_old_test_file.cxx +++ b/sal/qa/osl/file/osl_old_test_file.cxx @@ -38,8 +38,6 @@ namespace osl_test_file { - - class oldtestfile : public CppUnit::TestFixture { public: @@ -144,10 +142,8 @@ 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/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index a808fb942a13..2eb0083535ee 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -72,7 +72,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - // register test suites CPPUNIT_TEST_SUITE_REGISTRATION(test_osl_writeFile); diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx index e93e29acd61e..43387045af37 100644 --- a/sal/qa/osl/module/osl_Module.cxx +++ b/sal/qa/osl/module/osl_Module.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - // include files #include <osl_Module_Const.h> @@ -31,7 +29,6 @@ using ::rtl::OString; // helper functions and classes - /** print Boolean value. */ inline void printBool( bool bOk ) @@ -142,11 +139,8 @@ inline void deleteTestFile( const ::rtl::OUString& filename ) CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) ); } - - // test code start here - namespace osl_Module { @@ -162,7 +156,6 @@ namespace osl_Module }; }; - /** testing the methods: Module(); Module( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT); @@ -205,7 +198,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the methods: static sal_Bool getUrlFromAddress(void * addr, ::rtl::OUString & libraryUrl) */ @@ -255,7 +247,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class getUrlFromAddress - /** testing the method: sal_Bool SAL_CALL load( const ::rtl::OUString& strModuleName, sal_Int32 nRtldMode = SAL_LOADMODULE_DEFAULT) @@ -284,7 +275,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class load - /** testing the method: void SAL_CALL unload() */ @@ -309,7 +299,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class unload - /** testing the methods: sal_Bool SAL_CALL is() const */ @@ -341,7 +330,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class is - /** testing the methods: void* SAL_CALL getSymbol( const ::rtl::OUString& strSymbolName) */ @@ -371,7 +359,6 @@ namespace osl_Module CPPUNIT_TEST_SUITE_END( ); }; // class getSymbol - /** testing the methods: operator oslModule() const */ @@ -449,7 +436,6 @@ 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); @@ -459,11 +445,8 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 4dd4fe437f40..f5417023b2a7 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -38,12 +38,10 @@ # define FILE_PREFIX "file:///" - // function pointer type. typedef sal_Bool (* FuncPtr )( sal_Bool ); - #endif /* _OSL_MODULE_CONST_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/mutex/osl_Mutex.cxx b/sal/qa/osl/mutex/osl_Mutex.cxx index dce24e73e8c4..e06acee5e542 100644 --- a/sal/qa/osl/mutex/osl_Mutex.cxx +++ b/sal/qa/osl/mutex/osl_Mutex.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include <sal/types.h> @@ -30,10 +29,8 @@ using namespace osl; using namespace rtl; - // helper functions - /** print a UNI_CODE String. */ inline void printUString( const ::rtl::OUString & str ) @@ -75,12 +72,8 @@ namespace ThreadHelper } } - - // Beginning of the test cases for osl_Mutex class - - /** mutually exclusive data */ struct resource { @@ -145,7 +138,6 @@ protected: } }; - /** chain structure used in Threads as critical resource */ struct chain { @@ -262,8 +254,6 @@ protected: } }; - - namespace osl_Mutex { @@ -361,7 +351,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END( ); }; // class ctor - /** Test of the osl::Mutex::acquire method */ class acquire : public CppUnit::TestFixture @@ -416,7 +405,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END( ); }; // class acquire - /** Test of the osl::Mutex::tryToAcquire method */ class tryToAcquire : public CppUnit::TestFixture @@ -497,8 +485,6 @@ namespace osl_Mutex CPPUNIT_TEST_SUITE_END( ); }; // class release - - /** Test of the osl::Mutex::getGlobalMutex method */ class getGlobalMutex : public CppUnit::TestFixture @@ -548,7 +534,6 @@ 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"); @@ -556,11 +541,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Mutex::release, "osl_Mutex"); 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 { public: @@ -582,7 +564,6 @@ protected: } }; - namespace osl_Guard { class ctor : public CppUnit::TestFixture @@ -636,15 +617,11 @@ 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 */ class ClearGuardThread : public Thread @@ -673,7 +650,6 @@ protected: } }; - namespace osl_ClearableGuard { @@ -777,16 +753,12 @@ 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 */ class ResetGuardThread : public Thread @@ -813,7 +785,6 @@ protected: } }; - namespace osl_ResettableGuard { class ctor : public CppUnit::TestFixture @@ -847,7 +818,6 @@ namespace osl_ResettableGuard bRes); } - CPPUNIT_TEST_SUITE(ctor); CPPUNIT_TEST(ctor_001); CPPUNIT_TEST(ctor_002); @@ -903,7 +873,6 @@ 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/mutex/osl_Mutex_Const.h b/sal/qa/osl/mutex/osl_Mutex_Const.h index 133f1f02e231..fb6bfaa5f1eb 100644 --- a/sal/qa/osl/mutex/osl_Mutex_Const.h +++ b/sal/qa/osl/mutex/osl_Mutex_Const.h @@ -32,7 +32,6 @@ #define BUFFER_SIZE 16 - #endif /* _OSL_MUTEX_CONST_H_ */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx index 58cce66b1b52..a91ea189fc9f 100644 --- a/sal/qa/osl/pipe/osl_Pipe.cxx +++ b/sal/qa/osl/pipe/osl_Pipe.cxx @@ -17,10 +17,8 @@ * 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" @@ -47,10 +45,8 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; - // helper functions - /** print Boolean value. */ inline void printBool( sal_Bool bOk ) @@ -116,9 +112,6 @@ inline void printPipeError( ::osl::Pipe aPipe ) } } - - - // pipe name and transfer contents const rtl::OUString aTestPipeName("testpipe2"); @@ -128,14 +121,11 @@ 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 @@ -228,7 +218,6 @@ namespace osl_Pipe ///aPipe.clear( ); ///bRes1 = aNoAcquirePipe.is( ); - CPPUNIT_ASSERT_MESSAGE( "#test comment#: test constructor with no acquire of handle, only validation test, do not know how to test no acquire.", sal_True == bRes ); } @@ -258,7 +247,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the method: inline sal_Bool SAL_CALL is() const; */ @@ -302,7 +290,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class is - /** testing the methods: inline sal_Bool create( const ::rtl::OUString & strName, oslPipeOptions Options, const Security &rSec ); @@ -385,7 +372,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class create - /** testing the method: inline void SAL_CALL clear(); */ @@ -410,7 +396,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class clear - /** testing the methods: inline Pipe& SAL_CALL operator= (const Pipe& pipe); inline Pipe& SAL_CALL operator= (const oslPipe pipe ); @@ -454,7 +439,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class assign - /** testing the method: inline sal_Bool SAL_CALL isValid() const; isValid( ) has not been implemented under the following platforms, please refer to osl/pipe.hxx @@ -503,7 +487,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class isEqual - /** testing the method: inline void SAL_CALL close(); */ @@ -541,7 +524,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class close - /** testing the method: inline oslPipeError SAL_CALL accept(StreamPipe& Connection); please refer to StreamPipe::recv @@ -585,7 +567,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class getError - /** testing the method: inline oslPipe SAL_CALL getHandle() const; */ @@ -622,8 +603,6 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_END( ); }; // class getHandle - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::is); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::create); @@ -634,10 +613,8 @@ namespace osl_Pipe CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getError); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Pipe::getHandle); - } // namespace osl_Pipe - namespace osl_StreamPipe { @@ -761,7 +738,6 @@ namespace osl_StreamPipe CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the methods: inline StreamPipe & SAL_CALL operator=(oslPipe Pipe); inline StreamPipe& SAL_CALL operator=(const Pipe& pipe); @@ -782,7 +758,6 @@ namespace osl_StreamPipe } // test read/write & send/recv data to pipe - class Pipe_DataSink_Thread : public Thread { public: @@ -922,12 +897,10 @@ 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 CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx index e4b388298b2f..4778ea1989ca 100644 --- a/sal/qa/osl/process/osl_Thread.cxx +++ b/sal/qa/osl/process/osl_Thread.cxx @@ -24,7 +24,6 @@ #include <time.h> #endif - // include files #include <sal/types.h> @@ -50,7 +49,6 @@ using namespace osl; using ::rtl::OString; - // Small stopwatch class StopWatch { TimeValue t1,t2; // Start and stoptime @@ -155,7 +153,6 @@ double StopWatch::getTenthSec() const return nValue ; } - template <class T> class ThreadSafeValue { @@ -179,7 +176,6 @@ public: void release() {m_aMutex.release();} }; - namespace ThreadHelper { void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) @@ -266,7 +262,6 @@ public: }; - /** Thread which has a flag add 1 every second until 20 */ class OCountThread : public Thread @@ -564,8 +559,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class create - - /** Test of the osl::Thread::createSuspended method */ class createSuspended : public CppUnit::TestFixture @@ -1064,7 +1057,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class isRunning - /// check osl::Thread::setPriority class setPriority : public CppUnit::TestFixture { @@ -1109,7 +1101,6 @@ namespace osl_Thread return sPrioStr; } - /** check 2 threads. ALGORITHM: @@ -1508,7 +1499,6 @@ namespace osl_Thread #endif } - CPPUNIT_TEST_SUITE(setPriority); #ifndef SOLARIS CPPUNIT_TEST(setPriority_002); @@ -1580,7 +1570,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_END(); }; // class getPriority - class getIdentifier : public CppUnit::TestFixture { public: @@ -1737,7 +1726,6 @@ namespace osl_Thread { } - CPPUNIT_TEST_SUITE(yield); CPPUNIT_TEST(yield_001); CPPUNIT_TEST_SUITE_END(); @@ -1867,7 +1855,6 @@ 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"); @@ -1884,8 +1871,6 @@ namespace osl_Thread CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Thread::schedule, "osl_Thread"); } // namespace osl_Thread - - // destroy function when the binding thread terminate void SAL_CALL destroyCallback(void * data) { @@ -1987,7 +1972,6 @@ namespace osl_ThreadData CPPUNIT_TEST_SUITE_END(); }; // class ctors - class setData : public CppUnit::TestFixture { public: @@ -2185,7 +2169,6 @@ 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 e4d2028fb55e..db6d19c382ff 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -70,7 +70,6 @@ const rtl::OUString EXECUTABLE_NAME ("osl_process_child"); #endif - using namespace osl; using ::rtl::OUString; @@ -102,7 +101,6 @@ inline ::rtl::OUString getExecutablePath( void ) //rtl::OUString CWD = getExecutablePath(); - class Test_osl_joinProcess : public CppUnit::TestFixture { const OUString join_param_; @@ -308,13 +306,10 @@ public: CPPUNIT_TEST_SUITE_END(); }; - - typedef std::vector<std::string, rtl::Allocator<std::string> > string_container_t; typedef string_container_t::const_iterator string_container_const_iter_t; typedef string_container_t::iterator string_container_iter_t; - class exclude : public std::unary_function<std::string, bool> { public: @@ -327,7 +322,6 @@ public: exclude_list_.push_back(env_var_name(*iter)); } - bool operator() (const std::string& env_var) const { return (exclude_list_.end() != @@ -405,7 +399,6 @@ namespace } #endif - class Test_osl_executeProcess : public CppUnit::TestFixture { const OUString env_param_; @@ -419,7 +412,6 @@ class Test_osl_executeProcess : public CppUnit::TestFixture public: - // ctor Test_osl_executeProcess() : env_param_(OUString("-env")), @@ -432,7 +424,6 @@ public: suExecutableFileURL += EXECUTABLE_NAME; } - virtual void setUp() SAL_OVERRIDE { temp_file_path_ = create_temp_file(temp_file_url_); @@ -444,7 +435,6 @@ 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 +447,6 @@ public: return temp_file_path; } - void read_child_environment(string_container_t* env_container) { OString temp_file_name = OUStringToOString(OUString( @@ -477,7 +466,6 @@ public: tidy_container(*env_container); } - // environment of the child process that was // started. The child process writes his // environment into a file @@ -493,7 +481,6 @@ 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) @@ -549,7 +536,6 @@ public: std::cerr << "different should be: " << *iter << std::endl; #endif - #if OSL_DEBUG_LEVEL > 1 for (string_container_t::const_iterator iter = different_child_env_vars.begin(), end = different_child_env_vars.end(); iter != end; ++iter) std::cerr << "different are: " << *iter << std::endl; @@ -563,7 +549,6 @@ 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 +590,6 @@ public: ); } - #define ENV1 "PAT=a:\\" #define ENV2 "PATHb=b:\\" #define ENV3 "Patha=c:\\" @@ -748,7 +732,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; - // register test suites //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_joinProcess, "Test_osl_joinProcess"); CPPUNIT_TEST_SUITE_REGISTRATION(Test_osl_executeProcess); diff --git a/sal/qa/osl/process/osl_process_child.cxx b/sal/qa/osl/process/osl_process_child.cxx index 3a303d5bae9b..ca9adb3441c7 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -17,10 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - - - #if ( defined WNT ) // Windows # define UNICODE # define _UNICODE @@ -48,23 +44,17 @@ # endif #endif - - - #ifdef WNT # define SLEEP(t) (Sleep((t)*1000)) #else # define SLEEP(t) (sleep((t))) #endif - void wait_for_seconds(char* time) { SLEEP(atoi(time)); } - - #ifdef WNT void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) @@ -99,7 +89,6 @@ void w_to_a(LPCTSTR _strW, LPSTR strA, DWORD size) } #endif - int main(int argc, char* argv[]) { if (argc > 2) diff --git a/sal/qa/osl/profile/osl_old_testprofile.cxx b/sal/qa/osl/profile/osl_old_testprofile.cxx index cc8fe8ca00ce..97ef52143655 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -57,10 +57,8 @@ 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 61a79340ca24..14e339e027ef 100644 --- a/sal/qa/osl/security/osl_Security.cxx +++ b/sal/qa/osl/security/osl_Security.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // header file #ifdef WNT @@ -32,11 +31,8 @@ using namespace osl; using namespace rtl; - - // helper functions and classes - /** print Boolean value. */ inline void printBool( bool bOk ) @@ -56,11 +52,8 @@ inline void printUString( const ::rtl::OUString & str ) t_print("%s\n", aString.getStr( ) ); } - - // test code start here - namespace osl_Security { @@ -85,7 +78,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class ctors - /** testing the methods: inline sal_Bool SAL_CALL logonUser(const ::rtl::OUString& strName, const ::rtl::OUString& strPasswd); @@ -116,7 +108,6 @@ namespace osl_Security bRes ); } - CPPUNIT_TEST_SUITE( logonUser ); if ( !aStringForward.isEmpty() && aStringForward.indexOf( (sal_Unicode)' ' ) != -1 && ( aStringForward.indexOf( ( sal_Unicode ) ' ' ) == aStringForward.lastIndexOf( ( sal_Unicode ) ' ' ) ) ) /// if user name and passwd are forwarded @@ -131,7 +122,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class logonUser - /** testing the method: inline sal_Bool Security::getUserIdent( rtl::OUString& strIdent) const */ @@ -162,7 +152,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class getUserIdent - /** testing the method: inline sal_Bool SAL_CALL getUserName( ::rtl::OUString& strName) const; */ @@ -195,7 +184,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class getUserName - /** testing the method: inline sal_Bool Security::getConfigDir( rtl::OUString& strDirectory ) const */ @@ -262,7 +250,6 @@ namespace osl_Security CPPUNIT_TEST_SUITE_END( ); }; // class getHandle - class UserProfile : public CppUnit::TestFixture { public: @@ -310,7 +297,6 @@ 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,11 +307,8 @@ CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::getHandle); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::UserProfile); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Security::loginUserOnFileServer); - - } // namespace osl_Security - /* This defines an own TestPlugIn implementation with an own initialize() method that will be called after loading the PlugIn */ @@ -339,7 +322,6 @@ class MyTestPlugInImpl: public CPPUNIT_NS::TestPlugInDefaultImpl const CPPUNIT_NS::PlugInParameters ¶meters ) SAL_OVERRIDE; }; - void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, const CPPUNIT_NS::PlugInParameters & ) { @@ -355,7 +337,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, #if ( defined UNX ) /// some initialization work for UNIX OS - struct passwd* pw; CPPUNIT_ASSERT_MESSAGE( "getpwuid: no password entry\n",( pw = getpwuid( getuid() ) ) != NULL ); @@ -383,7 +364,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, #if defined ( WNT ) /// some initialization work for Windows OS - /// Get the user name, computer name, user home directory. LPTSTR lpszSystemInfo; // pointer to system information string DWORD cchBuff = BUFSIZE; // size of computer or user name @@ -423,7 +403,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, RegCloseKey(hRegKey); } - /// Get user Security ID: // Create buffers that may be large enough. If a buffer is too small, the count parameter will be set to the size needed. @@ -555,7 +534,6 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, delete [] reinterpret_cast<BYTE*>(pSid); delete [] wszDomainName; - /// check if logged in user is administrator: BOOL b; @@ -679,5 +657,4 @@ void MyTestPlugInImpl::initialize( CPPUNIT_NS::TestFactoryRegistry *, CPPUNIT_PLUGIN_EXPORTED_FUNCTION_IMPL( MyTestPlugInImpl ); CPPUNIT_PLUGIN_IMPLEMENT_MAIN(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index 5a70fdacf600..85d5d4c63fb9 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -43,10 +43,8 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ - // include files - #include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> @@ -63,10 +61,8 @@ 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 { @@ -162,7 +158,6 @@ namespace osl_AcceptorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -181,7 +176,6 @@ namespace osl_AcceptorSocket csConnectorSocket.close( ); } - void listen_accept_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT3 ); @@ -229,7 +223,6 @@ namespace osl_AcceptorSocket ( sal_True == compareSocketAddr( saPeerSocketAddr, saLocalSocketAddr ) ) ); } - CPPUNIT_TEST_SUITE( listen_accept ); CPPUNIT_TEST( listen_accept_001 ); CPPUNIT_TEST( listen_accept_002 ); @@ -237,17 +230,12 @@ namespace osl_AcceptorSocket }; // class listen_accept - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::ctors); //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket"); 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index 1765b3d394a1..261cfc2bc846 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -43,10 +43,8 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ - // include files - #include <sal/types.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> @@ -62,10 +60,8 @@ using ::rtl::OUString; #define IP_PORT_FTP 21 #define IP_PORT_MYPORT3 8884 - // helper functions - class CloseSocketThread : public Thread { ::osl::Socket &m_sSocket; @@ -128,7 +124,6 @@ namespace osl_ConnectorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -146,7 +141,6 @@ namespace osl_ConnectorSocket csConnectorSocket.close( ); } - void connect_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT2 ); @@ -241,16 +235,11 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index b72a4d289449..3fb83cfa9815 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -60,10 +60,8 @@ using ::rtl::OUString; const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; - // helper functions - class CloseSocketThread : public Thread { ::osl::Socket m_sSocket; @@ -88,10 +86,8 @@ public: } }; - // tests cases begins here - namespace osl_DatagramSocket { @@ -114,7 +110,6 @@ namespace osl_DatagramSocket osl_Socket_TypeDgram == dsSocket.getType( ) ); } - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST_SUITE_END(); @@ -293,15 +288,11 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index f1597a329e14..086c95383f7f 100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -43,11 +43,8 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ - - // include files - #include <sal/types.h> #include <osl_Socket_Const_orig.h> @@ -79,10 +76,8 @@ using ::rtl::OUString; using ::rtl::OUStringToOString; using ::rtl::OString; - // helper functions - /** compare two OUString. */ inline sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 ) @@ -379,7 +374,6 @@ public: }; - /** Server Socket Thread, served as a temp little server to communicate with client. */ class ServerSocketThread : public Thread @@ -450,7 +444,6 @@ public: } }; - // Helper functions, to create buffers, check buffers class ValueCheckProvider { @@ -504,7 +497,6 @@ public: }; - /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -647,7 +639,6 @@ public: }; - // just used to test socket::close() when accepting class AcceptorThread : public Thread { @@ -726,10 +717,8 @@ public: } }; - // tests cases begins here - namespace osl_SocketAddr { @@ -875,7 +864,6 @@ namespace osl_SocketAddr }; // class ctors - /** testing the method: inline sal_Bool is() const; */ @@ -915,7 +903,6 @@ namespace osl_SocketAddr }; // class is - /** testing the method: inline ::rtl::OUString SAL_CALL getHostname( oslSocketResult *pResult = 0 ) const; */ @@ -986,7 +973,6 @@ namespace osl_SocketAddr CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getHostname ); CPPUNIT_TEST( getHostname_001 ); CPPUNIT_TEST( getHostname_002 ); @@ -994,7 +980,6 @@ namespace osl_SocketAddr }; // class getHostname - /** testing the method: inline sal_Int32 SAL_CALL getPort() const; */ @@ -1037,7 +1022,6 @@ namespace osl_SocketAddr }; // class getPort - /** testing the method: inline sal_Bool SAL_CALL setPort( sal_Int32 nPort ); rfc1413.txt: TCP port numbers are from 1-65535 @@ -1106,7 +1090,6 @@ namespace osl_SocketAddr bOK == sal_False); } - CPPUNIT_TEST_SUITE( setPort ); CPPUNIT_TEST( setPort_001 ); CPPUNIT_TEST( setPort_002 ); @@ -1116,7 +1099,6 @@ namespace osl_SocketAddr }; // class setPort - /** tester comment: In the following two functions, it use ::rtl::ByteSequence as an intermediate storage for address, @@ -1126,7 +1108,6 @@ namespace osl_SocketAddr so may be a sal_uInt8 array is better. */ - /** testing the method: inline sal_Bool SAL_CALL setAddr( const ::rtl::ByteSequence & address ); */ @@ -1148,14 +1129,12 @@ namespace osl_SocketAddr sal_True == bOK ); } - CPPUNIT_TEST_SUITE( setAddr ); CPPUNIT_TEST( setAddr_001 ); CPPUNIT_TEST_SUITE_END( ); }; // class setAddr - /** testing the method: inline ::rtl::ByteSequence SAL_CALL getAddr( oslSocketResult *pResult = 0 ) const; */ @@ -1184,7 +1163,6 @@ namespace osl_SocketAddr }; // class getAddr - /** testing the methods: inline SocketAddr & SAL_CALL operator= (oslSocketAddr Addr); inline SocketAddr & SAL_CALL operator= (const SocketAddr& Addr); @@ -1212,7 +1190,6 @@ namespace osl_SocketAddr sal_True == bOK ); } - void operator_equal_002() { ::osl::SocketAddr saSocketAddr( aHostIp3, IP_PORT_TELNET); @@ -1301,8 +1278,6 @@ namespace osl_SocketAddr }; // class operator_equal - - /** testing the method: inline oslSocketAddr SAL_CALL getHandle() const; */ @@ -1342,7 +1317,6 @@ namespace osl_SocketAddr }; // class getSocketAddrHandle - /** testing the method: static inline ::rtl::OUString SAL_CALL getLocalHostname( oslSocketResult *pResult = 0); */ @@ -1396,7 +1370,6 @@ namespace osl_SocketAddr }; // class getLocalHostname - /** testing the method: static inline void SAL_CALL resolveHostname( const ::rtl::OUString & strHostName , SocketAddr & Addr ); */ @@ -1424,7 +1397,6 @@ namespace osl_SocketAddr }; // class resolveHostname - /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, @@ -1468,9 +1440,6 @@ namespace osl_SocketAddr }; // class gettheServicePort - - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::ctors, "osl_SocketAddr"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::is, "osl_SocketAddr"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getHostname, "osl_SocketAddr"); @@ -1484,11 +1453,8 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getLocalHostname, "osl_Soc CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::resolveHostname, "osl_SocketAddr"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::gettheServicePort, "osl_SocketAddr"); - } // namespace osl_SocketAddr - - namespace osl_Socket { @@ -1509,7 +1475,6 @@ namespace osl_Socket the use of C method lost some of the transparent of tester using C++ wrapper. */ - class ctors : public CppUnit::TestFixture { public: @@ -1525,7 +1490,6 @@ namespace osl_Socket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -1586,8 +1550,6 @@ namespace osl_Socket osl_Socket_TypeStream == sSocket.getType( ) ); } - - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_acquire ); @@ -1599,7 +1561,6 @@ namespace osl_Socket }; // class ctors - /** testing the methods: inline Socket& SAL_CALL operator= ( oslSocket socketHandle); inline Socket& SAL_CALL operator= (const Socket& sock); @@ -1622,7 +1583,6 @@ namespace osl_Socket sHandle = NULL; } - /** test writer's comment: the assignment operator does not support direct assinment like: @@ -1696,7 +1656,6 @@ namespace osl_Socket }; // class operators - /** testing the methods: inline void SAL_CALL shutdown( oslSocketDirection Direction = osl_Socket_DirReadWrite ); inline void SAL_CALL close(); @@ -1717,7 +1676,6 @@ namespace osl_Socket sHandle = NULL; } - void close_001() { ::osl::Socket sSocket(sHandle); @@ -1809,14 +1767,12 @@ namespace osl_Socket sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getLocalAddr ); CPPUNIT_TEST( getLocalAddr_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getLocalAddr - /** testing the method: inline sal_Int32 SAL_CALL getLocalPort() const; */ @@ -1836,7 +1792,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalPort_001() { ::osl::Socket sSocket(sHandle); @@ -1909,7 +1864,6 @@ namespace osl_Socket }; // class getLocalPort - /** testing the method: inline ::rtl::OUString SAL_CALL getLocalHost() const; @@ -1933,7 +1887,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalHost_001() { ::osl::Socket sSocket(sHandle); @@ -1984,7 +1937,6 @@ namespace osl_Socket }; // class getLocalHost - /** testing the methods: inline void SAL_CALL getPeerAddr( SocketAddr & Addr) const; inline sal_Int32 SAL_CALL getPeerPort() const; @@ -1998,7 +1950,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -2016,7 +1967,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void getPeer_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT ); @@ -2047,19 +1997,16 @@ namespace osl_Socket ( peerPort == saLocalSocketAddr.getPort( ) )); } - CPPUNIT_TEST_SUITE( getPeer ); CPPUNIT_TEST( getPeer_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getPeer - /** testing the methods: inline sal_Bool SAL_CALL bind(const SocketAddr& LocalInterface); */ - class bind : public CppUnit::TestFixture { public: @@ -2075,7 +2022,6 @@ namespace osl_Socket sHandle = NULL; } - void bind_001() { ::osl::Socket sSocket(sHandle); @@ -2113,7 +2059,6 @@ namespace osl_Socket }; // class bind - /** testing the methods: inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const; @@ -2126,7 +2071,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -2144,7 +2088,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isRecvReady_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT1 ); @@ -2170,14 +2113,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isRecvReady ); CPPUNIT_TEST( isRecvReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isRecvReady - /** testing the methods: inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const; */ @@ -2189,7 +2130,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -2207,7 +2147,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isSendReady_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT ); @@ -2234,14 +2173,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isSendReady ); CPPUNIT_TEST( isSendReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isSendReady - /** testing the methods: inline oslSocketType SAL_CALL getType() const; @@ -2262,7 +2199,6 @@ namespace osl_Socket sHandle = NULL; } - void getType_001() { sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -2308,8 +2244,6 @@ namespace osl_Socket }; // class getType - - /** testing the methods: inline sal_Int32 SAL_CALL getOption( oslSocketOption Option, @@ -2404,7 +2338,6 @@ namespace osl_Socket }; // class getOption - /** testing the methods: inline sal_Bool SAL_CALL setOption( oslSocketOption Option, void* pBuffer, @@ -2431,7 +2364,6 @@ namespace osl_Socket asAcceptorSocket.close( ); } - // LLA: // getSocketOption returns BufferLen, or -1 if something failed @@ -2550,8 +2482,6 @@ namespace osl_Socket }; // class setOption - - /** testing the method: inline sal_Bool SAL_CALL enableNonBlockingMode( sal_Bool bNonBlockingMode); */ @@ -2582,14 +2512,12 @@ namespace osl_Socket ( sal_True == bOK ) ); } - CPPUNIT_TEST_SUITE( enableNonBlockingMode ); CPPUNIT_TEST( enableNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); }; // class enableNonBlockingMode - /** testing the method: inline sal_Bool SAL_CALL isNonBlockingMode() const; */ @@ -2622,7 +2550,6 @@ namespace osl_Socket ( sal_False == bOK3 ) && ( sal_True == bOK4 ) ); } - CPPUNIT_TEST_SUITE( isNonBlockingMode ); CPPUNIT_TEST( isNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); @@ -2647,7 +2574,6 @@ namespace osl_Socket sHandle = NULL; } - void clearError_001() { ::osl::Socket sSocket(sHandle); @@ -2662,14 +2588,12 @@ namespace osl_Socket osl_Socket_E_None == sSocket.getError( ) && seBind != osl_Socket_E_None ); } - CPPUNIT_TEST_SUITE( clearError ); CPPUNIT_TEST( clearError_001 ); CPPUNIT_TEST_SUITE_END(); }; // class clearError - /** testing the methods: inline oslSocketError getError() const; inline ::rtl::OUString getErrorAsString( ) const; @@ -2689,7 +2613,6 @@ namespace osl_Socket sHandle = NULL; } - void getError_001() { ::osl::Socket sSocket(sHandle); @@ -2726,8 +2649,6 @@ namespace osl_Socket }; // class getError - - /** testing the methods: inline oslSocket getHandle() const; */ @@ -2772,10 +2693,6 @@ namespace osl_Socket }; // class getHandle - - - - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::ctors, "osl_Socket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::operators, "osl_Socket"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::close, "osl_Socket"); @@ -2797,8 +2714,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getHandle, "osl_Socket"); } // namespace osl_Socket - - namespace osl_StreamSocket { @@ -2829,7 +2744,6 @@ namespace osl_StreamSocket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -3169,14 +3083,11 @@ protected: /**tester's comments: lack of a case that return sal_True, do not know when it will return sal_True*/ - CPPUNIT_TEST_SUITE( isExceptionPending ); CPPUNIT_TEST( isExPending_001 ); 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"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::shutdown, "osl_StreamSocket"); @@ -3184,7 +3095,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::isExceptionPending, "osl } // namespace osl_StreamSocket - namespace osl_ConnectorSocket { @@ -3223,7 +3133,6 @@ namespace osl_ConnectorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -3241,7 +3150,6 @@ namespace osl_ConnectorSocket csConnectorSocket.close( ); } - void connect_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT2 ); @@ -3336,16 +3244,11 @@ 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"); } // namespace osl_ConnectorSocket - - namespace osl_AcceptorSocket { @@ -3387,7 +3290,6 @@ namespace osl_AcceptorSocket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -3406,7 +3308,6 @@ namespace osl_AcceptorSocket csConnectorSocket.close( ); } - void listen_accept_001() { ::osl::SocketAddr saLocalSocketAddr( aHostIp1, IP_PORT_MYPORT3 ); @@ -3466,16 +3367,12 @@ 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"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::listen_accept, "osl_AcceptorSocket"); } // namespace osl_AcceptorSocket - namespace osl_DatagramSocket { @@ -3498,7 +3395,6 @@ namespace osl_DatagramSocket osl_Socket_TypeDgram == dsSocket.getType( ) ); } - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_001 ); CPPUNIT_TEST_SUITE_END(); @@ -3677,16 +3573,11 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index f8f005a5371e..33f928b82dce 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -67,10 +67,8 @@ 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 { @@ -145,7 +143,6 @@ namespace osl_Socket the use of C method lost some of the transparent of tester using C++ wrapper. */ - class ctors : public CppUnit::TestFixture { public: @@ -161,7 +158,6 @@ namespace osl_Socket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -222,8 +218,6 @@ namespace osl_Socket osl_Socket_TypeStream == sSocket.getType( ) ); } - - CPPUNIT_TEST_SUITE( ctors ); CPPUNIT_TEST( ctors_none ); CPPUNIT_TEST( ctors_acquire ); @@ -236,7 +230,6 @@ namespace osl_Socket }; // class ctors - /** testing the methods: inline Socket& SAL_CALL operator= ( oslSocket socketHandle); inline Socket& SAL_CALL operator= (const Socket& sock); @@ -259,7 +252,6 @@ namespace osl_Socket sHandle = NULL; } - /** test writer's comment: the assignment operator does not support direct assinment like: @@ -333,7 +325,6 @@ namespace osl_Socket }; // class operators - /** testing the methods: inline void SAL_CALL shutdown( oslSocketDirection Direction = osl_Socket_DirReadWrite ); inline void SAL_CALL close(); @@ -354,7 +345,6 @@ namespace osl_Socket sHandle = NULL; } - void close_001() { ::osl::Socket sSocket(sHandle); @@ -446,14 +436,12 @@ namespace osl_Socket sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getLocalAddr ); CPPUNIT_TEST( getLocalAddr_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getLocalAddr - /** testing the method: inline sal_Int32 SAL_CALL getLocalPort() const; */ @@ -473,7 +461,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalPort_001() { ::osl::Socket sSocket(sHandle); @@ -546,7 +533,6 @@ namespace osl_Socket }; // class getLocalPort - /** testing the method: inline ::rtl::OUString SAL_CALL getLocalHost() const; @@ -570,7 +556,6 @@ namespace osl_Socket sHandle = NULL; } - void getLocalHost_001() { ::osl::Socket sSocket(sHandle); @@ -621,7 +606,6 @@ namespace osl_Socket }; // class getLocalHost - /** testing the methods: inline void SAL_CALL getPeerAddr( SocketAddr & Addr) const; inline sal_Int32 SAL_CALL getPeerPort() const; @@ -635,7 +619,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -653,7 +636,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void getPeer_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); @@ -684,19 +666,16 @@ namespace osl_Socket ( peerPort == saLocalSocketAddr.getPort( ) )); } - CPPUNIT_TEST_SUITE( getPeer ); CPPUNIT_TEST( getPeer_001 ); CPPUNIT_TEST_SUITE_END(); }; // class getPeer - /** testing the methods: inline sal_Bool SAL_CALL bind(const SocketAddr& LocalInterface); */ - class bind : public CppUnit::TestFixture { public: @@ -712,7 +691,6 @@ namespace osl_Socket sHandle = NULL; } - void bind_001() { ::osl::Socket sSocket(sHandle); @@ -750,7 +728,6 @@ namespace osl_Socket }; // class bind - /** testing the methods: inline sal_Bool SAL_CALL isRecvReady(const TimeValue *pTimeout = 0) const; @@ -763,7 +740,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -781,7 +757,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isRecvReady_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT1 ); @@ -807,14 +782,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isRecvReady ); CPPUNIT_TEST( isRecvReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isRecvReady - /** testing the methods: inline sal_Bool SAL_CALL isSendReady(const TimeValue *pTimeout = 0) const; */ @@ -826,7 +799,6 @@ namespace osl_Socket ::osl::AcceptorSocket asAcceptorSocket; ::osl::ConnectorSocket csConnectorSocket; - // initialization void setUp( ) { @@ -844,7 +816,6 @@ namespace osl_Socket csConnectorSocket.close( ); } - void isSendReady_001() { ::osl::SocketAddr saLocalSocketAddr( rtl::OUString("127.0.0.1"), IP_PORT_MYPORT ); @@ -871,14 +842,12 @@ namespace osl_Socket ( sal_True == bOK3 ) ); } - CPPUNIT_TEST_SUITE( isSendReady ); CPPUNIT_TEST( isSendReady_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isSendReady - /** testing the methods: inline oslSocketType SAL_CALL getType() const; @@ -899,7 +868,6 @@ namespace osl_Socket sHandle = NULL; } - void getType_001() { sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -945,8 +913,6 @@ namespace osl_Socket }; // class getType - - /** testing the methods: inline sal_Int32 SAL_CALL getOption( oslSocketOption Option, @@ -1041,7 +1007,6 @@ namespace osl_Socket }; // class getOption - /** testing the methods: inline sal_Bool SAL_CALL setOption( oslSocketOption Option, void* pBuffer, @@ -1068,7 +1033,6 @@ namespace osl_Socket asAcceptorSocket.close( ); } - // LLA: // getSocketOption returns BufferLen, or -1 if something failed @@ -1188,8 +1152,6 @@ namespace osl_Socket }; // class setOption - - /** testing the method: inline sal_Bool SAL_CALL enableNonBlockingMode( sal_Bool bNonBlockingMode); */ @@ -1220,14 +1182,12 @@ namespace osl_Socket ( sal_True == bOK ) ); } - CPPUNIT_TEST_SUITE( enableNonBlockingMode ); CPPUNIT_TEST( enableNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); }; // class enableNonBlockingMode - /** testing the method: inline sal_Bool SAL_CALL isNonBlockingMode() const; */ @@ -1260,7 +1220,6 @@ namespace osl_Socket ( sal_False == bOK3 ) && ( sal_True == bOK4 ) ); } - CPPUNIT_TEST_SUITE( isNonBlockingMode ); CPPUNIT_TEST( isNonBlockingMode_001 ); CPPUNIT_TEST_SUITE_END(); @@ -1285,7 +1244,6 @@ namespace osl_Socket sHandle = NULL; } - void clearError_001() { ::osl::Socket sSocket(sHandle); @@ -1300,14 +1258,12 @@ namespace osl_Socket osl_Socket_E_None == sSocket.getError( ) && seBind != osl_Socket_E_None ); } - CPPUNIT_TEST_SUITE( clearError ); CPPUNIT_TEST( clearError_001 ); CPPUNIT_TEST_SUITE_END(); }; // class clearError - /** testing the methods: inline oslSocketError getError() const; inline ::rtl::OUString getErrorAsString( ) const; @@ -1327,7 +1283,6 @@ namespace osl_Socket sHandle = NULL; } - void getError_001() { ::osl::Socket sSocket(sHandle); @@ -1364,8 +1319,6 @@ namespace osl_Socket }; // class getError - - /** testing the methods: inline oslSocket getHandle() const; */ @@ -1410,10 +1363,6 @@ namespace osl_Socket }; // class getHandle - - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::operators); CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::close); @@ -1435,8 +1384,6 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 3a64cfc18551..6dc3fa462db5 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -48,7 +48,6 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> - #include "sockethelper.hxx" using namespace osl; @@ -70,7 +69,6 @@ using ::rtl::OString; #define IP_PORT_MYPORT4 8885 //8892 #define IP_PORT_NETBIOS_DGM 138 - namespace osl_SocketAddr { @@ -215,7 +213,6 @@ namespace osl_SocketAddr }; // class ctors - /** testing the method: inline sal_Bool is() const; */ @@ -255,7 +252,6 @@ namespace osl_SocketAddr }; // class is - /** testing the method: inline ::rtl::OUString SAL_CALL getHostname( oslSocketResult *pResult = 0 ) const; */ @@ -330,7 +326,6 @@ namespace osl_SocketAddr CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } - CPPUNIT_TEST_SUITE( getHostname ); CPPUNIT_TEST( getHostname_001 ); CPPUNIT_TEST( getHostname_002 ); @@ -338,7 +333,6 @@ namespace osl_SocketAddr }; // class getHostname - /** testing the method: inline sal_Int32 SAL_CALL getPort() const; */ @@ -382,7 +376,6 @@ namespace osl_SocketAddr }; // class getPort - /** testing the method: inline sal_Bool SAL_CALL setPort( sal_Int32 nPort ); rfc1413.txt: TCP port numbers are from 1-65535 @@ -451,7 +444,6 @@ namespace osl_SocketAddr bOK == sal_False); } - CPPUNIT_TEST_SUITE( setPort ); CPPUNIT_TEST( setPort_001 ); CPPUNIT_TEST( setPort_002 ); @@ -461,7 +453,6 @@ namespace osl_SocketAddr }; // class setPort - /** tester comment: In the following two functions, it use ::rtl::ByteSequence as an intermediate storage for address, @@ -471,7 +462,6 @@ namespace osl_SocketAddr so may be a sal_uInt8 array is better. */ - /** testing the method: inline sal_Bool SAL_CALL setAddr( const ::rtl::ByteSequence & address ); */ @@ -494,14 +484,12 @@ namespace osl_SocketAddr sal_True == bOK ); } - CPPUNIT_TEST_SUITE( setAddr ); CPPUNIT_TEST( setAddr_001 ); CPPUNIT_TEST_SUITE_END( ); }; // class setAddr - /** testing the method: inline ::rtl::ByteSequence SAL_CALL getAddr( oslSocketResult *pResult = 0 ) const; */ @@ -531,7 +519,6 @@ namespace osl_SocketAddr }; // class getAddr - /** testing the methods: inline SocketAddr & SAL_CALL operator= (oslSocketAddr Addr); inline SocketAddr & SAL_CALL operator= (const SocketAddr& Addr); @@ -560,7 +547,6 @@ namespace osl_SocketAddr sal_True == bOK ); } - void operator_equal_002() { ::osl::SocketAddr saSocketAddr( rtl::OUString("129.158.217.199"), IP_PORT_TELNET); @@ -650,8 +636,6 @@ namespace osl_SocketAddr }; // class operator_equal - - /** testing the method: inline oslSocketAddr SAL_CALL getHandle() const; */ @@ -691,7 +675,6 @@ namespace osl_SocketAddr }; // class getSocketAddrHandle - /** testing the method: static inline ::rtl::OUString SAL_CALL getLocalHostname( oslSocketResult *pResult = 0); */ @@ -745,7 +728,6 @@ namespace osl_SocketAddr }; // class getLocalHostname - /** testing the method: static inline void SAL_CALL resolveHostname( const ::rtl::OUString & strHostName , SocketAddr & Addr ); */ @@ -773,7 +755,6 @@ namespace osl_SocketAddr }; // class resolveHostname - /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, @@ -850,9 +831,6 @@ namespace osl_SocketAddr }; // class getFamilyOfSocketAddr - - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::is); //TODO: enable Test with valid host names @@ -870,8 +848,6 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index df7d21e89b2c..768d76eb5802 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -64,26 +64,20 @@ extern "C" # include <string.h> #endif - - // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length - #define OSLTEST_DECLARE( str_name, str_value ) \ static const sal_Char p##str_name[] = str_value; \ static const sal_Int32 n##str_name##Len = sizeof( p##str_name ) -1; \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( p##str_name ) - - // Ip version definition #define IP_VER 4 /// currently only IPv4 is considered. - // Hostnames. // OSLTEST_DECLARE( HostName1, "localhost" ); @@ -103,7 +97,6 @@ OSLTEST_DECLARE( HostIpInval, "123.45.67.89" ); //this is valid ip number,bu OSLTEST_DECLARE( HostNameInval, "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" ); OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); - // OS independent file definition OSLTEST_DECLARE( NullURL, "" ); diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index ff8ece1ca7b3..43f91d07c6d9 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -64,26 +64,20 @@ extern "C" # include <string.h> #endif - - // macro definition for the ASCII array/OUString declarations, // we use p### for the ASCII array, // a### for the OUString, // n###Len for its length - #define OSLTEST_DECLARE( str_name, str_value ) \ static const sal_Char p##str_name[] = str_value; \ static const sal_Int32 n##str_name##Len = sizeof( p##str_name ) -1; \ ::rtl::OUString a##str_name = rtl::OUString::createFromAscii( p##str_name ) - - // Ip version definition #define IP_VER 4 /// currently only IPv4 is considered. - // Ip port definition #define IP_PORT_ZERO 0 @@ -114,7 +108,6 @@ extern "C" #define IP_PORT_TMP 9999 #define IP_PORT_INVAL 99999 - // service definitions. OSLTEST_DECLARE( ServiceFTP, "ftp" ); @@ -124,13 +117,11 @@ OSLTEST_DECLARE( ServiceIMAP, "imap" ); OSLTEST_DECLARE( ServiceHTTPS, "https" ); OSLTEST_DECLARE( ServiceNETBIOS, "netbios-dgm" ); - // protocol definitions. OSLTEST_DECLARE( ProtocolTCP, "tcp" ); OSLTEST_DECLARE( ProtocolUDP, "udp" ); - // Hostnames. OSLTEST_DECLARE( HostName1, "localhost" ); @@ -150,7 +141,6 @@ OSLTEST_DECLARE( HostIpInval1, "123.345.67.89" ); //this is real invalid ip nu OSLTEST_DECLARE( HostNameInval, "www.the_hostname_that_can_not_resolvable_to_an_IP_Address.com" ); OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); - // OS independent file definition OSLTEST_DECLARE( NullURL, "" ); diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 21384786e83b..2262f40177b3 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include <sal/types.h> @@ -30,11 +29,8 @@ // helper functions - - // tests cases begins here - namespace osl_Socket { @@ -58,9 +54,6 @@ namespace osl_Socket CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::tests); } - - - // 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 0d1e56d40547..d99753cf6763 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -62,10 +62,8 @@ 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 +254,6 @@ public: }; - // Helper functions, to create buffers, check buffers class ValueCheckProvider { @@ -309,7 +306,6 @@ public: }; - /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -487,8 +483,6 @@ public: } }; - - namespace osl_StreamSocket { @@ -519,7 +513,6 @@ namespace osl_StreamSocket sHandle = NULL; } - void ctors_none() { /// Socket constructor. @@ -692,8 +685,6 @@ namespace osl_StreamSocket CPPUNIT_TEST_SUITE_END(); }; // class send_recv - - class SendClientThread : public Thread { protected: @@ -891,13 +882,11 @@ namespace osl_StreamSocket /**tester's comments: lack of a case that return sal_True, do not know when it will return sal_True*/ - CPPUNIT_TEST_SUITE( isExceptionPending ); CPPUNIT_TEST( isExPending_001 ); CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending - /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -943,12 +932,10 @@ namespace osl_StreamSocket pTimeout->Seconds = 20; pTimeout->Nanosec = 0; - // blocking mode, if read/recv failed, block until success t_print("enableNonBlockingMode(false)\n"); aSocket.enableNonBlockingMode( sal_False ); - t_print("connect()\n"); oslSocketResult eResult = aSocket.connect( aSocketAddr, pTimeout ); if ( osl_Socket_Ok == eResult) @@ -1017,8 +1004,6 @@ namespace osl_StreamSocket }; - - class justtest : public CppUnit::TestFixture { void send_Acceptor(rtl::OString const& _sAddr, osl::Condition &) @@ -1039,7 +1024,6 @@ namespace osl_StreamSocket rtl::OUString aHostname = aSocketAddr.getHostname(); aSocketAddr.getPort(); - //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket aSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); @@ -1075,8 +1059,6 @@ namespace osl_StreamSocket aSocket.close(); } - - void send_Connector(rtl::OString const& _sAddr, osl::Condition &/*_aCondition*/ ) { ::osl::ConnectorSocket aSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); @@ -1129,7 +1111,6 @@ namespace osl_StreamSocket aSocket.close(); } - public: // LLA: send_Connector_2_margritte works, it send strings to echo server on margritte // but can not receive anything @@ -1178,8 +1159,6 @@ namespace osl_StreamSocket send_Connector_2_margritte(sAddr); } - - void send_recv() { rtl::OString sAddr; @@ -1263,7 +1242,6 @@ namespace osl_StreamSocket } } - void getPage(rtl::OString const& _sAddr); void test_getPage() { @@ -1280,7 +1258,6 @@ namespace osl_StreamSocket CPPUNIT_TEST_SUITE_END(); }; // class isExceptionPending - void justtest::getPage(rtl::OString const& _sAddr) { rtl::OUString suAddr = rtl::OUString::createFromAscii(_sAddr.getStr()); @@ -1349,7 +1326,6 @@ namespace osl_StreamSocket sal_Int32 nBufferSize = strlen(pBuffer); ssStreamConnection.write( pBuffer, nBufferSize ); - char *pBufferPeek = (char*) malloc(1024); sal_Int32 nReadNumber = 1; while ( nReadNumber != 0) @@ -1372,8 +1348,6 @@ namespace osl_StreamSocket aSocket.close(); } - - CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::ctors); CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::send_recv); // CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::shutdown); @@ -1383,8 +1357,6 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 3f822fa46d42..3057c350f3a0 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -35,15 +35,12 @@ # define t_print printf #endif - // Ip version definition #define IP_VER 4 /// currently only IPv4 is considered. - // helper functions - /** compare two OUString. */ sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 ) diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 4c45369d3eaf..b4698077971a 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -40,7 +40,6 @@ extern "C" { #endif - // OS dependent declaration and includes #if ( defined UNX ) //Unix diff --git a/sal/qa/rtl/alloc/rtl_alloc.cxx b/sal/qa/rtl/alloc/rtl_alloc.cxx index 9bf2716266be..b0f58a63c613 100644 --- a/sal/qa/rtl/alloc/rtl_alloc.cxx +++ b/sal/qa/rtl/alloc/rtl_alloc.cxx @@ -134,12 +134,10 @@ public: CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::Memory); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_alloc::TestZeroMemory); } // namespace rtl_alloc - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx index 4e39fbdf7095..a80d10850e4e 100644 --- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx +++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // Documentation about bootstraping can be found at: // http://udk.openoffice.org/common/man/concept/micro_deployment.html @@ -92,7 +91,6 @@ inline ::rtl::OUString getModulePath( void ) #define TESTSHL2_INI "testshl2" #define PSEUDO_INI "pseudo" - static rtl::OUString getExecutableDirectory() { rtl::OUString fileName; @@ -106,7 +104,6 @@ static rtl::OUString getExecutableDirectory() return aDirURL; } - // get the URL of testshl2rc/rtlrc/pseudorc inline rtl::OUString t_getSourcePath(rtl::OString const& _sFilename) { @@ -135,8 +132,6 @@ void thread_sleep_tenth_sec(sal_Int32 _nTenthSec) #endif } - - namespace rtl_Bootstrap { class ctor : public CppUnit::TestFixture @@ -767,8 +762,6 @@ namespace rtl_Bootstrap } // namespace rtl_Bootstrap - - static void removeAndCreateFile(rtl::OUString const& _suFileURL, rtl::OString const& _sContent) { osl::File::remove(_suFileURL); @@ -800,7 +793,6 @@ 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 +815,6 @@ static void create_rtlrc() removeAndCreateFile(aFileURL, sLines); } - static void create_testshl2rc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -862,8 +853,6 @@ static void create_testshl2rc() SAL_CONFIGFILE("rtl")); } - - static void create_pseudorc() { rtl::OUString aFileURL(getExecutableDirectory()); @@ -880,7 +869,6 @@ static void create_pseudorc() removeAndCreateFile(aFileURL, sLines); } - void create_bootstrap_processrc() { rtl::OUString aDirURL(getModulePath()); @@ -897,7 +885,6 @@ void create_bootstrap_processrc() removeAndCreateFile(aDirURL, sLines); } - void RegisterAdditionalFunctions(FktRegFuncPtr _pFunc) { (void) _pFunc; diff --git a/sal/qa/rtl/cipher/rtl_cipher.cxx b/sal/qa/rtl/cipher/rtl_cipher.cxx index 9a71bb568bd7..0f713738e8cf 100644 --- a/sal/qa/rtl/cipher/rtl_cipher.cxx +++ b/sal/qa/rtl/cipher/rtl_cipher.cxx @@ -27,7 +27,6 @@ #include <rtl/strbuf.hxx> #include <rtl/cipher.h> - namespace rtl_cipher { @@ -103,7 +102,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class create - class createBF : public CppUnit::TestFixture { public: @@ -605,8 +603,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class initBF - - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::create); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::createBF); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_cipher::decode); @@ -620,9 +616,6 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/crc32/rtl_crc32.cxx b/sal/qa/rtl/crc32/rtl_crc32.cxx index 81a507b33f0e..ad7dff456b9f 100644 --- a/sal/qa/rtl/crc32/rtl_crc32.cxx +++ b/sal/qa/rtl/crc32/rtl_crc32.cxx @@ -39,7 +39,6 @@ public: { } - // insert your test code here. void rtl_crc32_001() { @@ -143,8 +142,6 @@ public: CPPUNIT_ASSERT_MESSAGE("checksum should differ", nCRC1 != nCRC2); } - - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -159,13 +156,9 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/digest/rtl_digest.cxx b/sal/qa/rtl/digest/rtl_digest.cxx index 6745ee210be9..94d18b87c283 100644 --- a/sal/qa/rtl/digest/rtl_digest.cxx +++ b/sal/qa/rtl/digest/rtl_digest.cxx @@ -151,7 +151,6 @@ public: rtl_digest_destroy( handle ); } - handle = rtl_digest_create( rtl_Digest_AlgorithmInvalid ); nAlgoLength = rtl_digest_queryLength(handle); CPPUNIT_ASSERT_MESSAGE("query length", 0 == nAlgoLength); diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx index 1a8912bbcd91..6c4227efc2cc 100644 --- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx +++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // include files #include <sal/types.h> @@ -39,7 +38,6 @@ #include <time.h> #endif - #define CONST_TEST_STRING "gregorian" namespace { @@ -50,7 +48,6 @@ struct Gregorian : public rtl::StaticWithInit<rtl::OUString, Gregorian> { }; } - namespace ThreadHelper { // typedef enum { @@ -81,8 +78,6 @@ namespace ThreadHelper } } - - /** Simple thread for testing Thread-create. * Just add 1 of value 0, and after running, result is 1. */ @@ -142,7 +137,6 @@ public: } }; - namespace rtl_DoubleLocking { @@ -162,7 +156,6 @@ namespace rtl_DoubleLocking { } - void getValue_001() { rtl::OUString aStr = Gregorian::get(); diff --git a/sal/qa/rtl/locale/rtl_locale.cxx b/sal/qa/rtl/locale/rtl_locale.cxx index ecfc08a0237e..ef8d7e31a656 100644 --- a/sal/qa/rtl/locale/rtl_locale.cxx +++ b/sal/qa/rtl/locale/rtl_locale.cxx @@ -63,7 +63,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getDefault - class setDefault : public CppUnit::TestFixture { public: @@ -98,7 +97,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class setDefault - class getLanguage : public CppUnit::TestFixture { public: @@ -137,7 +135,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getLanguage - class getCountry : public CppUnit::TestFixture { public: @@ -176,7 +173,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getCountry - class getVariant : public CppUnit::TestFixture { public: @@ -215,7 +211,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class getVariant - class hashCode : public CppUnit::TestFixture { public: @@ -254,7 +249,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class hashCode - class equals : public CppUnit::TestFixture { public: @@ -300,7 +294,6 @@ 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); @@ -310,9 +303,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_locale::hashCode); 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 460d001be5fc..374f9c3ca48b 100644 --- a/sal/qa/rtl/logfile/rtl_logfile.cxx +++ b/sal/qa/rtl/logfile/rtl_logfile.cxx @@ -92,8 +92,6 @@ inline ::rtl::OUString getCurrentPID( ) return ( ::rtl::OUString::valueOf( ( long )nPID ) ); } - - /* * LLA: * check if logfile is create @@ -186,7 +184,6 @@ namespace rtl_logfile // TODO: assertion test! } - CPPUNIT_TEST_SUITE( logfile ); CPPUNIT_TEST( logfile_001 ); CPPUNIT_TEST( logfile_002 ); @@ -196,10 +193,8 @@ 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. @@ -235,6 +230,4 @@ public: GlobalObject theGlobalObject; - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/ostring/rtl_OString2.cxx b/sal/qa/rtl/ostring/rtl_OString2.cxx index e0fd0a26a40f..5c7605758b09 100644 --- a/sal/qa/rtl/ostring/rtl_OString2.cxx +++ b/sal/qa/rtl/ostring/rtl_OString2.cxx @@ -173,7 +173,6 @@ public: valueOf_double_test(nValue); } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -198,7 +197,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class valueOf - // - toDouble (tests) class toDouble : public CppUnit::TestFixture @@ -211,8 +209,6 @@ public: // testPrecision a; } - - // initialise your test code values here. void setUp() { @@ -351,7 +347,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class toDouble - // - getToken (tests) class getToken : public CppUnit::TestFixture @@ -368,8 +363,6 @@ public: { } - - void getToken_000() { rtl::OString sTokenStr; @@ -453,7 +446,6 @@ public: CPPUNIT_ASSERT_MESSAGE("index should be negative", nIndex == -1); } - CPPUNIT_TEST_SUITE(getToken); CPPUNIT_TEST(getToken_000); CPPUNIT_TEST(getToken_001); @@ -463,11 +455,9 @@ 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 @@ -495,7 +485,6 @@ public: return bRes; } - void replaceAt_001() { sal_Bool bRes = check_replaceAt(new rtl::OString("Java@Sun"), @@ -532,7 +521,6 @@ public: CPPUNIT_ASSERT_MESSAGE("replace with null string", bRes == sal_True); } - CPPUNIT_TEST_SUITE(replaceAt); CPPUNIT_TEST(replaceAt_001); CPPUNIT_TEST(replaceAt_002); @@ -542,8 +530,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class replaceAt - - CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::valueOf); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::toDouble); CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OString::getToken); @@ -551,9 +537,6 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/ostring/rtl_str.cxx b/sal/qa/rtl/ostring/rtl_str.cxx index 2f871da395ab..116191d353c4 100644 --- a/sal/qa/rtl/ostring/rtl_str.cxx +++ b/sal/qa/rtl/ostring/rtl_str.cxx @@ -82,7 +82,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - class compareIgnoreAsciiCase : public CppUnit::TestFixture { public: @@ -147,8 +146,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compareIgnoreAsciiCase - - class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -231,9 +228,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - - - class hashCode : public CppUnit::TestFixture { public: @@ -285,9 +279,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - - - class indexOfChar : public CppUnit::TestFixture { public: @@ -333,7 +324,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - class lastIndexOfChar : public CppUnit::TestFixture { public: @@ -379,9 +369,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfChar - - - class indexOfStr : public CppUnit::TestFixture { public: @@ -433,8 +420,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class compare - - class lastIndexOfStr : public CppUnit::TestFixture { public: @@ -497,8 +482,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfStr - - class replaceChar : public CppUnit::TestFixture { public: @@ -533,8 +516,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class replaceChar_WithLength : public CppUnit::TestFixture { public: @@ -574,9 +555,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class toAsciiLowerCase : public CppUnit::TestFixture { public: @@ -611,7 +589,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiLowerCase_WithLength : public CppUnit::TestFixture { public: @@ -647,8 +624,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class toAsciiUpperCase : public CppUnit::TestFixture { public: @@ -683,7 +658,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiUpperCase_WithLength : public CppUnit::TestFixture { public: @@ -719,9 +693,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class trim_WithLength : public CppUnit::TestFixture { public: @@ -822,8 +793,6 @@ namespace rtl_str CPPUNIT_TEST_SUITE_END(); }; - - class valueOfChar : public CppUnit::TestFixture { public: @@ -854,7 +823,6 @@ 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,8 +846,6 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/ostring/rtl_string.cxx b/sal/qa/rtl/ostring/rtl_string.cxx index a8b2244217ad..4a92cffb8f8f 100644 --- a/sal/qa/rtl/ostring/rtl_string.cxx +++ b/sal/qa/rtl/ostring/rtl_string.cxx @@ -60,8 +60,6 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class getLength - - class newFromString : public CppUnit::TestFixture { public: @@ -94,8 +92,6 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class newFromString - - class convertUStringToString : public CppUnit::TestFixture { public: @@ -148,8 +144,6 @@ namespace rtl_string CPPUNIT_ASSERT_MESSAGE("Strings must be equal", bRet == sal_True && sString.equals(rtl::OString("Tsch\xFC\xDF")) == sal_True); } - - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -162,17 +156,12 @@ namespace rtl_string CPPUNIT_TEST_SUITE_END(); }; // class convertUStringToString - - } // 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/oustring/rtl_OUString2.cxx b/sal/qa/rtl/oustring/rtl_OUString2.cxx index 7e6721160546..0628d504d9c7 100644 --- a/sal/qa/rtl/oustring/rtl_OUString2.cxx +++ b/sal/qa/rtl/oustring/rtl_OUString2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // autogenerated file with codegen.pl #include <math.h> @@ -212,7 +211,6 @@ public: number_double_test(nValue); } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -237,7 +235,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class number - // testing the method toDouble() template<class T> @@ -246,7 +243,6 @@ sal_Int16 SAL_CALL checkPrecisionSize() // sal_Int16 nSize = sizeof(T); volatile T nCalcValue = 1.0; - // (i + 1) is the current precision // numerical series // 1.1 @@ -310,7 +306,6 @@ sal_Int16 SAL_CALL checkPrecisionSize() return i; } - class testPrecision { public: @@ -672,7 +667,6 @@ public: CPPUNIT_ASSERT_MESSAGE("expected position is wrong", nPos == _nExpectedResultPos); } - void lastIndexOf_test_oustring_offset_001() { // search for sun, start at the end, found (pos==0) @@ -846,7 +840,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOf - // - getToken (tests) class getToken : public CppUnit::TestFixture { @@ -1248,8 +1241,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION(rtl_OUString::convertFromString); } // namespace rtl_OUString - - // 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index b2a93d1901e1..bbf62f515ca5 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> @@ -35,7 +34,6 @@ inline void printOUString( ::rtl::OUString const & _suStr ) } */ - namespace rtl_ustr { @@ -43,7 +41,6 @@ namespace rtl_ustr { public: - void compare_000() { rtl_ustr_compare( NULL, NULL); @@ -96,7 +93,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compare - class compareIgnoreAsciiCase : public CppUnit::TestFixture { public: @@ -161,8 +157,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compareIgnoreAsciiCase - - class shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -245,7 +239,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compare - // // // class hashCode : public CppUnit::TestFixture @@ -300,9 +293,6 @@ namespace rtl_ustr // CPPUNIT_TEST_SUITE_END(); // }; // class compare - - - class indexOfChar : public CppUnit::TestFixture { public: @@ -348,7 +338,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class indexOfChar - class lastIndexOfChar : public CppUnit::TestFixture { public: @@ -394,9 +383,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfChar - - - class indexOfStr : public CppUnit::TestFixture { public: @@ -453,8 +439,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class compare - - class lastIndexOfStr : public CppUnit::TestFixture { public: @@ -517,8 +501,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class lastIndexOfStr - - class replaceChar : public CppUnit::TestFixture { public: @@ -556,8 +538,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class replaceChar_WithLength : public CppUnit::TestFixture { public: @@ -617,9 +597,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class toAsciiLowerCase : public CppUnit::TestFixture { public: @@ -657,7 +634,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiLowerCase_WithLength : public CppUnit::TestFixture { public: @@ -700,8 +676,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - class toAsciiUpperCase : public CppUnit::TestFixture { public: @@ -739,7 +713,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - class toAsciiUpperCase_WithLength : public CppUnit::TestFixture { public: @@ -777,9 +750,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class replaceChar - - - class trim_WithLength : public CppUnit::TestFixture { public: @@ -814,7 +784,6 @@ namespace rtl_ustr free(pStr); } - void trim_WithLength_002() { rtl::OUString suStr("trim this"); @@ -829,7 +798,6 @@ namespace rtl_ustr free(pStr); } - void trim_WithLength_003() { rtl::OUString suStr(" trim this"); @@ -887,8 +855,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - - class valueOfChar : public CppUnit::TestFixture { public: @@ -919,9 +885,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - - - class ascii_compare_WithLength : public CppUnit::TestFixture { public: @@ -1000,9 +963,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; - - - class ascii_shortenedCompareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -1067,8 +1027,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_shortenedCompareIgnoreAsciiCase_WithLength - - class ascii_compareIgnoreAsciiCase_WithLength : public CppUnit::TestFixture { public: @@ -1133,8 +1091,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase_WithLength - - class ascii_compare : public CppUnit::TestFixture { public: @@ -1191,8 +1147,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compare - - class ascii_compareIgnoreAsciiCase : public CppUnit::TestFixture { public: @@ -1279,7 +1233,6 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class ascii_compareIgnoreAsciiCase - // sample out of inc/rtl/ustring.hxx // rtl_uString * pToken = NULL; // sal_Int32 nIndex = 0; @@ -1377,7 +1330,6 @@ 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,11 +1361,8 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/rtl/process/child_process.cxx b/sal/qa/rtl/process/child_process.cxx index f7d38ae0f8c3..344a25f71a3b 100644 --- a/sal/qa/rtl/process/child_process.cxx +++ b/sal/qa/rtl/process/child_process.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include "sal/main.h" #include <rtl/process.h> diff --git a/sal/qa/rtl/process/child_process_id.cxx b/sal/qa/rtl/process/child_process_id.cxx index dd8c6e30af09..17f330fa703f 100644 --- a/sal/qa/rtl/process/child_process_id.cxx +++ b/sal/qa/rtl/process/child_process_id.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdio.h> #include "sal/main.h" #include <rtl/process.h> diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx index c17a45b344d9..0bd9c70e5078 100644 --- a/sal/qa/rtl/process/rtl_Process.cxx +++ b/sal/qa/rtl/process/rtl_Process.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -147,7 +146,6 @@ public: delete pInfo; } - CPPUNIT_TEST_SUITE(getAppCommandArg); CPPUNIT_TEST(getAppCommandArg_001); // CPPUNIT_TEST(getAppCommandArg_002); @@ -281,7 +279,6 @@ public: CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getAppCommandArg, "rtl_Process"); CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(rtl_Process::getGlobalProcessId, "rtl_Process"); - // 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. CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h index 71f4ae7dbb68..8abffb2d7a96 100644 --- a/sal/qa/rtl/process/rtl_Process_Const.h +++ b/sal/qa/rtl/process/rtl_Process_Const.h @@ -20,7 +20,6 @@ #ifndef _RTL_PROCESS_CONST_H_ #define _RTL_PROCESS_CONST_H_ - #include <rtl/ustring.hxx> using namespace ::rtl; @@ -35,7 +34,6 @@ extern "C" ::rtl::OUString suParam2(RTL_CONSTASCII_USTRINGPARAM("-child")); ::rtl::OUString suParam3(RTL_CONSTASCII_USTRINGPARAM("-process")); - #ifdef __cplusplus } #endif diff --git a/sal/qa/rtl/random/rtl_random.cxx b/sal/qa/rtl/random/rtl_random.cxx index f9606d4d778f..752769fe782b 100644 --- a/sal/qa/rtl/random/rtl_random.cxx +++ b/sal/qa/rtl/random/rtl_random.cxx @@ -68,7 +68,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class createPool - class destroyPool : public CppUnit::TestFixture { public: @@ -107,7 +106,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class destroyPool - class addBytes : public CppUnit::TestFixture { public: @@ -161,7 +159,6 @@ public: delete [] pBuffer; } - // Change the following lines only, if you add, remove or rename // member functions of the current class, // because these macros are need by auto register mechanism. @@ -172,7 +169,6 @@ public: CPPUNIT_TEST_SUITE_END(); }; // class addBytes - class Statistics { int m_nDispensation[256]; @@ -394,7 +390,6 @@ 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 bb64f4b9c10d..45ce5912f125 100644 --- a/sal/qa/rtl/textenc/rtl_tencinfo.cxx +++ b/sal/qa/rtl/textenc/rtl_tencinfo.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <string.h> #include <osl/thread.h> @@ -467,8 +466,6 @@ namespace CPPUNIT_TEST_SUITE_END( ); }; - - class testBestUnix : public CppUnit::TestFixture { public: diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 3c7742212d11..92e247de8a5d 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "sal/config.h" #include <cstddef> diff --git a/sal/qa/rtl/uri/rtl_Uri.cxx b/sal/qa/rtl/uri/rtl_Uri.cxx index e8c4e764b72c..7465215a1d7b 100644 --- a/sal/qa/rtl/uri/rtl_Uri.cxx +++ b/sal/qa/rtl/uri/rtl_Uri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <stdlib.h> #include <rtl/strbuf.hxx> #include <rtl/uri.hxx> @@ -28,12 +27,9 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> - - namespace Stringtest { - class Convert : public CppUnit::TestFixture { rtl::OUString m_aStr; @@ -170,7 +166,6 @@ namespace Stringtest return sType; } - void test_UTF8_files() { #ifdef UNX @@ -240,7 +235,6 @@ namespace Stringtest } - CPPUNIT_TEST_SUITE_REGISTRATION( Stringtest::Convert ); // LLA: doku anpassen!!! diff --git a/sal/qa/rtl/uri/rtl_testuri.cxx b/sal/qa/rtl/uri/rtl_testuri.cxx index fce4aa5d0c5d..de239a4acaf4 100644 --- a/sal/qa/rtl/uri/rtl_testuri.cxx +++ b/sal/qa/rtl/uri/rtl_testuri.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "rtl/strbuf.hxx" #include "rtl/uri.hxx" #include "rtl/ustrbuf.hxx" diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx index 5b756013e723..56c3e41e8f4c 100644 --- a/sal/qa/rtl/uuid/rtl_Uuid.cxx +++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <math.h> #include <stdio.h> #include <string.h> @@ -204,11 +203,8 @@ 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. CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx index 22069c9acbe7..d4d4db492403 100644 --- a/sal/qa/systools/test_comtools.cxx +++ b/sal/qa/systools/test_comtools.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - // autogenerated file with codegen.pl #include <testshl/simpleheader.hxx> @@ -228,12 +227,10 @@ namespace test_comtools CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_comtools::test_COMReference, "test_comtools"); } // namespace rtl_OUString - // 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. NOADDITIONAL; |