Author: damjan Date: Tue Oct 6 17:45:40 2015 New Revision: 1707099 URL: http://svn.apache.org/viewvc?rev=1707099&view=rev Log: #i125003# migrate main/sal/workben from cppunit to Google Test.
Modified: openoffice/trunk/main/sal/workben/makefile.mk openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx openoffice/trunk/main/sal/workben/t_osl_joinProcess.cxx Modified: openoffice/trunk/main/sal/workben/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/workben/makefile.mk?rev=1707099&r1=1707098&r2=1707099&view=diff ============================================================================== --- openoffice/trunk/main/sal/workben/makefile.mk (original) +++ openoffice/trunk/main/sal/workben/makefile.mk Tue Oct 6 17:45:40 2015 @@ -70,12 +70,12 @@ SHL1TARGET=togvi .IF "$(GUI)" == "WNT" APP1STDLIBS=$(KERNEL32LIB) SHL1STDLIBS=$(LB)$/isal.lib -SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib +SHL1STDLIBS+=$(SOLARLIBDIR)$/gtest.lib .ENDIF .IF "$(GUI)" == "UNX" SHL1STDLIBS=$(LB)$/libsal.so -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a +SHL1STDLIBS+=$(SOLARLIBDIR)$/libgtest$(DLLPOSTFIX).a .ENDIF SHL1IMPLIB=i$(SHL1TARGET) @@ -99,12 +99,12 @@ SHL1TARGET=tojp .IF "$(GUI)" == "WNT" APP1STDLIBS=$(KERNEL32LIB) SHL1STDLIBS=$(LB)$/isal.lib -SHL1STDLIBS+=$(SOLARLIBDIR)$/cppunit.lib +SHL1STDLIBS+=$(SOLARLIBDIR)$/gtest.lib .ENDIF .IF "$(GUI)" == "UNX" SHL1STDLIBS=$(LB)$/libsal.so -SHL1STDLIBS+=$(SOLARLIBDIR)$/libcppunit$(DLLPOSTFIX).a +SHL1STDLIBS+=$(SOLARLIBDIR)$/libgtest$(DLLPOSTFIX).a .ENDIF SHL1IMPLIB=i$(SHL1TARGET) Modified: openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx?rev=1707099&r1=1707098&r2=1707099&view=diff ============================================================================== --- openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx (original) +++ openoffice/trunk/main/sal/workben/t_osl_getVolInfo.cxx Tue Oct 6 17:45:40 2015 @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include "gtest/gtest.h" #include <osl/file.h> #include <rtl/ustring.hxx> @@ -67,62 +67,55 @@ void test_getVolumeInformation(const rtl osl_VolumeInfo_Mask_FileSystemName | osl_VolumeInfo_Mask_DeviceHandle); - CPPUNIT_ASSERT_MESSAGE - ( - "osl_getVolumeInformation failed", - err == osl_File_E_None - ); + ASSERT_TRUE( err == osl_File_E_None ) << "osl_getVolumeInformation failed"; } //------------------------------ // //------------------------------ -class TestClass_osl_getVolumeInformation : public CppUnit::TestFixture +class TestClass_osl_getVolumeInformation : public ::testing::Test { public: - - /*------------------------------------- - Start a process and join with this - process specify a timeout so that - osl_joinProcessWithTimeout returns - osl_Process_E_TimedOut - -------------------------------------*/ - - void test_osl_getVolumeInformation() - { - rtl::OUString path = rtl::OUString::createFromAscii(TEST_PATH_1); - rtl::OUString path_url; - osl_getFileURLFromSystemPath(path.pData, &path_url.pData); - test_getVolumeInformation(path_url); - - path = rtl::OUString::createFromAscii(TEST_PATH_2); - osl_getFileURLFromSystemPath(path.pData, &path_url.pData); - test_getVolumeInformation(path_url); - - path = rtl::OUString::createFromAscii(TEST_PATH_3); - osl_getFileURLFromSystemPath(path.pData, &path_url.pData); - test_getVolumeInformation(path_url); - - path = rtl::OUString::createFromAscii(TEST_PATH_4); - osl_getFileURLFromSystemPath(path.pData, &path_url.pData); - test_getVolumeInformation(path_url); - - path = rtl::OUString::createFromAscii(TEST_PATH_5); - osl_getFileURLFromSystemPath(path.pData, &path_url.pData); - test_getVolumeInformation(path_url); - - path = rtl::OUString::createFromAscii(TEST_PATH_6); - osl_getFileURLFromSystemPath(path.pData, &path_url.pData); - test_getVolumeInformation(path_url); - } - - CPPUNIT_TEST_SUITE( TestClass_osl_getVolumeInformation ); - CPPUNIT_TEST( test_osl_getVolumeInformation ); - CPPUNIT_TEST_SUITE_END( ); }; + +/*------------------------------------- + Start a process and join with this + process specify a timeout so that + osl_joinProcessWithTimeout returns + osl_Process_E_TimedOut + -------------------------------------*/ + +void test_osl_getVolumeInformation() +{ + rtl::OUString path = rtl::OUString::createFromAscii(TEST_PATH_1); + rtl::OUString path_url; + osl_getFileURLFromSystemPath(path.pData, &path_url.pData); + test_getVolumeInformation(path_url); + + path = rtl::OUString::createFromAscii(TEST_PATH_2); + osl_getFileURLFromSystemPath(path.pData, &path_url.pData); + test_getVolumeInformation(path_url); + + path = rtl::OUString::createFromAscii(TEST_PATH_3); + osl_getFileURLFromSystemPath(path.pData, &path_url.pData); + test_getVolumeInformation(path_url); + + path = rtl::OUString::createFromAscii(TEST_PATH_4); + osl_getFileURLFromSystemPath(path.pData, &path_url.pData); + test_getVolumeInformation(path_url); + + path = rtl::OUString::createFromAscii(TEST_PATH_5); + osl_getFileURLFromSystemPath(path.pData, &path_url.pData); + test_getVolumeInformation(path_url); + + path = rtl::OUString::createFromAscii(TEST_PATH_6); + osl_getFileURLFromSystemPath(path.pData, &path_url.pData); + test_getVolumeInformation(path_url); +} -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestClass_osl_getVolumeInformation, "Test osl_getVolumeInformation"); - -NOADDITIONAL; - +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} Modified: openoffice/trunk/main/sal/workben/t_osl_joinProcess.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/workben/t_osl_joinProcess.cxx?rev=1707099&r1=1707098&r2=1707099&view=diff ============================================================================== --- openoffice/trunk/main/sal/workben/t_osl_joinProcess.cxx (original) +++ openoffice/trunk/main/sal/workben/t_osl_joinProcess.cxx Tue Oct 6 17:45:40 2015 @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <cppunit/simpleheader.hxx> +#include "gtest/gtest.h" #include <osl/process.h> #include <rtl/ustring.hxx> #include <unistd.h> @@ -42,183 +42,142 @@ const rtl::OUString CWD = rtl::OU // //------------------------------ -class Test_osl_Process : public CppUnit::TestFixture +class Test_osl_Process : public ::testing::Test { public: +}; - /*------------------------------------- - Start a process and join with this - process specify a timeout so that - osl_joinProcessWithTimeout returns - osl_Process_E_TimedOut - -------------------------------------*/ - - void test_osl_joinProcessWithTimeout_timeout_failure() - { - oslProcess process; - oslProcessError osl_error = osl_executeProcess( - IMAGE_NAME.pData, - NULL, - 0, - osl_Process_NORMAL, - osl_getCurrentSecurity(), - CWD.pData, - NULL, - 0, - &process); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_createProcess failed", - osl_error == osl_Process_E_None - ); - - TimeValue timeout; - timeout.Seconds = 1; - timeout.Nanosec = 0; - - osl_error = osl_joinProcessWithTimeout(process, &timeout); +/*------------------------------------- + Start a process and join with this + process specify a timeout so that + osl_joinProcessWithTimeout returns + osl_Process_E_TimedOut + -------------------------------------*/ + +TEST_F(Test_osl_Process, test_osl_joinProcessWithTimeout_timeout_failure) +{ + oslProcess process; + oslProcessError osl_error = osl_executeProcess( + IMAGE_NAME.pData, + NULL, + 0, + osl_Process_NORMAL, + osl_getCurrentSecurity(), + CWD.pData, + NULL, + 0, + &process); - CPPUNIT_ASSERT_MESSAGE - ( - "osl_joinProcessWithTimeout returned without timeout failure", - osl_Process_E_TimedOut == osl_error - ); - - osl_error = osl_terminateProcess(process); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_terminateProcess failed", - osl_error == osl_Process_E_None - ); - - osl_freeProcessHandle(process); - } + ASSERT_TRUE(osl_error == osl_Process_E_None) << "osl_createProcess failed"; - /*------------------------------------- - Start a process and join with this - process specify a timeout so that - osl_joinProcessWithTimeout returns - osl_Process_E_None - -------------------------------------*/ - - void test_osl_joinProcessWithTimeout_without_timeout_failure() - { - oslProcess process; - oslProcessError osl_error = osl_executeProcess( - IMAGE_NAME.pData, - NULL, - 0, - osl_Process_NORMAL, - osl_getCurrentSecurity(), - CWD.pData, - NULL, - 0, - &process); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_createProcess failed", - osl_error == osl_Process_E_None - ); - - TimeValue timeout; - timeout.Seconds = 10; - timeout.Nanosec = 0; - - osl_error = osl_joinProcessWithTimeout(process, &timeout); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_joinProcessWithTimeout returned with failure", - osl_Process_E_None == osl_error - ); - - osl_freeProcessHandle(process); - } - - /*------------------------------------- - Start a process and join with this - process specify an infinite timeout - -------------------------------------*/ - - void test_osl_joinProcessWithTimeout_infinite() - { - oslProcess process; - oslProcessError osl_error = osl_executeProcess( - IMAGE_NAME.pData, - NULL, - 0, - osl_Process_NORMAL, - osl_getCurrentSecurity(), - CWD.pData, - NULL, - 0, - &process); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_createProcess failed", - osl_error == osl_Process_E_None - ); - - osl_error = osl_joinProcessWithTimeout(process, NULL); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_joinProcessWithTimeout returned with failure", - osl_Process_E_None == osl_error - ); - - osl_freeProcessHandle(process); - } - - /*------------------------------------- - Start a process and join with this - process using osl_joinProcess - -------------------------------------*/ - - void test_osl_joinProcess() - { - oslProcess process; - oslProcessError osl_error = osl_executeProcess( - IMAGE_NAME.pData, - NULL, - 0, - osl_Process_NORMAL, - osl_getCurrentSecurity(), - CWD.pData, - NULL, - 0, - &process); - - CPPUNIT_ASSERT_MESSAGE - ( - "osl_createProcess failed", - osl_error == osl_Process_E_None - ); - - osl_error = osl_joinProcess(process); + TimeValue timeout; + timeout.Seconds = 1; + timeout.Nanosec = 0; + + osl_error = osl_joinProcessWithTimeout(process, &timeout); + + ASSERT_TRUE(osl_Process_E_TimedOut == osl_error) << "osl_joinProcessWithTimeout returned without timeout failure"; + + osl_error = osl_terminateProcess(process); + + ASSERT_TRUE(osl_error == osl_Process_E_None) << "osl_terminateProcess failed"; + + osl_freeProcessHandle(process); +} + +/*------------------------------------- + Start a process and join with this + process specify a timeout so that + osl_joinProcessWithTimeout returns + osl_Process_E_None + -------------------------------------*/ + +TEST_F(Test_osl_Process, test_osl_joinProcessWithTimeout_without_timeout_failure) +{ + oslProcess process; + oslProcessError osl_error = osl_executeProcess( + IMAGE_NAME.pData, + NULL, + 0, + osl_Process_NORMAL, + osl_getCurrentSecurity(), + CWD.pData, + NULL, + 0, + &process); - CPPUNIT_ASSERT_MESSAGE - ( - "osl_joinProcess returned with failure", - osl_Process_E_None == osl_error - ); - - osl_freeProcessHandle(process); - } - - CPPUNIT_TEST_SUITE(Test_osl_Process); - CPPUNIT_TEST(test_osl_joinProcessWithTimeout_timeout_failure); - CPPUNIT_TEST(test_osl_joinProcessWithTimeout_without_timeout_failure); - CPPUNIT_TEST(test_osl_joinProcessWithTimeout_infinite); - CPPUNIT_TEST(test_osl_joinProcess); - CPPUNIT_TEST_SUITE_END(); -}; + ASSERT_TRUE(osl_error == osl_Process_E_None) << "osl_createProcess failed"; + + TimeValue timeout; + timeout.Seconds = 10; + timeout.Nanosec = 0; + + osl_error = osl_joinProcessWithTimeout(process, &timeout); + + ASSERT_TRUE(osl_Process_E_None == osl_error) << "osl_joinProcessWithTimeout returned with failure"; + + osl_freeProcessHandle(process); +} + +/*------------------------------------- + Start a process and join with this + process specify an infinite timeout + -------------------------------------*/ + +TEST_F(Test_osl_Process, test_osl_joinProcessWithTimeout_infinite) +{ + oslProcess process; + oslProcessError osl_error = osl_executeProcess( + IMAGE_NAME.pData, + NULL, + 0, + osl_Process_NORMAL, + osl_getCurrentSecurity(), + CWD.pData, + NULL, + 0, + &process); + + ASSERT_TRUE(osl_error == osl_Process_E_None) << "osl_createProcess failed"; + + osl_error = osl_joinProcessWithTimeout(process, NULL); + + ASSERT_TRUE(osl_Process_E_None == osl_error) << "osl_joinProcessWithTimeout returned with failure"; + + osl_freeProcessHandle(process); +} + + /*------------------------------------- + Start a process and join with this + process using osl_joinProcess + -------------------------------------*/ -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(Test_osl_Process, "Test_osl_Process"); +TEST_F(Test_osl_Process, test_osl_joinProcess) +{ + oslProcess process; + oslProcessError osl_error = osl_executeProcess( + IMAGE_NAME.pData, + NULL, + 0, + osl_Process_NORMAL, + osl_getCurrentSecurity(), + CWD.pData, + NULL, + 0, + &process); + + ASSERT_TRUE(osl_error == osl_Process_E_None) << "osl_createProcess failed"; + + osl_error = osl_joinProcess(process); + + ASSERT_TRUE(osl_Process_E_None == osl_error) << "osl_joinProcess returned with failure"; + + osl_freeProcessHandle(process); +} -NOADDITIONAL; +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +}