Author: damjan Date: Tue Oct 6 17:47:36 2015 New Revision: 1707101 URL: http://svn.apache.org/viewvc?rev=1707101&view=rev Log: #i125003# eliminate cppunittester, include files, and all cppunit usage in ported tests from from main/sal.
Removed: openoffice/trunk/main/sal/cppunittester/ openoffice/trunk/main/sal/inc/cppunittester/ openoffice/trunk/main/sal/inc/sal/cppunit.h openoffice/trunk/main/sal/qa/rtl/random/makefile.add Modified: openoffice/trunk/main/sal/prj/build.lst openoffice/trunk/main/sal/prj/d.lst openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx Modified: openoffice/trunk/main/sal/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/build.lst?rev=1707101&r1=1707100&r2=1707101&view=diff ============================================================================== --- openoffice/trunk/main/sal/prj/build.lst (original) +++ openoffice/trunk/main/sal/prj/build.lst Tue Oct 6 17:47:36 2015 @@ -18,11 +18,10 @@ sa sal\qa\sal nmake - all sa_qa_sal sa_u sa sal\qa\osl\condition nmake - all sa_qa_osl_condition sa_util sa_cpprt.u NULL sa sal\qa\osl\pipe nmake - all sa_qa_osl_pipe sa_util sa_cpprt.u NULL -sa sal\cppunittester nmake - all sa_cppunittester sa_cpprt.u sa_util NULL -sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_cppunittester sa_util NULL -sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_cppunittester sa_util NULL -sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_cppunittester sa_util NULL -sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_cppunittester sa_util NULL -sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_cppunittester sa_util NULL -sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_cppunittester sa_util NULL -sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_cppunittester sa_util NULL +sa sal\qa\ByteSequence nmake - all sa_qa_ByteSequence sa_util NULL +sa sal\qa\OStringBuffer nmake - all sa_qa_OStringBuffer sa_util NULL +sa sal\qa\osl\mutex nmake - all sa_qa_osl_mutex sa_util NULL +sa sal\qa\osl\profile nmake - all sa_qa_osl_profile sa_util NULL +sa sal\qa\osl\setthreadname nmake - all sa_qa_osl_setthreadname sa_util NULL +sa sal\qa\osl\thread nmake - all sa_qa_osl_thread sa_util NULL +sa sal\qa\rtl\math nmake - all sa_qa_rtl_math sa_util NULL Modified: openoffice/trunk/main/sal/prj/d.lst URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/prj/d.lst?rev=1707101&r1=1707100&r2=1707101&view=diff ============================================================================== --- openoffice/trunk/main/sal/prj/d.lst (original) +++ openoffice/trunk/main/sal/prj/d.lst Tue Oct 6 17:47:36 2015 @@ -1,11 +1,9 @@ -mkdir: %_DEST%\inc%_EXT%\cppunittester mkdir: %_DEST%\inc%_EXT%\sal mkdir: %_DEST%\inc%_EXT%\osl mkdir: %_DEST%\inc%_EXT%\rtl mkdir: %_DEST%\inc%_EXT%\systools mkdir: %_DEST%\inc%_EXT%\systools\win32 -..\inc\cppunittester\protectorfactory.hxx %_DEST%\inc%_EXT%\protectorfactory.hxx ..\%__SRC%\inc\rtlbootstrap.mk %_DEST%\inc%_EXT%\rtlbootstrap.mk ..\inc\sal\*.h %_DEST%\inc%_EXT%\sal\*.h ..\%__SRC%\inc\sal\typesizes.h %_DEST%\inc%_EXT%\sal\typesizes.h @@ -35,6 +33,3 @@ symlink: %_DEST%\lib%_EXT%\libuno_sal.dy ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\inc\udkversion.h %_DEST%\inc%_EXT%\sal\udkversion.h - -..\%__SRC%\bin\cppunittester %_DEST%\bin%_EXT%\cppunittester -..\%__SRC%\bin\cppunittester.exe %_DEST%\bin%_EXT%\cppunittester.exe Modified: openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx?rev=1707101&r1=1707100&r2=1707101&view=diff ============================================================================== --- openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx (original) +++ openoffice/trunk/main/sal/qa/rtl/logfile/rtl_logfile.cxx Tue Oct 6 17:47:36 2015 @@ -160,7 +160,7 @@ namespace rtl_logfile nError1 = osl::File::remove( suFilePath ); printError( nError1 ); - CPPUNIT_ASSERT_MESSAGE( "In deleteTestFile Function: remove ", ( ::osl::FileBase::E_None == nError1 ) || ( nError1 == ::osl::FileBase::E_NOENT ) ); + ASSERT_TRUE( ( ::osl::FileBase::E_None == nError1 ) || ( nError1 == ::osl::FileBase::E_NOENT ) ) << "In deleteTestFile Function: remove "; */ }