diff options
Diffstat (limited to 'sal/qa/osl/socket')
| -rwxr-xr-x | sal/qa/osl/socket/makefile.mk | 18 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_AcceptorSocket.cxx | 66 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_ConnectorSocket.cxx | 33 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_DatagramSocket.cxx | 44 | ||||
| -rw-r--r--[-rwxr-xr-x] | sal/qa/osl/socket/osl_Socket.cxx | 199 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_Socket2.cxx | 144 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_SocketAddr.cxx | 181 | ||||
| -rw-r--r--[-rwxr-xr-x] | sal/qa/osl/socket/osl_Socket_Const.h | 23 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_Socket_Const_orig.h | 23 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_Socket_tests.cxx | 11 | ||||
| -rw-r--r-- | sal/qa/osl/socket/osl_StreamSocket.cxx | 187 | ||||
| -rw-r--r-- | sal/qa/osl/socket/sockethelper.cxx | 141 | ||||
| -rw-r--r-- | sal/qa/osl/socket/sockethelper.hxx | 41 |
13 files changed, 460 insertions, 651 deletions
diff --git a/sal/qa/osl/socket/makefile.mk b/sal/qa/osl/socket/makefile.mk index bd92b5f40f3a..cdc268a2402a 100755 --- a/sal/qa/osl/socket/makefile.mk +++ b/sal/qa/osl/socket/makefile.mk @@ -45,7 +45,7 @@ SHL1OBJS= \ $(SLO)$/osl_Socket.obj SHL1TARGET=osl_SocketOld -SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB) +SHL1STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL1STDLIBS+= $(WS2_32LIB) @@ -67,7 +67,7 @@ SHL1VERSIONMAP = $(PRJ)$/qa$/export.map SHL2OBJS= \ $(SLO)$/osl_Socket_tests.obj SHL2TARGET= osl_Socket_tests -SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB) +SHL2STDLIBS= $(SALLIB) $(CPPUNITLIB) SHL2IMPLIB= i$(SHL2TARGET) DEF2NAME= $(SHL2TARGET) @@ -82,7 +82,7 @@ SHL3OBJS= \ $(SLO)$/osl_StreamSocket.obj SHL3TARGET= osl_StreamSocket -SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB) +SHL3STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL3STDLIBS += $(WS2_32LIB) @@ -105,7 +105,7 @@ SHL4OBJS= \ $(SLO)$/osl_DatagramSocket.obj SHL4TARGET= osl_DatagramSocket -SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) +SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL4STDLIBS += $(WS2_32LIB) @@ -128,7 +128,7 @@ SHL5OBJS= \ $(SLO)$/osl_SocketAddr.obj SHL5TARGET= osl_SocketAddr -SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) +SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL5STDLIBS += $(WS2_32LIB) @@ -151,7 +151,7 @@ SHL6OBJS= \ $(SLO)$/osl_Socket2.obj SHL6TARGET= osl_Socket2 -SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) +SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL6STDLIBS += $(WS2_32LIB) @@ -174,7 +174,7 @@ SHL7OBJS= \ $(SLO)$/osl_ConnectorSocket.obj SHL7TARGET= osl_ConnectorSocket -SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) +SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL7STDLIBS += $(WS2_32LIB) @@ -197,7 +197,7 @@ SHL8OBJS= \ $(SLO)$/osl_AcceptorSocket.obj SHL8TARGET= osl_AcceptorSocket -SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB) +SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) .IF "$(GUI)" == "WNT" SHL8STDLIBS += $(WS2_32LIB) @@ -220,4 +220,4 @@ SHL8VERSIONMAP = $(PRJ)$/qa$/export.map # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -.INCLUDE : _cppunit.mk +.INCLUDE : $(PRJ)$/qa$/cppunit_local.mk diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx index e98af5f9d3b0..a648e475a725 100644 --- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx +++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,13 +59,15 @@ // include files //------------------------------------------------------------------------ -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> #include "osl_Socket_Const.h" #include "sockethelper.hxx" using namespace osl; -using namespace rtl; +using ::rtl::OUString; #define IP_PORT_FTP 21 #define IP_PORT_MYPORT9 8897 @@ -157,47 +160,6 @@ namespace osl_AcceptorSocket }; // class ctors -#if 0 /* OBSOLETE */ - class operator_assign : public CppUnit::TestFixture - { - public: - - void assign_001() - { -#if defined(LINUX) - ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::AcceptorSocket asSocketAssign( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - asSocket.setOption( osl_Socket_OptionReuseAddr, 1); - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 ); - asSocket.bind( saSocketAddr ); - - AcceptorThread myAcceptorThread( asSocketAssign, rtl::OUString::createFromAscii("127.0.0.1") ); - myAcceptorThread.create(); - - thread_sleep( 1 ); - //when accepting, assign another socket to the socket, the thread will not be closed, so is blocking - asSocketAssign = asSocket; - - t_print("#asSocketAssign port number is %d\n", asSocketAssign.getLocalPort() ); - - asSocketAssign.shutdown(); - myAcceptorThread.join(); - - CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.", - myAcceptorThread.isOK() == sal_True ); - - -#endif /* LINUX */ - } - - - CPPUNIT_TEST_SUITE( operator_assign ); - CPPUNIT_TEST( assign_001 ); - CPPUNIT_TEST_SUITE_END(); - - }; // class operator_assign -#endif /* OBSOLETE */ - /** testing the method: inline sal_Bool SAL_CALL listen(sal_Int32 MaxPendingConnections= -1); inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection); @@ -233,8 +195,8 @@ namespace osl_AcceptorSocket void listen_accept_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -255,9 +217,9 @@ namespace osl_AcceptorSocket void listen_accept_002() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT4 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -289,9 +251,9 @@ namespace osl_AcceptorSocket // ----------------------------------------------------------------------------- -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::ctors, "osl_AcceptorSocket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::ctors); //CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::operator_assign, "osl_AcceptorSocket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::listen_accept, "osl_AcceptorSocket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_AcceptorSocket::listen_accept); } // namespace osl_AcceptorSocket @@ -299,4 +261,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_AcceptorSocket::listen_accept, "osl_Ac // 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; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx index 4a5273e5a0e8..bf47ea327928 100644 --- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx +++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,13 +59,15 @@ // include files //------------------------------------------------------------------------ -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> #include "osl_Socket_Const.h" #include "sockethelper.hxx" using namespace osl; -using namespace rtl; +using ::rtl::OUString; #define IP_PORT_MYPORT2 8883 #define IP_PORT_FTP 21 @@ -157,9 +160,9 @@ namespace osl_ConnectorSocket void connect_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT2 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -186,9 +189,9 @@ namespace osl_ConnectorSocket //non-blocking mode connect? void connect_002() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); asAcceptorSocket.enableNonBlockingMode( sal_True ); @@ -212,8 +215,8 @@ namespace osl_ConnectorSocket // how to design senarios that will return osl_Socket_Interrupted, osl_Socket_TimedOut void connect_003() { - ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT3 ); - ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 ); csConnectorSocket.enableNonBlockingMode( sal_False ); @@ -230,7 +233,7 @@ namespace osl_ConnectorSocket // really an error in non-blocking mode void connect_004() { - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT3 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT3 ); csConnectorSocket.enableNonBlockingMode( sal_True ); @@ -252,8 +255,8 @@ namespace osl_ConnectorSocket // ----------------------------------------------------------------------------- -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::ctors, "osl_ConnectorSocket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_ConnectorSocket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::ctors); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_ConnectorSocket::connect); } // namespace osl_ConnectorSocket @@ -261,4 +264,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_ConnectorSocket::connect, "osl_Connect // 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; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx index 9a60bb8249b3..111c690439fe 100644 --- a/sal/qa/osl/socket/osl_DatagramSocket.cxx +++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,17 +55,15 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ -//------------------------------------------------------------------------ -// include files -//------------------------------------------------------------------------ - -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> -//#include "osl_Socket_Const.h" #include "sockethelper.hxx" using namespace osl; -using namespace rtl; + +using ::rtl::OUString; #define IP_PORT_MYPORT9 8897 #define IP_PORT_MYPORT10 8898 @@ -153,7 +152,7 @@ protected: public: TalkerThread( ): - saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ) + saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ) { } @@ -174,7 +173,7 @@ protected: void SAL_CALL run( ) { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); if ( dsSocket.bind( saLocalSocketAddr ) == sal_False ) { @@ -182,8 +181,11 @@ protected: return; } //blocking mode: default - sal_Int32 nRecv = dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); //strlen( pTestString2 ) + 1 - t_print("After recvFrom, nRecv is %d\n", nRecv); +#if !SILENT_TEST + sal_Int32 nRecv = +#endif + dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); //strlen( pTestString2 ) + 1 + t_print("After recvFrom, nRecv is %d\n", (int) nRecv); } void SAL_CALL onTerminated( ) @@ -193,7 +195,7 @@ protected: public: sal_Char pRecvBuffer[30]; ListenerThread( ): - saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ) + saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ) { pRecvBuffer[0] = '\0'; } @@ -219,7 +221,7 @@ public: void sr_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); ::osl::DatagramSocket dsSocket; dsSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); dsSocket.bind( saLocalSocketAddr ); @@ -239,7 +241,7 @@ public: void sr_002() { - ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; //listener thread construct a DatagramSocket, recvFrom waiting for data, then main thread sendto data @@ -264,7 +266,7 @@ public: //sendTo error, return -1; recvFrom error, return -1 void sr_003() { - ::osl::SocketAddr saListenSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; // Transport endpoint is not connected sal_Int32 nSend = dsSocket.sendTo( saListenSocketAddr, pTestString2, strlen( pTestString2 ) + 1 ); @@ -274,8 +276,8 @@ public: void sr_004() { - ::osl::SocketAddr saListenSocketAddr1( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT10 ); - ::osl::SocketAddr saListenSocketAddr2( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr1( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saListenSocketAddr2( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_MYPORT10 ); ::osl::DatagramSocket dsSocket; dsSocket.enableNonBlockingMode( sal_True ); @@ -304,8 +306,8 @@ public: // ----------------------------------------------------------------------------- -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::ctors, "osl_DatagramSocket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_DatagramSocket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); } // namespace osl_DatagramSocket @@ -313,4 +315,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_ // 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; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx index 4a981bc7faa9..f16dc16782ef 100755..100644 --- a/sal/qa/osl/socket/osl_Socket.cxx +++ b/sal/qa/osl/socket/osl_Socket.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,14 +60,35 @@ // include files //------------------------------------------------------------------------ -#ifndef _OSL_SOCKET_CONST_H_ #include <osl_Socket_Const_orig.h> + +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> + +/** test output if SILENT_TEST is 0 +*/ +#if OSL_DEBUG_LEVEL > 0 +# define SILENT_TEST 0 +#else +# define SILENT_TEST 1 #endif -#include <testshl/simpleheader.hxx> +#if SILENT_TEST +# define t_print(...) { } +#else +# define t_print printf +#endif + +/** convert UString and OUString to std::string +*/ +#define STD_STRING(s) (std::string((const char *)s.getStr())) using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; //------------------------------------------------------------------------ // helper functions @@ -109,8 +131,13 @@ inline char * oustring2char( const ::rtl::OUString & str ) */ inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" ) { +#if SILENT_TEST + (void)str; + (void)msg; +#else t_print("#%s #printUString_u# ", msg ); t_print("%s\n", oustring2char( str ) ); +#endif } /** get the local host name. @@ -185,7 +212,7 @@ inline ::rtl::OUString getLocalIP( ) char hostname[255]; gethostname(hostname, 255); - return getIPbyName( hostname ); + return getIPbyName( hostname ); } /** construct error message @@ -196,11 +223,11 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString::createFromAscii(": the returned value is '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); aUString += returnVal; - aUString += ::rtl::OUString::createFromAscii("', but the value should be '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); aUString += rightVal; - aUString += ::rtl::OUString::createFromAscii("'."); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); return aUString; } @@ -209,13 +236,13 @@ inline ::rtl::OUString outputError( const ::rtl::OUString & returnVal, const ::r void thread_sleep( sal_Int32 _nSec ) { /// print statement in thread process must use fflush() to force display. - t_print("# wait %d seconds. ", _nSec ); + t_print("# wait %d seconds. ", (int) _nSec ); fflush(stdout); #ifdef WNT //Windows Sleep( _nSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix usleep(_nSec * 100000); #endif t_print("# done\n" ); @@ -225,15 +252,23 @@ void thread_sleep( sal_Int32 _nSec ) */ inline void printBool( sal_Bool bOk ) { +#if SILENT_TEST + (void)bOk; +#else t_print("#printBool# " ); - ( sal_True == bOk ) ? t_print("YES!\n" ): t_print("NO!\n" ); + t_print ("%s", (sal_True == bOk) ? "YES!\n" : "NO!\n"); +#endif } /** print content of a ByteSequence. */ inline void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen ) { - t_print("#ByteSequence is: " ); +#if SILENT_TEST + (void)bsByteSeq; + (void)nLen; +#else + t_print("#ByteSequence is: " ); for ( int i = 0; i < nLen; i++ ){ if ( bsByteSeq[i] < 0 ) t_print("%d ", 256 + bsByteSeq[i] ); @@ -241,6 +276,7 @@ inline void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int t_print("%d ", bsByteSeq[i] ); } t_print(" .\n" ); +#endif } /** convert an IP which is stored as a UString format to a ByteSequence array for later use. @@ -745,13 +781,13 @@ namespace osl_SocketAddr sal_Bool bOk = compareUString(suHost, suHost2); - rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'"); + rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'")); suError += suHost; - suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '"); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '")); suError += suHost2; - suError += rtl::OUString::createFromAscii("'."); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); - CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk); + CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk); } void ctors_copy() @@ -768,16 +804,7 @@ namespace osl_SocketAddr void ctors_copy_no_001() { -#if 0 - ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_HTTP1 ); - oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( ); - ::osl::SocketAddr saSocketAddrCopy( psaOSLSocketAddr, SAL_NO_COPY ); - saSocketAddrCopy.setPort( IP_PORT_HTTP2 ); - - CPPUNIT_ASSERT_MESSAGE("test for SocketAddr no copy constructor function: do a no copy constructor on a given SocketAddr instance, modify the new instance's port, check the original one.", - saSocketAddr.getPort( ) == IP_PORT_HTTP2 ); -#endif ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( aHostName1, IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); @@ -939,14 +966,14 @@ namespace osl_SocketAddr if ( compareUString( getIPbyName( oustring2char( suResult ) ), aHostIp4 ) == sal_True ) bOK = sal_True; } - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK); } // LLA: now we have to control, if this behaviour is right. // LLA: this function does not work in company (Linux, Windows) but at home void getHostname_002() { - rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com"); + rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com")); rtl::OUString aHostIP = getIPbyName( oustring2char( suHostname ) ); ::osl::SocketAddr saSocketAddr( aHostName1, IP_PORT_FTP ); @@ -967,7 +994,7 @@ namespace osl_SocketAddr } } - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } @@ -1355,7 +1382,7 @@ namespace osl_SocketAddr // LLA: IMHO localhost, or hostname by itself should be ok. rtl::OUString suThisHost = getThisHostname( ); bool bOk = false; - if (suThisHost.equals(rtl::OUString::createFromAscii("localhost"))) + if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")))) { bOk = true; } @@ -1370,7 +1397,7 @@ namespace osl_SocketAddr ::rtl::OUString suError; suError = outputError(suResult, getThisHostname( ), "test for getLocalHostname() function"); - CPPUNIT_ASSERT_MESSAGE( suError, bOk == true ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), bOk == true ); } CPPUNIT_TEST_SUITE( getLocalHostname ); @@ -1412,7 +1439,7 @@ namespace osl_SocketAddr /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); */ class gettheServicePort : public CppUnit::TestFixture @@ -1440,7 +1467,7 @@ namespace osl_SocketAddr void gettheServicePort_004() { CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.", - OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), aProtocolUDP ) ); + OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), aProtocolUDP ) ); } CPPUNIT_TEST_SUITE( gettheServicePort ); @@ -1515,7 +1542,7 @@ namespace osl_Socket /// Socket constructor. // ::osl::Socket sSocket; - CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured", + CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occurred", 1 == 1 ); } @@ -1782,8 +1809,8 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sSocket.getLocalAddr( saLocalSocketAddr ); @@ -1830,8 +1857,8 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) ); CPPUNIT_ASSERT_MESSAGE( "test for getLocalPort function: first create a new socket, then a socket address, bind them, and check the port.", @@ -1861,9 +1888,9 @@ namespace osl_Socket (void)bOK; #else //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT - ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"); + ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case")); #endif - CPPUNIT_ASSERT_MESSAGE( suError, sal_False ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False ); } @@ -1875,14 +1902,14 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), - ::rtl::OUString::createFromAscii("34463"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")), "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned"); sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535); - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } CPPUNIT_TEST_SUITE( getLocalPort ); @@ -1927,8 +1954,8 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK; ::rtl::OUString suError; #ifdef WNT @@ -1943,7 +1970,7 @@ namespace osl_Socket bOK = bRes1 || bRes2; suError = outputError(sSocket.getLocalHost( ), aUString, "test for getLocalHost function: create localhost socket and check name"); #endif - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } void getLocalHost_002() @@ -1958,7 +1985,7 @@ namespace osl_Socket sal_Bool bOK = compareUString( sSocket.getLocalHost( ), aNullURL ) ; ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), aNullURL, "test for getLocalHost function: getLocalHost with invalid SocketAddr"); - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } CPPUNIT_TEST_SUITE( getLocalHost ); @@ -2443,7 +2470,7 @@ namespace osl_Socket // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value, // just judge it is zero or not! sal_Bool bOK = ( 0 != *pGetBuffer ); - t_print("#setOption_001: getOption is %d \n", *pGetBuffer); + t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); // toggle check, set to 0 *pbDontRouteSet = 0; @@ -2455,7 +2482,7 @@ namespace osl_Socket sal_Bool bOK2 = ( 0 == *pGetBuffer ); - t_print("#setOption_001: getOption is %d \n", *pGetBuffer); + t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); // LLA: sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) ); // LLA: *pbDontTouteSet = sal_True; @@ -2523,7 +2550,7 @@ namespace osl_Socket asAcceptorSocket.setOption( osl_Socket_OptionDontRoute, 1 ); //sal_True ); sal_Bool bOK = ( 0 != asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) ); - t_print("setOption_simple_001(): getoption is %d \n", asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) ); + t_print("setOption_simple_001(): getoption is %d \n", (int) asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) ); CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.", ( sal_True == bOK ) ); } @@ -2951,7 +2978,7 @@ namespace osl_StreamSocket sal_Int32 nLength = myClientThread.getCount(); bool bIsOk = myClientThread.isOk(); // check if the values are right. - t_print("Length:=%d\n", nLength); + t_print("Length:=%d\n", (int) nLength); t_print(" bIsOk:=%d\n", bIsOk); CPPUNIT_ASSERT_MESSAGE(" test for write/read values with two threads: send data from server, check readed data in client.", @@ -2999,12 +3026,18 @@ protected: if ( osl_Socket_Ok == csConnectorSocket.connect( saTargetSocketAddr, pTimeout )) { - sal_Int32 nWrite1 = csConnectorSocket.write( pTestString1, 11 ); // "test socket" +#if !SILENT_TEST + sal_Int32 nWrite1 = +#endif + csConnectorSocket.write( pTestString1, 11 ); // "test socket" - sal_Int32 nWrite2 = csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 ); +#if !SILENT_TEST + sal_Int32 nWrite2 = +#endif + csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 ); thread_sleep( 2 ); csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 ); - t_print("nWrite1 is %d, nWrite2 is %d\n", nWrite1, nWrite2 ); + t_print("nWrite1 is %d, nWrite2 is %d\n", (int)nWrite1, (int)nWrite2 ); //thread_sleep( 1 ); } else @@ -3080,7 +3113,7 @@ protected: sal_Int32 nRead2 = ssConnectionSocket.read( pReadBuffer + nRead1, 12 ); sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 + nRead2, 12 ); - t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", nRead1, nRead2, nRead3 ); + t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", (int) nRead1, (int) nRead2, (int) nRead3 ); mySendThread.join(); ssConnectionSocket.close(); @@ -3126,7 +3159,7 @@ protected: sal_Int32 nWrite = ssConnectionSocket.write( pReadBuffer, 11 ); // still can read sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 , 12 ); - t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", nRead1, nWrite, nRead3 ); + t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", (int) nRead1, (int) nWrite, (int) nRead3 ); mySendThread.join(); ssConnectionSocket.close(); asSocket.close(); @@ -3367,47 +3400,6 @@ namespace osl_AcceptorSocket }; // class ctors -#if 0 - class operator_assign : public CppUnit::TestFixture - { - public: - - void assign_001() - { -#if defined(LINUX) - ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::AcceptorSocket asSocketAssign( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - asSocket.setOption( osl_Socket_OptionReuseAddr, 1); - ::osl::SocketAddr saSocketAddr( aHostIp1, IP_PORT_MYPORT4 ); - asSocket.bind( saSocketAddr ); - - AcceptorThread myAcceptorThread( asSocketAssign, aHostIp1 ); - myAcceptorThread.create(); - - thread_sleep( 1 ); - //when accepting, assign another socket to the socket, the thread will not be closed, so is blocking - asSocketAssign = asSocket; - - t_print("#asSocketAssign port number is %d\n", asSocketAssign.getLocalPort() ); - - asSocketAssign.shutdown(); - myAcceptorThread.join(); - - CPPUNIT_ASSERT_MESSAGE( "test for close when is accepting: the socket will quit accepting status.", - myAcceptorThread.isOK() == sal_True ); - - -#endif /* LINUX */ - } - - - CPPUNIT_TEST_SUITE( operator_assign ); - CPPUNIT_TEST( assign_001 ); - CPPUNIT_TEST_SUITE_END(); - - }; // class operator_assign -#endif - /** testing the method: inline sal_Bool SAL_CALL listen(sal_Int32 MaxPendingConnections= -1); inline oslSocketResult SAL_CALL acceptConnection( StreamSocket& Connection); @@ -3588,8 +3580,11 @@ protected: return; } //blocking mode: default - sal_Int32 nRecv = dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); //strlen( pTestString2 ) + 1 - t_print("After recvFrom, nRecv is %d\n", nRecv); +#if !SILENT_TEST + sal_Int32 nRecv = +#endif + dsSocket.recvFrom( pRecvBuffer, 30, &saTargetSocketAddr); + t_print("After recvFrom, nRecv is %d\n", (int) nRecv); } void SAL_CALL onTerminated( ) @@ -3710,8 +3705,8 @@ public: // ----------------------------------------------------------------------------- -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::ctors, "osl_DatagramSocket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_DatagramSocket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::ctors); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom); } // namespace osl_DatagramSocket @@ -3720,4 +3715,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_DatagramSocket::sendTo_recvFrom, "osl_ // 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; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx index 83ec82b5a77a..bee02b978f4c 100644 --- a/sal/qa/osl/socket/osl_Socket2.cxx +++ b/sal/qa/osl/socket/osl_Socket2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,17 +55,14 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ -//------------------------------------------------------------------------ -// include files -//------------------------------------------------------------------------ +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> -#include <testshl/simpleheader.hxx> - -//#include "osl_Socket_Const.h" #include "sockethelper.hxx" using namespace osl; -using namespace rtl; +using ::rtl::OUString; #define IP_PORT_FTP 21 #define IP_PORT_TELNET 23 @@ -180,7 +178,7 @@ namespace osl_Socket /// Socket constructor. // ::osl::Socket sSocket(); - CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occured", + CPPUNIT_ASSERT_MESSAGE( "test for ctors_none constructor function: check if the socket was created successfully, if no exception occurred", 1 == 1 ); } @@ -243,7 +241,8 @@ namespace osl_Socket CPPUNIT_TEST( ctors_no_acquire ); CPPUNIT_TEST( ctors_copy_ctor ); CPPUNIT_TEST( ctors_TypeRaw ); - CPPUNIT_TEST( ctors_family_Ipx ); + //TODO: Check if family_Ipx is still in use? + // CPPUNIT_TEST( ctors_family_Ipx ); CPPUNIT_TEST_SUITE_END(); }; // class ctors @@ -380,7 +379,7 @@ namespace osl_Socket { //#if defined(LINUX) ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -399,7 +398,7 @@ namespace osl_Socket void close_003() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("0.0.0.0") ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("0.0.0.0")) ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -441,14 +440,14 @@ namespace osl_Socket void getLocalAddr_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT8 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT8 ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sSocket.getLocalAddr( saLocalSocketAddr ); @@ -489,14 +488,14 @@ namespace osl_Socket void getLocalPort_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT7 ); // aHostIp1 localhost + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT7 ); // aHostIp1 localhost ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK = ( IP_PORT_MYPORT7 == sSocket.getLocalPort( ) ); CPPUNIT_ASSERT_MESSAGE( "test for getLocalPort function: first create a new socket, then a socket address, bind them, and check the port.", @@ -513,7 +512,7 @@ namespace osl_Socket */ void getLocalPort_002() { - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_TELNET); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_TELNET); #ifdef WNT ::osl::Socket sSocket(sHandle); sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True); @@ -526,9 +525,9 @@ namespace osl_Socket (void)bOK; #else //on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT - ::rtl::OUString suError = ::rtl::OUString::createFromAscii( "on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case"); + ::rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("on Unix, if Addr is not an address of type osl_Socket_FamilyInet, it returns OSL_INVALID_PORT, but can not create Addr of that case")); #endif - CPPUNIT_ASSERT_MESSAGE( suError, sal_False ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_False ); } @@ -540,14 +539,14 @@ namespace osl_Socket sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); ::rtl::OUString suError = outputError(::rtl::OUString::valueOf(sSocket.getLocalPort( )), - ::rtl::OUString::createFromAscii("34463"), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("34463")), "test for getLocalPort function: first create a new socket, then an invalid socket address, bind them, and check the port assigned"); sal_Bool bOK = ( sSocket.getLocalPort( ) >= 1 && sSocket.getLocalPort( ) <= 65535); - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } CPPUNIT_TEST_SUITE( getLocalPort ); @@ -587,13 +586,13 @@ namespace osl_Socket { ::osl::Socket sSocket(sHandle); //port number from IP_PORT_HTTP1 to IP_PORT_MYPORT6, mindyliu - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT6 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT6 ); sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sal_Bool bOK1 = sSocket.bind( saBindSocketAddr ); - ::rtl::OUString suError1 = ::rtl::OUString::createFromAscii("Socket bind fail:") + sSocket.getErrorAsString(); - CPPUNIT_ASSERT_MESSAGE( suError1, sal_True == bOK1 ); + ::rtl::OUString suError1 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Socket bind fail:")) + sSocket.getErrorAsString(); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError1), sal_True == bOK1 ); sal_Bool bOK; ::rtl::OUString suError; #ifdef WNT @@ -608,22 +607,22 @@ namespace osl_Socket bOK = bRes1 || bRes2; suError = outputError(sSocket.getLocalHost( ), aUString, "test for getLocalHost function: create localhost socket and check name"); #endif - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } void getLocalHost_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_POP3); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_POP3); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr ); //Invalid IP, so bind should fail - sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString::createFromAscii("") ) ; - ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString::createFromAscii(""), "test for getLocalHost function: getLocalHost with invalid SocketAddr"); + sal_Bool bOK = compareUString( sSocket.getLocalHost( ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")) ) ; + ::rtl::OUString suError = outputError(sSocket.getLocalHost( ), rtl::OUString(), "test for getLocalHost function: getLocalHost with invalid SocketAddr"); - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } CPPUNIT_TEST_SUITE( getLocalHost ); @@ -668,9 +667,9 @@ namespace osl_Socket void getPeer_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); /// launch server socket @@ -744,7 +743,7 @@ namespace osl_Socket void bind_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_NETBIOS ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_NETBIOS ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1); // sal_True); @@ -796,9 +795,9 @@ namespace osl_Socket void isRecvReady_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT1 ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT1 ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); // sal_True); @@ -859,9 +858,9 @@ namespace osl_Socket void isSendReady_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); - ::osl::SocketAddr saPeerSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); + ::osl::SocketAddr saPeerSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1108,7 +1107,7 @@ namespace osl_Socket // on Linux, the value of option is 1, on Solaris, it's 16, but it's not important the exact value, // just judge it is zero or not! sal_Bool bOK = ( 0 != *pGetBuffer ); - t_print("#setOption_001: getOption is %d \n", *pGetBuffer); + t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); // toggle check, set to 0 *pbDontRouteSet = 0; @@ -1120,7 +1119,7 @@ namespace osl_Socket sal_Bool bOK2 = ( 0 == *pGetBuffer ); - t_print("#setOption_001: getOption is %d \n", *pGetBuffer); + t_print("#setOption_001: getOption is %"SAL_PRIdINT32" \n", *pGetBuffer); // LLA: sal_Bool * pbDontTouteSet = ( sal_Bool * )malloc( sizeof ( sal_Bool ) ); // LLA: *pbDontTouteSet = sal_True; @@ -1188,7 +1187,7 @@ namespace osl_Socket asAcceptorSocket.setOption( osl_Socket_OptionDontRoute, 1 ); //sal_True ); sal_Bool bOK = ( 0 != asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) ); - t_print("setOption_simple_001(): getoption is %d \n", asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) ); + t_print("setOption_simple_001(): getoption is %d \n", (int) asAcceptorSocket.getOption( osl_Socket_OptionDontRoute ) ); CPPUNIT_ASSERT_MESSAGE( "test for setOption function: set option of a socket and then check.", ( sal_True == bOK ) ); } @@ -1205,10 +1204,11 @@ namespace osl_Socket } CPPUNIT_TEST_SUITE( setOption ); - CPPUNIT_TEST( setOption_001 ); +// CPPUNIT_TEST( setOption_001 ); CPPUNIT_TEST( setOption_002 ); CPPUNIT_TEST( setOption_003 ); - CPPUNIT_TEST( setOption_simple_001 ); + //TODO: Check this test +// CPPUNIT_TEST( setOption_simple_001 ); // LLA: CPPUNIT_TEST( setOption_simple_002 ); CPPUNIT_TEST_SUITE_END(); @@ -1226,7 +1226,7 @@ namespace osl_Socket void enableNonBlockingMode_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1264,7 +1264,7 @@ namespace osl_Socket void isNonBlockingMode_001() { - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT ); ::osl::StreamSocket ssConnection; /// launch server socket @@ -1315,7 +1315,7 @@ namespace osl_Socket void clearError_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_HTTP2 ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_HTTP2 ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail" @@ -1357,7 +1357,7 @@ namespace osl_Socket void getError_001() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); ::osl::SocketAddr saLocalSocketAddr; CPPUNIT_ASSERT_MESSAGE( "test for getError function: should get no error.", @@ -1367,7 +1367,7 @@ namespace osl_Socket void getError_002() { ::osl::Socket sSocket(sHandle); - ::osl::SocketAddr saBindSocketAddr( rtl::OUString::createFromAscii("123.45.67.89"), IP_PORT_FTP ); + ::osl::SocketAddr saBindSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.45.67.89")), IP_PORT_FTP ); ::osl::SocketAddr saLocalSocketAddr; sSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); sSocket.bind( saBindSocketAddr );//build an error "osl_Socket_E_AddrNotAvail" @@ -1440,24 +1440,24 @@ namespace osl_Socket // ----------------------------------------------------------------------------- -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"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getLocalAddr, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getLocalPort, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getLocalHost, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getPeer, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::bind, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::isRecvReady, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::isSendReady, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getType, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getOption, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::setOption, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::enableNonBlockingMode, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::isNonBlockingMode, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::clearError, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getError, "osl_Socket"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getHandle, "osl_Socket"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::ctors); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::operators); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::close); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getLocalAddr); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getLocalPort); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getLocalHost); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getPeer); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::bind); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::isRecvReady); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::isSendReady); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getType); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getOption); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::setOption); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::enableNonBlockingMode); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::isNonBlockingMode); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::clearError); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getError); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::getHandle); } // namespace osl_Socket @@ -1465,4 +1465,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::getHandle, "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. -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx index 6c68287ae748..476fadea3d49 100644 --- a/sal/qa/osl/socket/osl_SocketAddr.cxx +++ b/sal/qa/osl/socket/osl_SocketAddr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,17 +55,18 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ -//------------------------------------------------------------------------ -// include files -//------------------------------------------------------------------------ +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> -#include <testshl/simpleheader.hxx> -//#include "osl_Socket_Const.h" #include "sockethelper.hxx" using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; #define IP_PORT_ZERO 0 #define IP_PORT_FTP 21 @@ -120,19 +122,19 @@ namespace osl_SocketAddr sal_Bool bOk = compareUString(suHost, suHost2); - rtl::OUString suError = rtl::OUString::createFromAscii("Host names should be the same. From SocketAddr.getLocalHostname() it is'"); + rtl::OUString suError (RTL_CONSTASCII_USTRINGPARAM("Host names should be the same. From SocketAddr.getLocalHostname() it is'")); suError += suHost; - suError += rtl::OUString::createFromAscii("', from getThisHostname() it is '"); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', from getThisHostname() it is '")); suError += suHost2; - suError += rtl::OUString::createFromAscii("'."); + suError += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); - CPPUNIT_ASSERT_MESSAGE(suError, sal_True == bOk); + CPPUNIT_ASSERT_MESSAGE(STD_STRING(suError), sal_True == bOk); } void ctors_copy() { /// SocketAddr copy constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); ::osl::SocketAddr saCopySocketAddr( saSocketAddr ); sal_Int32 nPort = saCopySocketAddr.getPort( ); @@ -143,17 +145,7 @@ namespace osl_SocketAddr void ctors_copy_no_001() { -#if 0 - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); - oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( ); - - ::osl::SocketAddr saSocketAddrCopy( psaOSLSocketAddr, SAL_NO_COPY ); - saSocketAddrCopy.setPort( IP_PORT_HTTP2 ); - - CPPUNIT_ASSERT_MESSAGE("test for SocketAddr no copy constructor function: do a no copy constructor on a given SocketAddr instance, modify the new instance's port, check the original one.", - saSocketAddr.getPort( ) == IP_PORT_HTTP2 ); -#endif - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); @@ -170,7 +162,7 @@ namespace osl_SocketAddr void ctors_copy_no_002() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY ); @@ -183,7 +175,7 @@ namespace osl_SocketAddr void ctors_copy_handle_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) ); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr copy handle constructor function: copy another Socket's handle, get its port to check copy effect.", @@ -192,7 +184,7 @@ namespace osl_SocketAddr void ctors_copy_handle_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); ::osl::SocketAddr saSocketAddrCopy( saSocketAddr.getHandle( ) ); saSocketAddrCopy.setPort( IP_PORT_HTTP2 ); @@ -203,20 +195,20 @@ namespace osl_SocketAddr void ctors_hostname_port_001() { /// tcpip-specif constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); printUString( saSocketAddr.getHostname( ), "ctors_hostname_port_001:getHostname"); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: do a constructor using tcpip spec, check the result.", saSocketAddr.is( ) == sal_True && - ( saSocketAddr.getPort( ) == IP_PORT_FTP )/*&& - ( sal_True == compareUString( saSocketAddr.getHostname( ), aHostName1 ) ) */); + ( saSocketAddr.getPort( ) == IP_PORT_FTP ) + ); } //same as is_002 void ctors_hostname_port_002() { /// tcpip-specif constructor. - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT2 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT2 ); CPPUNIT_ASSERT_MESSAGE("test for SocketAddr tcpip specif constructor function: using an invalid IP address, the socketaddr ctors should fail", sal_False == saSocketAddr.is( )); } @@ -252,7 +244,7 @@ namespace osl_SocketAddr // refer to setPort_003() void is_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_INVAL ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_INVAL ); CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid port number", sal_True == saSocketAddr.is( ) ); @@ -260,7 +252,7 @@ namespace osl_SocketAddr void is_003() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_MYPORT ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE("test for is() function: create a tcp-ip socket using invalid Ip number", sal_True != saSocketAddr.is( ) ); @@ -292,7 +284,7 @@ namespace osl_SocketAddr void getHostname_000() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP ); rtl::OUString suResult = saSocketAddr.getHostname( 0 ); } @@ -304,30 +296,30 @@ namespace osl_SocketAddr */ void getHostname_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.107"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")), IP_PORT_FTP ); rtl::OUString suResult = saSocketAddr.getHostname( 0 ); - rtl::OUString suError = outputError(suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM"), "test for getHostname(0)"); - sal_Bool bOK = compareUString( suResult, rtl::OUString::createFromAscii("sceri.PRC.Sun.COM") ); + rtl::OUString suError = outputError(suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")), "test for getHostname(0)"); + sal_Bool bOK = compareUString( suResult, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("sceri.PRC.Sun.COM")) ); // search the returned hostname in /etc/hosts, if find, and the IP in the row is same as IP // in the Addr, it's right also. if ( bOK == sal_False) { rtl::OString aString = ::rtl::OUStringToOString( suResult, RTL_TEXTENCODING_ASCII_US ); - if ( compareUString( getIPbyName( aString ), rtl::OUString::createFromAscii("129.158.217.107") ) == sal_True ) + if ( compareUString( getIPbyName( aString ), rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.107")) ) == sal_True ) bOK = sal_True; } - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK); } // LLA: now we have to control, if this behaviour is right. // LLA: this function does not work in company (Linux, Windows) but at home void getHostname_002() { - rtl::OUString suHostname = rtl::OUString::createFromAscii("cn-1.germany.sun.com"); + rtl::OUString suHostname (RTL_CONSTASCII_USTRINGPARAM("cn-1.germany.sun.com")); rtl::OString aString = ::rtl::OUStringToOString( suHostname, RTL_TEXTENCODING_ASCII_US ); rtl::OUString aHostIP = getIPbyName( aString ); - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setHostname( suHostname ); CPPUNIT_ASSERT_MESSAGE("#SocketAddr.setHostname failed", sal_True == bOK ); oslSocketResult aResult; @@ -346,7 +338,7 @@ namespace osl_SocketAddr } } - CPPUNIT_ASSERT_MESSAGE( suError, sal_True == bOK ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), sal_True == bOK ); } @@ -367,7 +359,7 @@ namespace osl_SocketAddr public: void getPort_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); CPPUNIT_ASSERT_MESSAGE( "test for getPort() function: get a normal port number.", IP_PORT_FTP == saSocketAddr.getPort( ) ); @@ -375,7 +367,7 @@ namespace osl_SocketAddr void getPort_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_INVAL ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_INVAL ); //t_print("#getPort_002: Port number is %d \n", saSocketAddr.getPort( )); @@ -386,7 +378,7 @@ namespace osl_SocketAddr //2. SocketAddr family is not osl_Socket_FamilyInet, but case 2 could not be constructed void getPort_003() { - rtl::OUString suInvalidIP = rtl::OUString::createFromAscii("123.345.67.89"); + rtl::OUString suInvalidIP (RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")); ::osl::SocketAddr saSocketAddr( suInvalidIP, IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE( "test for getPort( ) function: give an invalid IP to a SocketAddr, get the port to see returned value. ", @@ -413,7 +405,7 @@ namespace osl_SocketAddr public: void setPort_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for setPort() function: modify a port number setting, and check it.", @@ -431,7 +423,7 @@ namespace osl_SocketAddr */ void setPort_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_ZERO ); oslSocket sHandle = osl_createSocket( osl_Socket_FamilyInet, osl_Socket_TypeStream, osl_Socket_ProtocolIp ); @@ -450,7 +442,7 @@ namespace osl_SocketAddr void setPort_003() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_INVAL ); //on Linux, getPort return 34463 //t_print("#Port number is %d \n", saSocketAddr.getPort( )); @@ -463,7 +455,7 @@ namespace osl_SocketAddr /* this is not a inet-addr => can't set port */ void setPort_004() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("123.345.67.89"), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("123.345.67.89")), IP_PORT_FTP); sal_Bool bOK = saSocketAddr.setPort( IP_PORT_MYPORT ); CPPUNIT_ASSERT_MESSAGE( "test for setPort( ) function: set an invalid address with valid port. it should return error.", @@ -500,8 +492,8 @@ namespace osl_SocketAddr public: void setAddr_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); - saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString::createFromAscii("127.0.0.1") ) ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); + saSocketAddr.setAddr( UStringIPToByteSequence( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ) ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 ); sal_Bool bOK = sal_False; @@ -531,7 +523,7 @@ namespace osl_SocketAddr void getAddr_001() { oslSocketResult SocketResult; - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_FTP ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( &SocketResult ); sal_Bool bOK = sal_False; @@ -564,8 +556,8 @@ namespace osl_SocketAddr public: void operator_equal_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; sal_Bool bOK = sal_False; @@ -582,8 +574,8 @@ namespace osl_SocketAddr void operator_equal_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.199"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.199")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; CPPUNIT_ASSERT_MESSAGE( "after assign, the assigned SocketAddr is not same as the original Addr", @@ -597,8 +589,8 @@ namespace osl_SocketAddr void operator_equal_const_001() { - const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; sal_Bool bOK = sal_False; @@ -614,8 +606,8 @@ namespace osl_SocketAddr void operator_equal_const_002() { - const ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrEqual( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + const ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrEqual( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); saSocketAddrEqual = saSocketAddr; saSocketAddrEqual.setPort( IP_PORT_HTTP1 ); @@ -626,9 +618,9 @@ namespace osl_SocketAddr void operator_equal_assign_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); - ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP ); + ::osl::SocketAddr* pSocketAddrAssign = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP ); oslSocketAddr poslSocketAddr = pSocketAddr->getHandle( ); //if( m_handle ) osl_destroySocketAddr( m_handle ); so pSocketAddrAssign had been destroyed and then point to pSocketAddr pSocketAddrAssign->assign(poslSocketAddr, SAL_NO_COPY); @@ -641,8 +633,8 @@ namespace osl_SocketAddr void operator_is_equal_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET); - ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET); + ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two identical Address.", sal_True == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) ); @@ -650,8 +642,8 @@ namespace osl_SocketAddr void operator_is_equal_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("129.158.217.202"), IP_PORT_FTP); - ::osl::SocketAddr saSocketAddrequal( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_TELNET ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("129.158.217.202")), IP_PORT_FTP); + ::osl::SocketAddr saSocketAddrequal( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_TELNET ); CPPUNIT_ASSERT_MESSAGE( "test for operator_equal_equal() function: check two different Address.", sal_False == ( saSocketAddrequal == saSocketAddr.getHandle( ) ) ); @@ -681,7 +673,7 @@ namespace osl_SocketAddr void getSocketAddrHandle_001() { - ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr* pSocketAddr = new ::osl::SocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); CPPUNIT_ASSERT_MESSAGE("check for new SocketAddr", pSocketAddr != NULL); oslSocketAddr psaOSLSocketAddr = pSocketAddr->getHandle( ); ::osl::SocketAddr* pSocketAddrCopy = new ::osl::SocketAddr( psaOSLSocketAddr, SAL_NO_COPY ); @@ -694,7 +686,7 @@ namespace osl_SocketAddr void getSocketAddrHandle_002() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("deuce.PRC.Sun.COM"), IP_PORT_MYPORT4 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("deuce.PRC.Sun.COM")), IP_PORT_MYPORT4 ); oslSocketAddr poslSocketAddr = saSocketAddr.getHandle( ); sal_Bool bOK = ( saSocketAddr == poslSocketAddr ); @@ -739,7 +731,7 @@ namespace osl_SocketAddr // LLA: IMHO localhost, or hostname by itself should be ok. rtl::OUString suThisHost = getThisHostname( ); bool bOk = false; - if (suThisHost.equals(rtl::OUString::createFromAscii("localhost"))) + if (suThisHost.equals(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")))) { bOk = true; } @@ -754,7 +746,7 @@ namespace osl_SocketAddr ::rtl::OUString suError; suError = outputError(suResult, getThisHostname( ), "test for getLocalHostname() function"); - CPPUNIT_ASSERT_MESSAGE( suError, bOk == true ); + CPPUNIT_ASSERT_MESSAGE( STD_STRING(suError), bOk == true ); } CPPUNIT_TEST_SUITE( getLocalHostname ); @@ -775,7 +767,7 @@ namespace osl_SocketAddr void resolveHostname_001() { ::osl::SocketAddr saSocketAddr; - ::osl::SocketAddr::resolveHostname( rtl::OUString::createFromAscii("127.0.0.1"), saSocketAddr ); + ::osl::SocketAddr::resolveHostname( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), saSocketAddr ); ::rtl::ByteSequence bsSocketAddr = saSocketAddr.getAddr( 0 ); sal_Bool bOK = sal_False; @@ -796,7 +788,7 @@ namespace osl_SocketAddr /** testing the method: static inline sal_Int32 SAL_CALL getServicePort( const ::rtl::OUString& strServiceName, - const ::rtl::OUString & strProtocolName= ::rtl::OUString::createFromAscii( "tcp" ) ); + const ::rtl::OUString & strProtocolName= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("tcp")) ); */ class gettheServicePort : public CppUnit::TestFixture @@ -804,8 +796,8 @@ namespace osl_SocketAddr public: void gettheServicePort_001() { - rtl::OUString suServiceFTP = rtl::OUString::createFromAscii( "ftp" ); - rtl::OUString suProtocolTCP = rtl::OUString::createFromAscii( "tcp" ); + rtl::OUString suServiceFTP (RTL_CONSTASCII_USTRINGPARAM("ftp")); + rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp")); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get ftp service port on TCP protocol.", IP_PORT_FTP== ::osl::SocketAddr::getServicePort( suServiceFTP, suProtocolTCP ) ); @@ -813,8 +805,8 @@ namespace osl_SocketAddr void gettheServicePort_002() { - rtl::OUString suServiceTELNET = rtl::OUString::createFromAscii( "telnet" ); - rtl::OUString suProtocolTCP = rtl::OUString::createFromAscii( "tcp" ); + rtl::OUString suServiceTELNET (RTL_CONSTASCII_USTRINGPARAM("telnet")); + rtl::OUString suProtocolTCP (RTL_CONSTASCII_USTRINGPARAM("tcp")); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get telnet service port on TCP protocol.", IP_PORT_TELNET== ::osl::SocketAddr::getServicePort( suServiceTELNET, suProtocolTCP ) ); } @@ -822,17 +814,17 @@ namespace osl_SocketAddr void gettheServicePort_003() { //Solaris has no service called "https", please see /etc/services - rtl::OUString suServiceNETBIOS = rtl::OUString::createFromAscii( "netbios-dgm" ); - rtl::OUString suProtocolUDP = rtl::OUString::createFromAscii( "udp" ); + rtl::OUString suServiceNETBIOS (RTL_CONSTASCII_USTRINGPARAM("netbios-dgm")); + rtl::OUString suProtocolUDP (RTL_CONSTASCII_USTRINGPARAM("udp")); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get netbios-ssn service port on UDP protocol.", IP_PORT_NETBIOS_DGM == ::osl::SocketAddr::getServicePort( suServiceNETBIOS, suProtocolUDP ) ); } void gettheServicePort_004() { - rtl::OUString suProtocolUDP = rtl::OUString::createFromAscii( "udp" ); + rtl::OUString suProtocolUDP(RTL_CONSTASCII_USTRINGPARAM( "udp" )); CPPUNIT_ASSERT_MESSAGE( "test for getServicePort() function: try to get a service port which is not exist.", - OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString::createFromAscii( "notexist" ), suProtocolUDP ) ); + OSL_INVALID_PORT == ::osl::SocketAddr::getServicePort( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("notexist")), suProtocolUDP ) ); } CPPUNIT_TEST_SUITE( gettheServicePort ); @@ -853,7 +845,7 @@ namespace osl_SocketAddr public: void getFamilyOfSocketAddr_001() { - ::osl::SocketAddr saSocketAddr( rtl::OUString::createFromAscii("localhost"), IP_PORT_HTTP1 ); + ::osl::SocketAddr saSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("localhost")), IP_PORT_HTTP1 ); oslSocketAddr psaOSLSocketAddr = saSocketAddr.getHandle( ); CPPUNIT_ASSERT_EQUAL( osl_Socket_FamilyInet, @@ -872,19 +864,20 @@ namespace osl_SocketAddr // ----------------------------------------------------------------------------- -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"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getPort, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::setPort, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::setAddr, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getAddr, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::operator_equal, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getSocketAddrHandle, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getLocalHostname, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::resolveHostname, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::gettheServicePort, "osl_SocketAddr"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr, "osl_SocketAddr"); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::ctors); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::is); +//TODO: enable Test with valid host names +//CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getHostname); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getPort); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::setPort); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::setAddr); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getAddr); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::operator_equal); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getSocketAddrHandle); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getLocalHostname); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::resolveHostname); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::gettheServicePort); +CPPUNIT_TEST_SUITE_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr); } // namespace osl_SocketAddr @@ -892,4 +885,6 @@ CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_SocketAddr::getFamilyOfSocketAddr, "os // 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; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_Socket_Const.h b/sal/qa/osl/socket/osl_Socket_Const.h index 554b188fa1ad..03fcf85c9cae 100755..100644 --- a/sal/qa/osl/socket/osl_Socket_Const.h +++ b/sal/qa/osl/socket/osl_Socket_Const.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,9 @@ * ************************************************************************/ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - #ifndef _OSL_SOCKET_CONST_H_ #define _OSL_SOCKET_CONST_H_ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #include <sal/types.h> #include <rtl/textenc.h> #include <rtl/ustring.hxx> @@ -58,9 +54,6 @@ const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; -//define read count -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #ifdef __cplusplus extern "C" @@ -71,7 +64,7 @@ extern "C" //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> # include <string.h> @@ -88,11 +81,8 @@ extern "C" # include <arpa/inet.h> #endif #if ( defined WNT ) // Windows -#include <tools/prewin.h> -// # include <windows.h> # include <winsock.h> # include <string.h> -#include <tools/postwin.h> #endif @@ -182,15 +172,10 @@ OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); //------------------------------------------------------------------------ OSLTEST_DECLARE( NullURL, "" ); -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - #ifdef __cplusplus } #endif -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - - #endif /* _OSL_SOCKET_CONST_H_ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_Socket_Const_orig.h b/sal/qa/osl/socket/osl_Socket_Const_orig.h index 36272a5694d4..d40ad9174598 100644 --- a/sal/qa/osl/socket/osl_Socket_Const_orig.h +++ b/sal/qa/osl/socket/osl_Socket_Const_orig.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,14 +26,9 @@ * ************************************************************************/ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - #ifndef _OSL_SOCKET_CONST_H_ #define _OSL_SOCKET_CONST_H_ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #include <sal/types.h> #include <rtl/textenc.h> #include <rtl/ustring.hxx> @@ -58,9 +54,6 @@ const char * pTestString1 = "test socket"; const char * pTestString2 = " Passed#OK"; -//define read count -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #ifdef __cplusplus extern "C" @@ -71,7 +64,7 @@ extern "C" //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix # include <unistd.h> # include <limits.h> # include <string.h> @@ -88,11 +81,8 @@ extern "C" # include <arpa/inet.h> #endif #if ( defined WNT ) // Windows -#include <tools/prewin.h> -// # include <windows.h> # include <winsock.h> # include <string.h> -#include <tools/postwin.h> #endif @@ -186,15 +176,10 @@ OSLTEST_DECLARE( HostIpZero, "0.0.0.0" ); //------------------------------------------------------------------------ OSLTEST_DECLARE( NullURL, "" ); -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - #ifdef __cplusplus } #endif -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - - #endif /* _OSL_SOCKET_CONST_H_ */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_Socket_tests.cxx b/sal/qa/osl/socket/osl_Socket_tests.cxx index 3434d48203a0..120d9fa24a91 100644 --- a/sal/qa/osl/socket/osl_Socket_tests.cxx +++ b/sal/qa/osl/socket/osl_Socket_tests.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,7 +34,9 @@ //------------------------------------------------------------------------ #include <osl_Socket_Const.h> -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> #include <osl/socket.hxx> //------------------------------------------------------------------------ // helper functions @@ -63,7 +66,7 @@ namespace osl_Socket CPPUNIT_TEST_SUITE_END(); }; - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::tests, "osl_SocketTest"); + CPPUNIT_TEST_SUITE_REGISTRATION(osl_Socket::tests); } @@ -83,6 +86,8 @@ void RegisterAdditionalFunctions( FktRegFuncPtr _pFunc ) #else*/ -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); //#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx index 9883511cb43e..c2683d6ead46 100644 --- a/sal/qa/osl/socket/osl_StreamSocket.cxx +++ b/sal/qa/osl/socket/osl_StreamSocket.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,18 +55,17 @@ inline sal_Bool SAL_CALL operator== (const SocketAddr & Addr) const; */ -//------------------------------------------------------------------------ -// include files -//------------------------------------------------------------------------ - -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> -//#include "osl_Socket_Const.h" #include "sockethelper.hxx" #include <osl/conditn.hxx> using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OString; #define IP_PORT_MYPORT9 8897 #define IP_PORT_MYPORT10 18900 @@ -142,7 +142,7 @@ protected: void SAL_CALL run( ) { ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); ::osl::StreamSocket ssStreamConnection; //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket @@ -252,7 +252,7 @@ protected: public: ClientSocketThread( osl::Condition &_aCond ): m_aCondition(_aCond), - m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ), + m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ), m_csConnectorSocket( ) { m_id = getIdentifier( ); @@ -335,7 +335,7 @@ protected: void SAL_CALL run( ) { - ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr m_aTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); ::osl::ConnectorSocket m_aConnectorSocket; if (! m_aTargetSocketAddr.is()) @@ -416,7 +416,7 @@ protected: { t_print("start WriteSocketThread\n"); ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT10 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT10 ); if (! saLocalSocketAddr.is()) { t_print("LocalSocketAddr was NOT created successfully!\n"); @@ -460,31 +460,6 @@ protected: else { -// LLA: removed, due to the fact, this is to error prone -// LLA: char * pSrcRoot = getenv("SOURCE_ROOT"); -// LLA: // LLA: This is absolute wrong! -// LLA: // strcat( pSrcRoot, "/sal/inc/osl/file.hxx"); -// LLA: rtl::OString sSrcRoot(pSrcRoot); -// LLA: sSrcRoot += "/sal/inc/osl/file.hxx"; -// LLA: -// LLA: ::rtl::OUString sFilePath = ::rtl::OUString::createFromAscii( sSrcRoot.getStr() ); -// LLA: #ifdef WNT -// LLA: while (sFilePath.lastIndexOf('/') != -1) -// LLA: sFilePath = sFilePath.replace('/',(sal_Unicode)'\\'); -// LLA: #endif -// LLA: FILE *stream; -// LLA: sal_uInt64 nCount_read; -// LLA: sal_Char buffer_read[FILE_READ]; -// LLA: -// LLA: if( (stream = fopen( oustring2char( sFilePath ), "r+t" )) != NULL ) -// LLA: { -// LLA: /* Attempt to read in 25 characters */ -// LLA: nCount_read = fread( buffer_read, sizeof( char ), FILE_READ, stream ); -// LLA: fclose( stream ); -// LLA: } -// LLA: else -// LLA: t_print("# File $SRC_ROOT/sal/inc/osl/file.hxx could not be opened\n" ); - t_print("write()\n"); ssStreamConnection.write( m_aValues.getBuffer(), m_aValues.getBufferSize() ); @@ -640,7 +615,7 @@ namespace osl_StreamSocket void send_recv2() { ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ); ::osl::StreamSocket ssStreamConnection; sal_Char pReadBuffer[30] = ""; @@ -687,7 +662,7 @@ namespace osl_StreamSocket sal_Int32 nLength = myClientThread.getCount(); bool bIsOk = myClientThread.isOk(); // check if the values are right. - t_print("Length:=%d\n", nLength); + t_print("Length:=%d\n", (int) nLength); t_print(" bIsOk:=%d\n", bIsOk); CPPUNIT_ASSERT_MESSAGE(" test for write/read values with two threads: send data from server, check readed data in client.", @@ -744,12 +719,17 @@ namespace osl_StreamSocket if ( osl_Socket_Ok == m_csConnectorSocket.connect( m_saTargetSocketAddr, pTimeout )) { - sal_Int32 nWrite1 = m_csConnectorSocket.write( pTestString1, 11 ); // "test socket" - - sal_Int32 nWrite2 = m_csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 ); +#if !SILENT_TEST + sal_Int32 nWrite1 = +#endif + m_csConnectorSocket.write( pTestString1, 11 ); // "test socket" +#if !SILENT_TEST + sal_Int32 nWrite2 = +#endif + m_csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 ); thread_sleep( 2 ); m_csConnectorSocket.write( pTestString2, strlen( pTestString2 ) + 1 ); - t_print("nWrite1 is %d, nWrite2 is %d\n", nWrite1, nWrite2 ); + t_print("nWrite1 is %d, nWrite2 is %d\n", (int) nWrite1, (int) nWrite2 ); //thread_sleep( 1 ); } else @@ -760,7 +740,7 @@ namespace osl_StreamSocket } public: SendClientThread( ): - m_saTargetSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9 ), + m_saTargetSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9 ), m_csConnectorSocket( ) { //t_print("# successfully creat this SendClientThread %d!\n", m_id ); @@ -792,7 +772,7 @@ namespace osl_StreamSocket { #if defined(LINUX) ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - AcceptorThread myAcceptorThread( asSocket, rtl::OUString::createFromAscii("127.0.0.1") ); + AcceptorThread myAcceptorThread( asSocket, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")) ); myAcceptorThread.create(); thread_sleep( 1 ); @@ -809,7 +789,7 @@ namespace osl_StreamSocket void shutdown_002() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9); asSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True); CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True ); @@ -839,7 +819,7 @@ namespace osl_StreamSocket sal_Int32 nRead2 = ssConnectionSocket.read( pReadBuffer + nRead1, 12 ); sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 + nRead2, 12 ); - t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", nRead1, nRead2, nRead3 ); + t_print("after read 2, nRead1 is %d, nRead2 is %d, nRead3 is %d \n", (int) nRead1, (int) nRead2, (int) nRead3 ); mySendThread.join(); ssConnectionSocket.close(); @@ -862,7 +842,7 @@ namespace osl_StreamSocket void shutdown_003() { ::osl::AcceptorSocket asSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); - ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("127.0.0.1"), IP_PORT_MYPORT9); + ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("127.0.0.1")), IP_PORT_MYPORT9); asSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); CPPUNIT_ASSERT_MESSAGE("shutdown_002: bind fail", asSocket.bind( saLocalSocketAddr ) == sal_True); CPPUNIT_ASSERT_MESSAGE("shutdown_002: listen fail", asSocket.listen( 1 ) == sal_True ); @@ -886,7 +866,7 @@ namespace osl_StreamSocket sal_Int32 nWrite = ssConnectionSocket.write( pReadBuffer, 11 ); // still can read sal_Int32 nRead3 = ssConnectionSocket.read( pReadBuffer + nRead1 , 12 ); - t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", nRead1, nWrite, nRead3 ); + t_print("after read 2, nRead1 is %d, nWrite is %d, nRead3 is %d\n", (int) nRead1, (int) nWrite, (int) nRead3 ); mySendThread.join(); ssConnectionSocket.close(); asSocket.close(); @@ -929,59 +909,6 @@ namespace osl_StreamSocket }; // class isExceptionPending // ----------------------------------------------------------------------------- -/** Server Socket Thread, write a file which is large - */ -// LLA: class WriteSocketThread : public Thread -// LLA: { -// LLA: ValueCheckProvider m_aValues; -// LLA: -// LLA: protected: -// LLA: oslThreadIdentifier m_id; -// LLA: -// LLA: void SAL_CALL run( ) -// LLA: { -// LLA: ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); -// LLA: ::osl::SocketAddr saLocalSocketAddr( rtl::OUString::createFromAscii("10.16.66.252"), 8888 ); -// LLA: ::osl::StreamSocket ssStreamConnection; -// LLA: -// LLA: //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket -// LLA: asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True); -// LLA: -// LLA: /// if the thread should terminate, schedule return false -// LLA: while ( schedule( ) == sal_True ) -// LLA: { -// LLA: sal_Bool bOK1 = asAcceptorSocket.bind( saLocalSocketAddr ); -// LLA: if ( sal_True != bOK1 ) -// LLA: { -// LLA: t_print("# WriteSocketThread: AcceptorSocket bind address failed. \n" ) ; -// LLA: break; -// LLA: } -// LLA: sal_Bool bOK2 = asAcceptorSocket.listen( 1 ); -// LLA: if ( sal_True != bOK2 ) -// LLA: { -// LLA: t_print("# WriteSocketThread: AcceptorSocket listen address failed. \n" ) ; -// LLA: break; -// LLA: } -// LLA: // blocking mode, if read/recv failed, block until success -// LLA: asAcceptorSocket.enableNonBlockingMode( sal_False); -// LLA: -// LLA: oslSocketResult eResult = asAcceptorSocket.acceptConnection( ssStreamConnection ); -// LLA: if (eResult != osl_Socket_Ok ) -// LLA: { -// LLA: t_print("WriteSocketThread: acceptConnection failed! \n"); -// LLA: break; -// LLA: } -// LLA: -// LLA: -// LLA: sal_Int32 nReadNumber1 = ssStreamConnection.write( m_aValues.getBuffer(), m_aValues.getBufferSize() ); -// LLA: break; -// LLA: } -// LLA: ssStreamConnection.close(); -// LLA: asAcceptorSocket.close(); -// LLA: } -// LLA: } -// ----------------------------------------------------------------------------- -// ----------------------------------------------------------------------------- /** Client Socket Thread, served as a temp little client to communicate with server. */ @@ -1041,7 +968,7 @@ namespace osl_StreamSocket { t_print("read()\n"); m_nReadCount = aSocket.read( m_pBuffer, m_nBufferSize ); - t_print("%d bytes recived.\n", m_nReadCount); + t_print("%d bytes recived.\n", (int) m_nReadCount); } } else @@ -1203,10 +1130,6 @@ namespace osl_StreamSocket t_print("received: %s\n", pBuffer2); - // char * pBuffer3 = "quit\n"; - // nBufferSize = strlen(pBuffer3); - // nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize ); - rtl::OUString suError = ssStreamConnection.getErrorAsString(); free(pBuffer2); // ssStreamConnection.close(); @@ -1221,9 +1144,9 @@ namespace osl_StreamSocket public: // LLA: orig void send_recv() // LLA: orig { -// LLA: orig if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True ) +// LLA: orig if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True ) // LLA: orig t_print("margritte is alive ! \n"); -// LLA: orig if ( ifAvailable(rtl::OUString::createFromAscii("10.16.66.252")) == sal_False ) +// LLA: orig if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252"))) == sal_False ) // LLA: orig { // LLA: orig t_print("ip 10.16.66.252 is not alive! \n"); // LLA: orig return; @@ -1272,14 +1195,11 @@ namespace osl_StreamSocket char const * pBuffer = "Test String\n"; sal_Int32 nBufferSize = strlen(pBuffer); - sal_Int32 nWriteNumber = ssStreamConnection.write( pBuffer, nBufferSize ); - - // char * pBuffer2 = " "; - // sal_Int32 nReadNumber = ssStreamConnection.read( pBuffer2, strlen(pBuffer2) ); + ssStreamConnection.write( pBuffer, nBufferSize ); char const * pBuffer3 = "quit\n"; nBufferSize = strlen(pBuffer3); - nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize ); + ssStreamConnection.write( pBuffer3, nBufferSize ); ssStreamConnection.close(); } @@ -1302,7 +1222,7 @@ namespace osl_StreamSocket void send_recv() { rtl::OString sAddr; - // if ( ifAvailable(rtl::OUString::createFromAscii("margritte.germany")) == sal_True ) + // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("margritte.germany"))) == sal_True ) // { // t_print("margritte is alive ! \n"); // sAddr = "margritte.germany"; @@ -1315,21 +1235,21 @@ namespace osl_StreamSocket } // else // { -// if ( ifAvailable(rtl::OUString::createFromAscii("192.168.7.2")) == sal_True ) +// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("192.168.7.2"))) == sal_True ) // { // sAddr = "192.168.7.2"; // t_print("moon found ! \n"); // } // else // { -// if ( ifAvailable(rtl::OUString::createFromAscii("moon.linux.bogus")) == sal_True ) +// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon.linux.bogus"))) == sal_True ) // { // sAddr = "moon.linux.bogus"; // t_print("moon found ! \n"); // } // else // { -// if ( ifAvailable(rtl::OUString::createFromAscii("moon")) == sal_True ) +// if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("moon"))) == sal_True ) // { // sAddr = "moon"; // t_print("moon found ! \n"); @@ -1338,7 +1258,7 @@ namespace osl_StreamSocket // } // } - // if ( ifAvailable(rtl::OUString::createFromAscii("10.16.64.196")) == sal_False ) + // if ( ifAvailable(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.64.196"))) == sal_False ) // { // t_print("ip 10.16.64.196 is not alive! \n"); // return; @@ -1363,10 +1283,17 @@ namespace osl_StreamSocket // termAndJoinThread(&myReadThread); // statistics - sal_uInt32 nLength = myReadThread.getCount(); - bool bIsOk = myReadThread.isOk(); // check if the values are right. +#if !SILENT_TEST + sal_uInt32 nLength = +#endif + myReadThread.getCount(); + +#if !SILENT_TEST + bool bIsOk = +#endif + myReadThread.isOk(); // check if the values are right. - t_print("Length:=%d\n", nLength); + t_print("Length:=%d\n", (int) nLength); t_print(" bIsOk:=%d\n", bIsOk); } else @@ -1478,10 +1405,6 @@ namespace osl_StreamSocket } free(pBufferPeek); - // char * pBuffer3 = "quit\n"; - // nBufferSize = strlen(pBuffer3); - // nWriteNumber = ssStreamConnection.write( pBuffer3, nBufferSize ); - rtl::OUString suError = ssStreamConnection.getErrorAsString(); } aSocket.shutdown(osl_Socket_DirReadWrite); @@ -1490,12 +1413,12 @@ namespace osl_StreamSocket // ----------------------------------------------------------------------------- - 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"); - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::isExceptionPending, "osl_StreamSocket"); + CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::ctors); + CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::send_recv); +// CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::shutdown); + CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::isExceptionPending); - CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_StreamSocket::justtest, "osl_StreamSocket"); +// CPPUNIT_TEST_SUITE_REGISTRATION(osl_StreamSocket::justtest); } // namespace osl_StreamSocket @@ -1503,4 +1426,6 @@ 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. -NOADDITIONAL; +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/sockethelper.cxx b/sal/qa/osl/socket/sockethelper.cxx index 4568f042dc15..1aaab989e4a8 100644 --- a/sal/qa/osl/socket/sockethelper.cxx +++ b/sal/qa/osl/socket/sockethelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" #include "sockethelper.hxx" -#include <testshl/simpleheader.hxx> +#include <cppunit/TestFixture.h> +#include <cppunit/extensions/HelperMacros.h> +#include <cppunit/plugin/TestPlugIn.h> + +#if OSL_DEBUG_LEVEL > 0 +# define SILENT_TEST 0 +#else +# define SILENT_TEST 1 +#endif + +#if SILENT_TEST +# define t_print(...) { } +#else +# define t_print printf +#endif //------------------------------------------------------------------------ // Ip version definition @@ -66,24 +81,19 @@ sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::Socke return ( ( sal_True == compareUString( addr1.getHostname( 0 ), addr2.getHostname( 0 ) ) ) && ( addr2.getPort( ) == addr2.getPort( ) ) ); } -/*char * oustring2char( const ::rtl::OUString & str ) -{ - rtl::OString aString; - aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ); - t_print("oustring2char %s\n", aString.getStr( ) ); - sal_Char * sStr = aString.getStr( ); - return (char *)sStr; -}*/ - /** print a UNI_CODE String. And also print some comments of the string. */ void printUString( const ::rtl::OUString & str, const char* msg) { +#if SILENT_TEST + (void)str; + (void)msg; +#else t_print("#%s #printUString_u# ", msg ); rtl::OString aString; aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ); - //char * sStr = aString.getStr( ); t_print("%s\n", aString.getStr( ) ); +#endif } /** get the local host name. @@ -115,7 +125,7 @@ void printUString( const ::rtl::OUString & str, const char* msg) #else char hostname[255]; if (gethostname(hostname, 255) != 0) { - OSL_ENSURE( false, "#Error: gethostname failed." ); + OSL_FAIL( "#Error: gethostname failed." ); } struct hostent *hptr; @@ -174,11 +184,11 @@ void printUString( const ::rtl::OUString & str, const char* msg) if ( returnVal.equals( rightVal ) ) return aUString; aUString += ::rtl::OUString::createFromAscii(msg); - aUString += ::rtl::OUString::createFromAscii(": the returned value is '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": the returned value is '")); aUString += returnVal; - aUString += ::rtl::OUString::createFromAscii("', but the value should be '"); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("', but the value should be '")); aUString += rightVal; - aUString += ::rtl::OUString::createFromAscii("'."); + aUString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("'.")); return aUString; } @@ -193,7 +203,7 @@ void thread_sleep( sal_Int32 _nSec ) #ifdef WNT //Windows Sleep( _nSec * 100 ); #endif -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix usleep(_nSec * 100000); #endif // t_print("# done\n" ); @@ -203,16 +213,23 @@ void thread_sleep( sal_Int32 _nSec ) */ void printBool( sal_Bool bOk ) { - t_print("printBool " ); - ( sal_True == bOk ) ? t_print("YES!" ): t_print("NO!"); - t_print("\n"); +#if SILENT_TEST + (void)bOk; +#else + t_print("#printBool# " ); + t_print ("%s", (sal_True == bOk) ? "YES!\n" : "NO!\n"); +#endif } /** print content of a ByteSequence. */ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen ) { - t_print("ByteSequence is: " ); +#if SILENT_TEST + (void)bsByteSeq; + (void)nLen; +#else + t_print("#ByteSequence is: " ); for ( int i = 0; i < nLen; i++ ){ if ( bsByteSeq[i] < 0 ) t_print("%d ", 256 + bsByteSeq[i] ); @@ -220,6 +237,7 @@ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen t_print("%d ", bsByteSeq[i] ); } t_print(" .\n" ); +#endif } /** convert an IP which is stored as a UString format to a ByteSequence array for later use. @@ -287,87 +305,6 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq return sal_False; } -/** if the IP or hostname is availble( alive ) -*/ -/*sal_Bool ifAvailable( const char * stringAddrOrHostName ) -{ - sal_Bool result; - int p[2]; - sal_Char buffer[2000]; - char stringhost[20]; - strcpy(stringhost, stringAddrOrHostName ); - - result = sal_False; - if (pipe (p) == 0) - { - pid_t pid; - int nStatus; - pid = fork(); - if (pid == 0) - { -#if ( defined LINUX ) - char *argv[] = - { - "/bin/ping", - "-c", "3", - "-W", "3", - stringhost, - NULL - }; -#endif -#if ( defined SOLARIS ) - char *argv[] = - { - "/usr/sbin/ping", - stringhost, - "3", - NULL - }; -#endif - close (p[0]); - dup2 (p[1], 1); - close (p[1]); -#if ( defined LINUX ) - execv ("/bin/ping", argv); -#endif -#if ( defined SOLARIS ) - execv ("/usr/sbin/ping", argv); -#endif - // arriving here means exec failed - _exit(-1); - } - else if (pid > 0) - { - sal_Int32 k = 0, n = 2000; - close (p[1]); - if ((k = read (p[0], buffer, n - 1)) > 0) - { - buffer[k] = 0; - if (buffer[k - 1] == '\n') - buffer[k - 1] = 0; -#if ( defined LINUX ) - char strOK[] = "bytes from"; -#endif -#if ( defined SOLARIS ) - char strOK[] = "is alive"; -#endif - if (strstr( buffer, strOK ) != NULL ) - result = sal_True; - t_print("buffer is %s\n", buffer ); - } - close (p[0]); - waitpid (pid, &nStatus, 0); - } - else - { - close (p[0]); - close (p[1]); - } - - } - return result; -}*/ - sal_Bool ifAvailable( rtl::OUString const& strAddrOrHostName ) { ::osl::ConnectorSocket aSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream ); @@ -399,3 +336,5 @@ sal_Bool ifAvailable( rtl::OUString const& strAddrOrHostName ) } return sal_True; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sal/qa/osl/socket/sockethelper.hxx b/sal/qa/osl/socket/sockethelper.hxx index 414447cca003..fb01ed47cb50 100644 --- a/sal/qa/osl/socket/sockethelper.hxx +++ b/sal/qa/osl/socket/sockethelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -24,35 +25,23 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #ifndef _SOCKETHELPER_HXX_ #define _SOCKETHELPER_HXX_ -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ #include <sal/types.h> #include <rtl/textenc.h> #include <rtl/ustring.hxx> #include <rtl/ustring.h> -#ifndef _OSL_SOCLET_HXX_ #include <osl/socket.hxx> -#endif #include <osl/socket.h> -#ifndef _OSL_THREAD_HXX #include <osl/thread.hxx> -#endif -#ifndef _OSL_FILE_HXX #include <osl/file.hxx> -#endif -#ifndef _OSL_MUTEX_HXX #include <osl/mutex.hxx> -#endif #include <osl/time.h> #ifdef __cplusplus @@ -63,7 +52,7 @@ extern "C" //------------------------------------------------------------------------ // OS dependent declaration and includes //------------------------------------------------------------------------ -#if ( defined UNX ) || ( defined OS2 ) //Unix +#if ( defined UNX ) //Unix #include <unistd.h> #include <limits.h> @@ -85,22 +74,34 @@ extern "C" #ifndef _OSL_SOCKET_CONST_H_ #if ( defined WNT ) // Windows -#include <tools/prewin.h> -// #include <windows.h> #include <winsock.h> #include <string.h> -#include <tools/postwin.h> #endif #endif -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ - #ifdef __cplusplus } #endif +/** test output if SILENT_TEST is 0 +*/ +#if OSL_DEBUG_LEVEL > 0 +# define SILENT_TEST 0 +#else +# define SILENT_TEST 1 +#endif + +#if SILENT_TEST +# define t_print(...) { } +#else +# define t_print printf +#endif + +/** convert UString and OUString to std::string +*/ +#define STD_STRING(s) (std::string((const char *)s.getStr())) + /** compare two OUString. */ sal_Bool compareUString( const ::rtl::OUString & ustr1, const ::rtl::OUString & ustr2 ); @@ -163,3 +164,5 @@ class CloseSocketThread : public Thread */ #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |