Modified: openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h?rev=1701419&r1=1701418&r2=1701419&view=diff ============================================================================== --- openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h (original) +++ openoffice/trunk/main/sal/qa/osl/file/osl_File_Const.h Sat Sep 5 19:30:51 2015 @@ -95,7 +95,9 @@ const sal_Char pBuffer_Blank[] = ""; # 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> # define TEST_PLATFORM ""
Modified: openoffice/trunk/main/sal/qa/osl/file/osl_old_test_file.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/file/osl_old_test_file.cxx?rev=1701419&r1=1701418&r2=1701419&view=diff ============================================================================== --- openoffice/trunk/main/sal/qa/osl/file/osl_old_test_file.cxx (original) +++ openoffice/trunk/main/sal/qa/osl/file/osl_old_test_file.cxx Sat Sep 5 19:30:51 2015 @@ -44,27 +44,16 @@ #define TEST_VOLUME "c:/" #endif -#include <testshl/simpleheader.hxx> +#include "gtest/gtest.h" namespace osl_test_file { // ----------------------------------------------------------------------------- -class oldtestfile : public CppUnit::TestFixture +class oldtestfile : public ::testing::Test { public: - void test_file_001(); - void test_file_002(); - void test_file_003(); - void test_file_004(); - - CPPUNIT_TEST_SUITE( oldtestfile ); - CPPUNIT_TEST( test_file_001 ); - CPPUNIT_TEST( test_file_002 ); - CPPUNIT_TEST( test_file_003 ); - CPPUNIT_TEST( test_file_004 ); - CPPUNIT_TEST_SUITE_END( ); }; char *aSource1[] = @@ -103,7 +92,7 @@ char *aSource3[ ] = using namespace rtl; -void oldtestfile::test_file_001() +TEST_F(oldtestfile, test_file_001) { #ifdef WIN32 return; @@ -116,10 +105,10 @@ void oldtestfile::test_file_001() OUString target; OUString rel = OUString::createFromAscii( aSource1[i] ); oslFileError e = osl_getAbsoluteFileURL( base1.pData, rel.pData , &target.pData ); - CPPUNIT_ASSERT_MESSAGE("failure #1", osl_File_E_None == e ); + ASSERT_TRUE( osl_File_E_None == e ) << "failure #1"; if( osl_File_E_None == e ) { - CPPUNIT_ASSERT_MESSAGE("failure #1.1", target.equalsAscii( aSource1[i+1] ) ); + ASSERT_TRUE( target.equalsAscii( aSource1[i+1] ) ) << "failure #1.1"; } OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); OString obase = OUStringToOString( base1 , RTL_TEXTENCODING_ASCII_US ); @@ -128,11 +117,11 @@ void oldtestfile::test_file_001() OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) ); OUString target; - CPPUNIT_ASSERT_MESSAGE("failure #11", osl_File_E_None != osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) ); + ASSERT_TRUE( osl_File_E_None != osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) ) << "failure #11"; } -void oldtestfile::test_file_002() +TEST_F(oldtestfile, test_file_002) { #ifdef WIN32 return; @@ -145,10 +134,10 @@ void oldtestfile::test_file_002() OUString target; OUString rel = OUString::createFromAscii( aSource2[i] ); oslFileError e = osl_getAbsoluteFileURL( base2.pData, rel.pData , &target.pData ); - CPPUNIT_ASSERT_MESSAGE("failure #2", osl_File_E_None == e ); + ASSERT_TRUE(osl_File_E_None == e) << "failure #2"; if( osl_File_E_None == e ) { - CPPUNIT_ASSERT_MESSAGE("failure #2.1", target.equalsAscii( aSource2[i+1] ) ); + ASSERT_TRUE(target.equalsAscii( aSource2[i+1] )) << "failure #2.1"; } OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); OString obase = OUStringToOString( base2 , RTL_TEXTENCODING_ASCII_US ); @@ -156,7 +145,7 @@ void oldtestfile::test_file_002() } } -void oldtestfile::test_file_003() +TEST_F(oldtestfile, test_file_003) { #ifdef WIN32 return; @@ -189,17 +178,17 @@ void oldtestfile::test_file_003() OUString target; OUString rel = OUString::createFromAscii( aSource3[i] ); oslFileError e = osl_getAbsoluteFileURL( base3.pData, rel.pData , &target.pData ); - CPPUNIT_ASSERT_MESSAGE("failure #3", osl_File_E_None == e ); + ASSERT_TRUE(osl_File_E_None == e) << "failure #3"; if( osl_File_E_None == e ) { - CPPUNIT_ASSERT_MESSAGE("failure #4", target.getLength() >= dir.getLength() ); + ASSERT_TRUE(target.getLength() >= dir.getLength()) << "failure #4"; if( target.getLength() >= dir.getLength() ) { int j; for( j = dir.getLength() ; j < target.getLength() && aSource3[i+1][j-dir.getLength()] == target[j] ; j++ ); - CPPUNIT_ASSERT_MESSAGE("failure #5", j == target.getLength() ); + ASSERT_TRUE(j == target.getLength()) << "failure #5"; } } OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); @@ -210,29 +199,29 @@ void oldtestfile::test_file_003() } else { - CPPUNIT_ASSERT_MESSAGE("failure #6", 0 ); + ASSERT_TRUE(0) << "failure #6"; } rmdir( "a/b" ); } else { - CPPUNIT_ASSERT_MESSAGE("failure #7", 0 ); + ASSERT_TRUE(0) << "failure #7"; } rmdir( "a" ); } else { - CPPUNIT_ASSERT_MESSAGE("failure #8", 0 ); + ASSERT_TRUE(0) << "failure #8"; } } else { - CPPUNIT_ASSERT_MESSAGE("failure #9", 0 ); + ASSERT_TRUE(0) << "failure #9"; } #endif } -void oldtestfile::test_file_004() +TEST_F(oldtestfile, test_file_004) { #ifdef WIN32 return; @@ -245,10 +234,10 @@ void oldtestfile::test_file_004() OUString target; OUString rel = OUString::createFromAscii( aSource1[i] ); oslFileError e = osl_getAbsoluteFileURL( base4.pData, rel.pData , &target.pData ); - CPPUNIT_ASSERT_MESSAGE("failure #10", osl_File_E_None == e ); + ASSERT_TRUE(osl_File_E_None == e) << "failure #10"; if( osl_File_E_None == e ) { - CPPUNIT_ASSERT_MESSAGE("failure #10.1", target.equalsAscii( aSource1[i+1] ) ); + ASSERT_TRUE(target.equalsAscii( aSource1[i+1] )) << "failure #10.1"; } OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US ); OString obase = OUStringToOString( base4 , RTL_TEXTENCODING_ASCII_US ); @@ -262,8 +251,10 @@ void oldtestfile::test_file_004() } // namespace osl_test_file // ----------------------------------------------------------------------------- -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( osl_test_file::oldtestfile, "osl_File" ); -// ----------------------------------------------------------------------------- -NOADDITIONAL; +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} Modified: openoffice/trunk/main/sal/qa/osl/file/test_cpy_wrt_file.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/osl/file/test_cpy_wrt_file.cxx?rev=1701419&r1=1701418&r2=1701419&view=diff ============================================================================== --- openoffice/trunk/main/sal/qa/osl/file/test_cpy_wrt_file.cxx (original) +++ openoffice/trunk/main/sal/qa/osl/file/test_cpy_wrt_file.cxx Sat Sep 5 19:30:51 2015 @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sal.hxx" -#include <testshl/simpleheader.hxx> +#include "gtest/gtest.h" #include <osl/file.hxx> #include <osl/thread.h> #include <rtl/ustring.hxx> @@ -41,26 +41,23 @@ using namespace rtl; # define COPY_DEST_PATH "x:\\tra\\msvcr70.dll" #endif -class test_osl_copyFile : public CppUnit::TestFixture +class test_osl_copyFile : public ::testing::Test { public: - void cp_file() - { - rtl::OUString src_url; - FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_SOURCE_PATH), src_url); - - rtl::OUString dest_url; - FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_DEST_PATH), dest_url); - - FileBase::RC err = File::copy(src_url, dest_url); - CPPUNIT_ASSERT_MESSAGE("Copy didn't recognized disk full", err != FileBase::E_None); - } - - CPPUNIT_TEST_SUITE(test_osl_copyFile); - CPPUNIT_TEST(cp_file); - CPPUNIT_TEST_SUITE_END(); }; +TEST_F(test_osl_copyFile, cp_file) +{ + rtl::OUString src_url; + FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_SOURCE_PATH), src_url); + + rtl::OUString dest_url; + FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(COPY_DEST_PATH), dest_url); + + FileBase::RC err = File::copy(src_url, dest_url); + ASSERT_TRUE(err != FileBase::E_None) << "Copy didn't recognized disk full"; +} + //######################################## #ifdef UNX # define WRITE_DEST_PATH "/mnt/mercury08/muell.tmp" @@ -68,40 +65,35 @@ public: # define WRITE_DEST_PATH "d:\\tmp_data.tmp" #endif -class test_osl_writeFile : public CppUnit::TestFixture +class test_osl_writeFile : public ::testing::Test { public: - void wrt_file() - { - rtl::OUString dest_url; - FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(WRITE_DEST_PATH), dest_url); - - File tmp_file(dest_url); - rtl::OUString suErrorMsg = rtl::OUString::createFromAscii("File creation failed: ")+ dest_url; - FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); +}; - CPPUNIT_ASSERT_MESSAGE( suErrorMsg, err == FileBase::E_None || err == FileBase::E_EXIST ); +TEST_F(test_osl_writeFile, wrt_file) +{ + rtl::OUString dest_url; + FileBase::getFileURLFromSystemPath(rtl::OUString::createFromAscii(WRITE_DEST_PATH), dest_url); - char buffer[50000]; - sal_uInt64 written = 0; - err = tmp_file.write((void*)buffer, sizeof(buffer), written); + File tmp_file(dest_url); + rtl::OUString suErrorMsg = rtl::OUString::createFromAscii("File creation failed: ")+ dest_url; + FileBase::RC err = tmp_file.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create); - err = tmp_file.sync(); + ASSERT_TRUE(err == FileBase::E_None || err == FileBase::E_EXIST) << suErrorMsg.pData; - CPPUNIT_ASSERT_MESSAGE("Write didn't recognized disk full", err != FileBase::E_None); + char buffer[50000]; + sal_uInt64 written = 0; + err = tmp_file.write((void*)buffer, sizeof(buffer), written); - tmp_file.close(); - } + err = tmp_file.sync(); - CPPUNIT_TEST_SUITE(test_osl_writeFile); - CPPUNIT_TEST(wrt_file); - CPPUNIT_TEST_SUITE_END(); -}; + ASSERT_TRUE(err != FileBase::E_None) << "Write didn't recognized disk full"; -//##################################### -// register test suites -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_osl_writeFile, "test_osl_writeFile"); -CPPUNIT_TEST_SUITE_NAMED_REGISTRATION(test_osl_copyFile, "test_osl_copyFile"); - -NOADDITIONAL; + tmp_file.close(); +} +int main(int argc, char **argv) +{ + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +}
