#i125003# migrate main/sal/qa/osl/socket from cppunit to Google Test,

get tests to compile and not to SIGSEGV or die from EPIPE,
and get as many tests to pass as possible.

sal/qa/osl/socket/makefile.mk

@@ -32,180 +32,174 @@ ENABLE_EXCEPTIONS=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(ENABLE_UNIT_TESTS)" != "YES"
+all:
+    @echo unit tests are disabled. Nothing to do.
+
+.ELSE
+
 CFLAGS+= $(LFS_CFLAGS)
 CXXFLAGS+= $(LFS_CFLAGS)
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL1OBJS=  \
+APP1OBJS=  \
     $(SLO)$/osl_Socket.obj
 
-SHL1TARGET=osl_SocketOld
-SHL1STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+APP1TARGET=osl_SocketOld
+APP1STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL1STDLIBS+= $(WS2_32LIB)
+APP1STDLIBS+= $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL1STDLIBS+= -ldl -lnsl
+.IF ""$(OS)"=="SOLARIS"
+APP1STDLIBS+= -ldl -lnsl
 .ENDIF
 
-SHL1IMPLIB= i$(SHL1TARGET)
-# SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-# DEF1EXPORTFILE= export.exp
-SHL1VERSIONMAP = $(PRJ)$/qa$/export.map
+APP1RPATH = NONE
+APP1TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 # --- BEGIN --------------------------------------------------------
-SHL2OBJS=  \
+APP2OBJS=  \
     $(SLO)$/osl_Socket_tests.obj
-SHL2TARGET= osl_Socket_tests
-SHL2STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
-
-SHL2IMPLIB= i$(SHL2TARGET)
-DEF2NAME=    $(SHL2TARGET)
-SHL2VERSIONMAP = $(PRJ)$/qa$/export.map
-
+APP2TARGET= osl_Socket_tests
+APP2STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
+APP2RPATH = NONE
+APP2TEST = enabled
 # END --------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL3OBJS=  \
+APP3OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_StreamSocket.obj
 
-SHL3TARGET= osl_StreamSocket
-SHL3STDLIBS= $(SALLIB) $CPPUNITLIB) $(TESTSHL2LIB)
+APP3TARGET= osl_StreamSocket
+APP3STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL3STDLIBS += $(WS2_32LIB)
+APP3STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL3STDLIBS += -ldl -lnsl
+.IF "$(OS)"=="SOLARIS"
+APP3STDLIBS += -ldl -lnsl
 .ENDIF
 
-SHL3IMPLIB= i$(SHL3TARGET)
-DEF3NAME=    $(SHL3TARGET)
-SHL3VERSIONMAP = $(PRJ)$/qa$/export.map
+APP3RPATH = NONE
+APP3TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL4OBJS=  \
+APP4OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_DatagramSocket.obj
 
-SHL4TARGET= osl_DatagramSocket
-SHL4STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+APP4TARGET= osl_DatagramSocket
+APP4STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL4STDLIBS += $(WS2_32LIB)
+APP4STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL4STDLIBS += -ldl -lnsl
+.IF "$(OS)"=="SOLARIS"
+APP4STDLIBS += -ldl -lnsl
 .ENDIF
 
-SHL4IMPLIB= i$(SHL4TARGET)
-DEF4NAME=    $(SHL4TARGET)
-SHL4VERSIONMAP = $(PRJ)$/qa$/export.map
+APP4RPATH = NONE
+APP4TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL5OBJS=  \
+APP5OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_SocketAddr.obj
 
-SHL5TARGET= osl_SocketAddr
-SHL5STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+APP5TARGET= osl_SocketAddr
+APP5STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL5STDLIBS += $(WS2_32LIB)
+APP5STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL5STDLIBS += -ldl -lnsl
+.IF "$(OS)"=="SOLARIS"
+APP5STDLIBS += -ldl -lnsl
 .ENDIF
 
-SHL5IMPLIB= i$(SHL5TARGET)
-DEF5NAME=    $(SHL5TARGET)
-SHL5VERSIONMAP = $(PRJ)$/qa$/export.map
+APP5RPATH = NONE
+APP5TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL6OBJS=  \
+APP6OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_Socket2.obj
 
-SHL6TARGET= osl_Socket2
-SHL6STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+APP6TARGET= osl_Socket2
+APP6STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL6STDLIBS += $(WS2_32LIB)
+APP6STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL6STDLIBS += -ldl -lnsl
+.IF "$(OS)"=="SOLARIS"
+APP6STDLIBS += -ldl -lnsl
 .ENDIF
 
-SHL6IMPLIB= i$(SHL6TARGET)
-DEF6NAME=    $(SHL6TARGET)
-SHL6VERSIONMAP = $(PRJ)$/qa$/export.map
+APP6RPATH = NONE
+APP6TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL7OBJS=  \
+APP7OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_ConnectorSocket.obj
 
-SHL7TARGET= osl_ConnectorSocket
-SHL7STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+APP7TARGET= osl_ConnectorSocket
+APP7STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL7STDLIBS += $(WS2_32LIB)
+APP7STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL7STDLIBS += -ldl -lnsl
+.IF "$(OS)"=="SOLARIS"
+APP7STDLIBS += -ldl -lnsl
 .ENDIF
 
-SHL7IMPLIB= i$(SHL7TARGET)
-DEF7NAME=    $(SHL7TARGET)
-SHL7VERSIONMAP = $(PRJ)$/qa$/export.map
+APP7RPATH = NONE
+APP7TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
 # BEGIN ----------------------------------------------------------------
 # auto generated Target:Socket by codegen.pl
-SHL8OBJS=  \
+APP8OBJS=  \
     $(SLO)$/sockethelper.obj \
     $(SLO)$/osl_AcceptorSocket.obj
 
-SHL8TARGET= osl_AcceptorSocket
-SHL8STDLIBS= $(SALLIB) $(CPPUNITLIB) $(TESTSHL2LIB)
+APP8TARGET= osl_AcceptorSocket
+APP8STDLIBS= $(SALLIB) $(GTESTLIB) $(TESTSHL2LIB)
 
 .IF "$(GUI)" == "WNT"
-SHL8STDLIBS += $(WS2_32LIB)
+APP8STDLIBS += $(WS2_32LIB)
 .ENDIF
 
-.IF "$(GUI)" == "UNX"
-SHL8STDLIBS += -ldl -lnsl
+.IF "$(OS)"=="SOLARIS"
+APP8STDLIBS += -ldl -lnsl
 .ENDIF
 
-SHL8IMPLIB= i$(SHL8TARGET)
-DEF8NAME=    $(SHL8TARGET)
-SHL8VERSIONMAP = $(PRJ)$/qa$/export.map
+APP8PATH = NONE
+APP8TEST = enabled
 # auto generated Target:Socket
 # END ------------------------------------------------------------------
 
@@ -216,4 +210,5 @@ SHL8VERSIONMAP = $(PRJ)$/qa$/export.map
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :  target.mk
-.INCLUDE : _cppunit.mk
+
+.ENDIF # "$(ENABLE_UNIT_TESTS)" != "YES"
\ No newline at end of file

sal/qa/osl/socket/osl_Socket_Const.h

@@ -75,7 +75,9 @@ extern "C"
 #   include <errno.h>
 #   include <fcntl.h>
 #   include <sys/stat.h>
-#   include <sys/statfs.h>
+#   ifndef __FreeBSD__
+#       include <sys/statfs.h>
+#   endif
 #   include <sys/statvfs.h>
 #   include <sys/types.h>
 #   include <sys/socket.h>

sal/qa/osl/socket/osl_Socket_Const_orig.h

@@ -75,7 +75,9 @@ extern "C"
 #   include <errno.h>
 #   include <fcntl.h>
 #   include <sys/stat.h>
-#   include <sys/statfs.h>
+#   ifndef __FreeBSD__
+#       include <sys/statfs.h>
+#   endif
 #   include <sys/statvfs.h>
 #   include <sys/types.h>
 #   include <sys/socket.h>

sal/qa/osl/socket/osl_Socket_tests.cxx

@@ -29,7 +29,7 @@
 //------------------------------------------------------------------------
 #include <osl_Socket_Const.h>
 
-#include <testshl/simpleheader.hxx>
+#include "gtest/gtest.h"
 #include <osl/socket.hxx>
 //------------------------------------------------------------------------
 // helper functions
@@ -42,24 +42,18 @@
 namespace osl_Socket
 {
 
-    class tests : public CppUnit::TestFixture
+    class tests : public ::testing::Test
     {
     public:
-
-        void test_001()
-            {
-                // _osl_getFullQualifiedDomainName( );
-                oslSocketResult aResult;
-                rtl::OUString suHostname = osl::SocketAddr::getLocalHostname(&aResult);
-                CPPUNIT_ASSERT_MESSAGE("getLocalHostname failed", aResult == osl_Socket_Ok);
-            }
-
-        CPPUNIT_TEST_SUITE( tests );
-        CPPUNIT_TEST( test_001 );
-        CPPUNIT_TEST_SUITE_END();
     };
 
-    CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(osl_Socket::tests, "osl_SocketTest");
+    TEST_F(tests, test_001)
+        {
+            // _osl_getFullQualifiedDomainName( );
+            oslSocketResult aResult;
+            rtl::OUString suHostname = osl::SocketAddr::getLocalHostname(&aResult);
+            ASSERT_TRUE(aResult == osl_Socket_Ok) << "getLocalHostname failed";
+        }
 }
 
 
@@ -79,6 +73,10 @@ void RegisterAdditionalFunctions( FktRegFuncPtr _pFunc )
 
 #else*/
 
-NOADDITIONAL;
+int main(int argc, char **argv)
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
 
 //#endif

sal/qa/osl/socket/sockethelper.cxx

@@ -25,7 +25,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sal.hxx"
 #include "sockethelper.hxx"
-#include <testshl/simpleheader.hxx>
 
 //------------------------------------------------------------------------
 // Ip version definition
@@ -66,7 +65,7 @@ sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::Socke
 {
     rtl::OString aString;
     aString = ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US );
