diff options
Diffstat (limited to 'sal/qa')
-rw-r--r-- | sal/qa/OStringBuffer/rtl_String_Const.h | 34 | ||||
-rw-r--r-- | sal/qa/OStringBuffer/rtl_String_Utils.hxx | 4 | ||||
-rw-r--r-- | sal/qa/osl/condition/osl_Condition_Const.h | 4 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 26 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File_Const.h | 40 | ||||
-rw-r--r-- | sal/qa/osl/file/test_cpy_wrt_file.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/module/osl_Module_Const.h | 4 | ||||
-rw-r--r-- | sal/qa/osl/process/osl_process.cxx | 12 | ||||
-rw-r--r-- | sal/qa/osl/process/osl_process_child.cxx | 14 | ||||
-rw-r--r-- | sal/qa/osl/profile/osl_old_testprofile.cxx | 2 | ||||
-rw-r--r-- | sal/qa/osl/socket/osl_Socket_Const.h | 20 | ||||
-rw-r--r-- | sal/qa/osl/socket/osl_Socket_Const_orig.h | 32 | ||||
-rw-r--r-- | sal/qa/osl/socket/sockethelper.hxx | 4 | ||||
-rw-r--r-- | sal/qa/rtl/oustring/rtl_ustr.cxx | 10 | ||||
-rw-r--r-- | sal/qa/rtl/process/rtl_Process_Const.h | 6 | ||||
-rw-r--r-- | sal/qa/rtl/textenc/rtl_textcvt.cxx | 8 |
16 files changed, 111 insertions, 111 deletions
diff --git a/sal/qa/OStringBuffer/rtl_String_Const.h b/sal/qa/OStringBuffer/rtl_String_Const.h index d07d7e92f3ee..19e25c1d25f3 100644 --- a/sal/qa/OStringBuffer/rtl_String_Const.h +++ b/sal/qa/OStringBuffer/rtl_String_Const.h @@ -294,7 +294,7 @@ 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; @@ -319,25 +319,25 @@ 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; @@ -352,7 +352,7 @@ static const double expValDouble[nDoubleCount]= 1.7e-309,6.5822e-16,1.7e+307,2.2e30,3.1,3.1,-3.1, 0.0,0.0,0.0,1.00e+308 }; -//------------------------------------------------------------------------ + static const sal_Int32 nFloatCount=22; static const float expValFloat[nFloatCount] = { @@ -362,7 +362,7 @@ static const float expValFloat[nFloatCount] = 1.00e38f,6.241e-37f,6.241e37f,3.1f,3.1f,-3.1f, 3.1f,0.0f,0.0f,0.0f }; -//------------------------------------------------------------------------ + static const sal_Int32 nCharCount=15; static const sal_Unicode expValChar[nCharCount] = { @@ -371,7 +371,7 @@ static const sal_Unicode expValChar[nCharCount] = 64,10,39,34, 0,0,83 }; -//------------------------------------------------------------------------ + static const sal_Int32 nDefaultCount=6; static const sal_Unicode input1Default[nDefaultCount] = { @@ -385,7 +385,7 @@ static const sal_Int32 expValDefault[nDefaultCount] = { 4,9,-1,-1,3,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nNormalCount=10; static const sal_Unicode input1Normal[nNormalCount] = { @@ -399,7 +399,7 @@ static const sal_Int32 expValNormal[nNormalCount] = { 4,-1,-1,9,15,-1,-1,-1,-1,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nlastDefaultCount=5; static const sal_Unicode input1lastDefault[nlastDefaultCount] = { @@ -413,7 +413,7 @@ static const sal_Int32 expVallastDefault[nlastDefaultCount] = { 4,15,-1,21,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nlastNormalCount=8; static const sal_Unicode input1lastNormal[nlastNormalCount] = { @@ -427,7 +427,7 @@ static const sal_Int32 expVallastNormal[nlastNormalCount] = { 4,-1,4,15,-1,-1,-1,-1 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrDefaultCount=6; static const sal_Int32 input2StrDefault[nStrDefaultCount] = { @@ -437,7 +437,7 @@ static const sal_Int32 expValStrDefault[nStrDefaultCount] = { 0,4,-1,-1,-1,3 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrNormalCount=9; static const sal_Int32 input2StrNormal[nStrNormalCount] = { @@ -447,7 +447,7 @@ static const sal_Int32 expValStrNormal[nStrNormalCount] = { 0,-1,4,-1,-1,-1,-1,-1,3 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrLastDefaultCount=6; static const sal_Int32 input2StrLastDefault[nStrLastDefaultCount] = { @@ -457,7 +457,7 @@ static const sal_Int32 expValStrLastDefault[nStrLastDefaultCount] = { 0,4,-1,-1,-1,3 }; -//------------------------------------------------------------------------ + static const sal_Int32 nStrLastNormalCount=12; static const sal_Int32 input2StrLastNormal[nStrLastNormalCount] = { @@ -467,10 +467,10 @@ static const sal_Int32 expValStrLastNormal[nStrLastNormalCount] = { 0,-1,0,4,-1,-1,-1,-1,-1,3,15,11 }; -//------------------------------------------------------------------------ + static const sal_Int32 kNonSInt32Max = INT_MIN; static const sal_Int32 kNonSInt16Max = SHRT_MIN; -//------------------------------------------------------------------------ + #ifdef __cplusplus } #endif diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index 75e0bf6a9d4a..276e3a29ebfc 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -42,13 +42,13 @@ 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 diff --git a/sal/qa/osl/condition/osl_Condition_Const.h b/sal/qa/osl/condition/osl_Condition_Const.h index 04b6d1390091..e2f746a5cbc9 100644 --- a/sal/qa/osl/condition/osl_Condition_Const.h +++ b/sal/qa/osl/condition/osl_Condition_Const.h @@ -39,9 +39,9 @@ #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"; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index b5c5faaf05e8..b1aa84bbb908 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -258,7 +258,7 @@ inline bool t_compareTime( TimeValue *m_aEndTime, TimeValue *m_aStartTime, sal_ { // sal_uInt64 uTimeValue; // sal_Int64 iTimeValue; - // + // iTimeValue = t_abs64(( tv1->Seconds - tv2->Seconds) * 1000000000 + tv1->Nanosec - tv2->Nanosec); // uTimeValue = ( iTimeValue / 1000000 ); @@ -6022,9 +6022,9 @@ namespace osl_Directory CPPUNIT_TEST_SUITE_END(); };// class remove - //######################################## + // TEST Directory::createPath - //######################################## + #ifdef WNT # define PATH_BUFFER_SIZE MAX_PATH @@ -6034,7 +6034,7 @@ namespace osl_Directory #define TEST_PATH_POSTFIX "hello/world" - //######################################## + OUString get_test_path() { static OUString test_path; @@ -6088,7 +6088,7 @@ namespace osl_Directory return test_path; } - //######################################## + void rm_test_path(const OUString& path) { sal_Unicode buffer[PATH_BUFFER_SIZE]; @@ -6109,7 +6109,7 @@ namespace osl_Directory } } - //######################################## + class DirCreatedObserver : public DirectoryCreationObserver { public: @@ -6132,15 +6132,15 @@ namespace osl_Directory }; - //######################################## + class createPath : public CppUnit::TestFixture { public: - //########################################## + createPath() {} - //########################################## + void with_relative_path() { FileBase::RC rc = Directory::createPath( OUString(TEST_PATH_POSTFIX)); @@ -6153,7 +6153,7 @@ namespace osl_Directory ); } - //########################################## + void without_callback() { OUString tp_url = get_test_path(); @@ -6171,7 +6171,7 @@ namespace osl_Directory ); } - //########################################## + void with_callback() { OUString tp_url = get_test_path(); @@ -6195,7 +6195,7 @@ namespace osl_Directory #ifdef WNT - //########################################## + const char* get_unused_drive_letter() { static const char m_aBuff[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; @@ -6213,7 +6213,7 @@ namespace osl_Directory return NULL; } - //########################################## + void at_invalid_logical_drive() { const char* drv = get_unused_drive_letter(); diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index 281002bba0f3..ccb27f157992 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -36,19 +36,19 @@ extern "C" -//------------------------------------------------------------------------ + // 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, @@ -57,17 +57,17 @@ const sal_Char pBuffer_Blank[] = ""; // PATH_LIST_DELIMITER for separator of path list in comrresponding platform, // 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 # include <unistd.h> # include <limits.h> @@ -106,12 +106,12 @@ const sal_Char pBuffer_Blank[] = ""; #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 ) ) @@ -119,9 +119,9 @@ const sal_Char pBuffer_Blank[] = ""; #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, "" ); OSLTEST_DECLARE( SlashURL, PATH_SEPARATOR ); OSLTEST_DECLARE( PreURL, FILE_PREFIX ); @@ -132,9 +132,9 @@ 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" ); OSLTEST_DECLARE( CanURL2, "ca@#;+.,$///78no\0ni..name" ); OSLTEST_DECLARE( CanURL3, "ca@#;+.,$//tmp/678nonical//name" ); @@ -158,9 +158,9 @@ 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 ); OSLTEST_DECLARE( SysPath1, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system.path" ); OSLTEST_DECLARE( SysPath2, TEST_PLATFORM_ROOT TEST_PLATFORM_TEMP "/system/path" ); @@ -170,11 +170,11 @@ 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. -//------------------------------------------------------------------------ + #if ( defined UNX ) // Unix OSLTEST_DECLARE( TypeURL1, FILE_PREFIX "dev/ccv"); //socket Solaris/Linux OSLTEST_DECLARE( TypeURL2, FILE_PREFIX "devices/pseudo/tcp@0:tcp"); //special Solaris/Linux @@ -185,10 +185,10 @@ 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. -//------------------------------------------------------------------------ + #if ( defined UNX ) // Unix OSLTEST_DECLARE( VolURL1, FILE_PREFIX ""); //ufs Solaris/Linux #ifdef SOLARIS diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx index 2311e842c0cd..a808fb942a13 100644 --- a/sal/qa/osl/file/test_cpy_wrt_file.cxx +++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx @@ -72,7 +72,7 @@ public: CPPUNIT_TEST_SUITE_END(); }; -//##################################### + // register test suites CPPUNIT_TEST_SUITE_REGISTRATION(test_osl_writeFile); diff --git a/sal/qa/osl/module/osl_Module_Const.h b/sal/qa/osl/module/osl_Module_Const.h index 4517967929d8..4dd4fe437f40 100644 --- a/sal/qa/osl/module/osl_Module_Const.h +++ b/sal/qa/osl/module/osl_Module_Const.h @@ -38,9 +38,9 @@ # define FILE_PREFIX "file:///" -//------------------------------------------------------------------------ + // function pointer type. -//------------------------------------------------------------------------ + typedef sal_Bool (* FuncPtr )( sal_Bool ); diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx index 36ecf045c65a..9df0de13f922 100644 --- a/sal/qa/osl/process/osl_process.cxx +++ b/sal/qa/osl/process/osl_process.cxx @@ -70,7 +70,7 @@ const rtl::OUString EXECUTABLE_NAME ("osl_process_child"); #endif -//######################################## + using namespace osl; using ::rtl::OUString; @@ -102,7 +102,7 @@ inline ::rtl::OUString getExecutablePath( void ) //rtl::OUString CWD = getExecutablePath(); -//######################################## + class Test_osl_joinProcess : public CppUnit::TestFixture { const OUString join_param_; @@ -308,13 +308,13 @@ 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: @@ -405,7 +405,7 @@ namespace } #endif -//######################################################### + class Test_osl_executeProcess : public CppUnit::TestFixture { const OUString env_param_; @@ -748,7 +748,7 @@ 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 aedfc391e145..3a303d5bae9b 100644 --- a/sal/qa/osl/process/osl_process_child.cxx +++ b/sal/qa/osl/process/osl_process_child.cxx @@ -18,7 +18,7 @@ */ -//######################################## + #if ( defined WNT ) // Windows @@ -48,7 +48,7 @@ # endif #endif -//######################################## + #ifdef WNT @@ -57,22 +57,22 @@ # 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) { LPCWSTR strW = reinterpret_cast<LPCWSTR>(_strW); WideCharToMultiByte(CP_ACP, 0, strW, -1, strA, size, NULL, NULL); } -//######################################## + void dump_env(char* file_path) { LPTSTR env = reinterpret_cast<LPTSTR>( @@ -99,7 +99,7 @@ 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 68c8bd3f75e4..5bdededb7eea 100644 --- a/sal/qa/osl/profile/osl_old_testprofile.cxx +++ b/sal/qa/osl/profile/osl_old_testprofile.cxx @@ -26,7 +26,7 @@ #include <stdio.h> #include <osl/profile.h> -//================================================================================================== + namespace osl_Profile { diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index c992fe7fc1a6..df7d21e89b2c 100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -40,9 +40,9 @@ extern "C" #endif # include <stdio.h> -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> @@ -65,12 +65,12 @@ extern "C" #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; \ @@ -78,14 +78,14 @@ extern "C" ::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" ); // OSLTEST_DECLARE( HostIp1, "127.0.0.1" ); OSLTEST_DECLARE( HostName2, "longshot.prc.sun.com" ); @@ -103,9 +103,9 @@ 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, "" ); #ifdef __cplusplus diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index ce63ed8fd603..ff8ece1ca7b3 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -40,9 +40,9 @@ extern "C" #endif # include <stdio.h> -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> @@ -65,12 +65,12 @@ extern "C" #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; \ @@ -78,14 +78,14 @@ extern "C" ::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 #define IP_PORT_FTP 21 #define IP_PORT_TELNET 23 @@ -114,9 +114,9 @@ extern "C" #define IP_PORT_TMP 9999 #define IP_PORT_INVAL 99999 -//------------------------------------------------------------------------ + // service definitions. -//------------------------------------------------------------------------ + OSLTEST_DECLARE( ServiceFTP, "ftp" ); OSLTEST_DECLARE( ServiceTELNET, "telnet" ); OSLTEST_DECLARE( ServiceGOPHER, "gopher" ); @@ -124,15 +124,15 @@ 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" ); OSLTEST_DECLARE( HostIp1, "127.0.0.1" ); OSLTEST_DECLARE( HostName2, "longshot.prc.sun.com" ); @@ -150,9 +150,9 @@ 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, "" ); #ifdef __cplusplus diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 49785cd50432..4c45369d3eaf 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -40,9 +40,9 @@ extern "C" { #endif -//------------------------------------------------------------------------ + // OS dependent declaration and includes -//------------------------------------------------------------------------ + #if ( defined UNX ) //Unix #include <unistd.h> diff --git a/sal/qa/rtl/oustring/rtl_ustr.cxx b/sal/qa/rtl/oustring/rtl_ustr.cxx index 9235a910c7c4..b2a93d1901e1 100644 --- a/sal/qa/rtl/oustring/rtl_ustr.cxx +++ b/sal/qa/rtl/oustring/rtl_ustr.cxx @@ -299,10 +299,10 @@ namespace rtl_ustr // CPPUNIT_TEST(hashCode_003); // CPPUNIT_TEST_SUITE_END(); // }; // class compare -// -// -// -// + + + + class indexOfChar : public CppUnit::TestFixture { public: @@ -348,7 +348,7 @@ namespace rtl_ustr CPPUNIT_TEST_SUITE_END(); }; // class indexOfChar -// + class lastIndexOfChar : public CppUnit::TestFixture { public: diff --git a/sal/qa/rtl/process/rtl_Process_Const.h b/sal/qa/rtl/process/rtl_Process_Const.h index ebf0b3cb4120..71f4ae7dbb68 100644 --- a/sal/qa/rtl/process/rtl_Process_Const.h +++ b/sal/qa/rtl/process/rtl_Process_Const.h @@ -20,7 +20,7 @@ #ifndef _RTL_PROCESS_CONST_H_ #define _RTL_PROCESS_CONST_H_ -//------------------------------------------------------------------------ + #include <rtl/ustring.hxx> using namespace ::rtl; @@ -29,13 +29,13 @@ using namespace ::rtl; extern "C" { #endif -//------------------------------------------------------------------------ + ::rtl::OUString suParam0(RTL_CONSTASCII_USTRINGPARAM("-join")); ::rtl::OUString suParam1(RTL_CONSTASCII_USTRINGPARAM("-with")); ::rtl::OUString suParam2(RTL_CONSTASCII_USTRINGPARAM("-child")); ::rtl::OUString suParam3(RTL_CONSTASCII_USTRINGPARAM("-process")); -//------------------------------------------------------------------------ + #ifdef __cplusplus } #endif diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx b/sal/qa/rtl/textenc/rtl_textcvt.cxx index 5c957f633cf0..3c7742212d11 100644 --- a/sal/qa/rtl/textenc/rtl_textcvt.cxx +++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx @@ -666,7 +666,7 @@ void Test::testSingleByte() { 0x03a6,0x0398,0x03a9,0x03b4,0x221e,0x03c6,0x03b5,0x2229, 0x2261,0x00b1,0x2265,0x2264,0x2320,0x2321,0x00f7,0x2248, 0x00b0,0x2219,0x00b7,0x221a,0x207f,0x00b2,0x25a0,0x00a0 } }, - // ... + { RTL_TEXTENCODING_ASCII_US, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, @@ -799,7 +799,7 @@ void Test::testSingleByte() { 0x00E8,0x00E9,0x00EA,0x00EB,0x00EC,0x00ED,0x00EE,0x00EF, 0xFFFF,0x00F1,0x00F2,0x00F3,0x00F4,0x0121,0x00F6,0x00F7, 0x011D,0x00F9,0x00FA,0x00FB,0x00FC,0x016D,0x015D,0x02D9 } }, - // ... + { RTL_TEXTENCODING_ISO_8859_6, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, @@ -833,7 +833,7 @@ void Test::testSingleByte() { 0x0648,0x0649,0x064A,0x064B,0x064C,0x064D,0x064E,0x064F, 0x0650,0x0651,0x0652,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF, 0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF,0xFFFF } }, - // ... + { RTL_TEXTENCODING_ISO_8859_8, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, @@ -867,7 +867,7 @@ void Test::testSingleByte() { 0x05D8,0x05D9,0x05DA,0x05DB,0x05DC,0x05DD,0x05DE,0x05DF, 0x05E0,0x05E1,0x05E2,0x05E3,0x05E4,0x05E5,0x05E6,0x05E7, 0x05E8,0x05E9,0x05EA,0xFFFF,0xFFFF,0x200E,0x200F,0xFFFF } }, - // ... + { RTL_TEXTENCODING_TIS_620, { 0x0000,0x0001,0x0002,0x0003,0x0004,0x0005,0x0006,0x0007, 0x0008,0x0009,0x000A,0x000B,0x000C,0x000D,0x000E,0x000F, |