-    t_print("oustring2char %s\n", aString.getStr( ) );
+    printf("oustring2char %s\n", aString.getStr( )  );
     sal_Char * sStr = aString.getStr( );
     return (char *)sStr;
 }*/
@@ -75,11 +74,11 @@ sal_Bool compareSocketAddr( const ::osl::SocketAddr & addr1 , const ::osl::Socke
 */
 void printUString( const ::rtl::OUString & str, const char* msg)
 {
-    t_print("#%s #printUString_u# ", msg );
+    printf("#%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( ) );
+    printf("%s\n",  aString.getStr( ) );
 }
 
 /** get the local host name.
@@ -122,7 +121,7 @@ void printUString( const ::rtl::OUString & str, const char* msg)
     strcpy( hostname, hptr->h_name );
     }
 
-    t_print("hostname is %s \n", hostname );
+    printf("hostname is %s \n", hostname );
     rtl::OString sHostname( hostname );
     aUString = ::rtl::OStringToOUString( sHostname, RTL_TEXTENCODING_ASCII_US );
     aUString.getLength();
@@ -145,7 +144,7 @@ void printUString( const ::rtl::OUString & str, const char* msg)
         //if there are more than one IPs on the same machine, we select one
         for (; *addrptr; addrptr++)
         {
-            t_print("#Local IP Address: %s\n", inet_ntoa(**addrptr));
+            printf("#Local IP Address: %s\n", inet_ntoa(**addrptr));
             aUString = ::rtl::OUString::createFromAscii( (sal_Char *) (inet_ntoa(**addrptr)) );
         }
     }
@@ -192,30 +191,30 @@ void thread_sleep( sal_Int32 _nSec )
 #if ( defined UNX ) || ( defined OS2 )   //Unix
     usleep(_nSec * 100000);
 #endif
-    // t_print("# done\n" );
+    // printf("# done\n" );
 }
 
 /** print Boolean value.
 */
 void printBool( sal_Bool bOk )
 {
-    t_print("printBool " );
-    ( sal_True == bOk ) ? t_print("YES!" ): t_print("NO!");
-    t_print("\n");
+    printf("printBool " );
+    ( sal_True == bOk ) ? printf("YES!" ): printf("NO!");
+    printf("\n");
 }
 
 /** print content of a ByteSequence.
 */
 void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen )
 {
-    t_print("ByteSequence is: " );
+    printf("ByteSequence is: " );
     for ( int i = 0; i < nLen; i++ ){
         if ( bsByteSeq[i] < 0 )
-            t_print("%d ",  256 + bsByteSeq[i] );
+            printf("%d ",  256 + bsByteSeq[i] );
         else
-            t_print("%d ",  bsByteSeq[i] );
+            printf("%d ",  bsByteSeq[i] );
     }
-    t_print(" .\n" );
+    printf(" .\n" );
 }
 
 /** convert an IP which is stored as a UString format to a ByteSequence array for later use.
@@ -249,27 +248,27 @@ void printByteSequence_IP( const ::rtl::ByteSequence & bsByteSeq, sal_Int32 nLen
 */
 void printSocketResult( oslSocketResult eResult )
 {
-    t_print("printSocketResult: " );
+    printf("printSocketResult: " );
     if (!eResult)
     switch (eResult)
     {
         case osl_Socket_Ok:
-            t_print("client connected\n");
+            printf("client  connected\n");
             break;
         case osl_Socket_Error:
-            t_print("got an error ... exiting\r\n\r\n" );
+            printf("got an error ... exiting\r\n\r\n" );
             break;
         case osl_Socket_TimedOut:
-            t_print("timeout\n");
+            printf("timeout\n");
             break;
         case osl_Socket_Interrupted:
-            t_print("interrupted\n");
+            printf("interrupted\n");
             break;
         case osl_Socket_InProgress:
-            t_print("in progress\n");
+            printf("in progress\n");
             break;
     default:
-        t_print("unknown result\n");
+        printf("unknown result\n");
         break;
     }
 }
@@ -349,7 +348,7 @@ sal_Bool ifIpv4is( const ::rtl::ByteSequence Ipaddr, sal_Int8 seq1, sal_Int8 seq
 #endif
             if (strstr( buffer, strOK ) != NULL )
                 result = sal_True;
-            t_print("buffer is %s\n", buffer );
+            printf("buffer  is %s\n", buffer );
         }
         close (p[0]);
         waitpid (pid, &nStatus, 0);
@@ -387,9 +386,9 @@ sal_Bool ifAvailable( rtl::OUString const&  strAddrOrHostName )
     aSocket.close();
     if  ( aResult != osl_Socket_Ok )
     {
-        t_print("Error: ");
+        printf("Error: ");
         printSocketResult(aResult);
-        t_print("\n");
+        printf("\n");
 
         return sal_False;
     }

sal/qa/osl/socket/sockethelper.hxx

@@ -68,7 +68,9 @@ extern "C"
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
+#ifndef __FreeBSD__
+#   include <sys/statfs.h>
+#endif
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <sys/socket.h>