Skip to content

C
core
Kaydet (Commit) 43c6cd54 authored tarafından Jens-Heiner Rechtien's avatar Jens-Heiner Rechtien
Dosyalara gözat
Seçenekler

MWS_SRX644: migrate branch mws_srx644 -> HEAD

üst cfcbacfd
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 42 deletions
testtools/prj/build.lst
Dosyayı görüntüle @ 43c6cd54
tt testtools : stoc remotebridges io NULL
tt testtools : stoc remotebridges io cpputools NULL
tt testtools usr1 - all tt_mkout NULL
tt testtools\source\bridgetest nmake - all tt_bridgetest NULL
tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs NULL
testtools/source/bridgetest/bridgetest.cxx
Dosyayı görüntüle @ 43c6cd54
/**************************************************************************
#*
#* last change $Author: dbo $ $Date: 2002-11-27 10:06:09 $
#* $Revision: 1.5 $
#* last change $Author: hr $ $Date: 2003-03-27 16:49:17 $
#* $Revision: 1.6 $
#*
#* $Logfile: $
#*
......@@ -467,7 +467,12 @@ static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
}
catch( RuntimeException & e )
{
bReturn = ( e.Message == sCompare && xLBT->getInterface() == e.Context );
bReturn = (
#if ! defined _DEBUG
// java stack traces trash Message
e.Message == sCompare &&
#endif
xLBT->getInterface() == e.Context );
}
return bReturn;
}
......@@ -490,8 +495,11 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
catch (IllegalArgumentException aExc)
{
if (aExc.ArgumentPosition == 5 &&
aExc.Context == xLBT->getInterface() &&
aExc.Message.compareToAscii( STRING_TEST_CONSTANT ) == 0)
#if ! defined _DEBUG
// java stack traces trash Message
aExc.Message.compareToAscii( STRING_TEST_CONSTANT ) == 0 &&
#endif
aExc.Context == xLBT->getInterface())
{
++nCount;
}
......@@ -506,8 +514,12 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
}
catch (const RuntimeException & rExc)
{
if (rExc.Context == xLBT->getInterface() &&
rExc.Message.compareToAscii( STRING_TEST_CONSTANT ) == 0)
if (rExc.Context == xLBT->getInterface()
#if ! defined _DEBUG
// java stack traces trash Message
&& rExc.Message.compareToAscii( STRING_TEST_CONSTANT ) == 0
#endif
)
{
++nCount;
}
......@@ -522,8 +534,12 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
}
catch (Exception & rExc)
{
if (rExc.Context == xLBT->getInterface() &&
rExc.Message.compareToAscii( STRING_TEST_CONSTANT ) == 0)
if (rExc.Context == xLBT->getInterface()
#if ! defined _DEBUG
// java stack traces trash Message
&& rExc.Message.compareToAscii( STRING_TEST_CONSTANT ) == 0
#endif
)
{
++nCount;
}
......@@ -738,29 +754,3 @@ void * SAL_CALL component_getFactory(
return pRet;
}
}
/**************************************************************************
$Log: not supported by cvs2svn $
Revision 1.4 2002/10/29 10:48:02 dbo
#104312# minor fixes
Revision 1.3 2002/09/17 15:08:40 jbu
#98508# added bridgetest_javaserver batch, tests work now also in .pro builds
Revision 1.2 2001/07/04 08:41:23 jbu
#88717# queryInterface for an unknown type is now tested (feature was introduced in UDK302b/UDK300o
Revision 1.1 2001/05/04 07:05:17 kr
moved from grande to openoffice
Revision 1.3 2001/03/12 16:22:44 jl
OSL_ENSHURE replaced by OSL_ENSURE
Revision 1.2 2000/08/14 07:12:50 jbu
added remote tests
Revision 1.1 2000/05/26 14:20:26 dbo
new
**************************************************************************/
testtools/source/bridgetest/makefile.mk
Dosyayı görüntüle @ 43c6cd54
......@@ -172,9 +172,10 @@ $(DESTDIR)$/uno_services.rdb .SETDIR=$(DESTDIR) : $(WINTARGETS)
-c $(MY_DLLPREFIX)jen$(MY_DLLPOSTFIX)
# currently no chance to construct absolute file url for testComponent.jar
# regcomp -register -r uno_services.rdb -br $(SOLARBINDIR)$/udkapi.rdb \
# regmerge regcomp.rdb / $(SOLARBINDIR)$/udkapi.rdb uno_services.rdb
# regcomp -register -r uno_services.rdb -br regcomp.rdb \
# -classpath $(MY_CLASSPATH) \
# -c file:///d:/udk304/testtools/wntmsci7/class/testComponent.jar
# -c file:///c:/source/testtools/wntmsci9/class/testComponent.jar
.ENDIF
......
testtools/source/performance/ubtest.cxx
Dosyayı görüntüle @ 43c6cd54
/**************************************************************************
#*
#* last change $Author: dbo $ $Date: 2001-06-29 14:01:57 $
#* $Revision: 1.2 $
#* last change $Author: hr $ $Date: 2003-03-27 16:49:18 $
#* $Revision: 1.3 $
#*
#* $Logfile: $
#*
......@@ -134,7 +134,7 @@ static inline void out( double fVal, FILE * stream = stderr,
sal_Int32 nStart = -1, sal_Char cFillchar = ' ' )
{
sal_Char ar[128];
::sprintf( ar, (fVal < 0.000001 ? "%g" : "%f"), fVal );
::snprintf( ar, sizeof(ar), (fVal < 0.000001 ? "%g" : "%f"), fVal );
out( ar, stream, nStart, cFillchar );
}
//--------------------------------------------------------------------------------------------------
......@@ -142,7 +142,7 @@ static inline void out( sal_Int64 nVal, FILE * stream = stderr,
sal_Int32 nStart = -1, sal_Char cFillchar = ' ' )
{
sal_Char ar[128];
::sprintf( ar, "%ld", nVal );
::snprintf( ar, sizeof(ar), "%ld", nVal );
out( ar, stream, nStart, cFillchar );
}
......@@ -1322,6 +1322,16 @@ void * SAL_CALL component_getFactory(
/**************************************************************************
$Log: not supported by cvs2svn $
Revision 1.2.20.1 2003/02/18 12:28:35 vg
INTEGRATION: CWS kso6 (1.2.30); FILE MERGED
2003/02/10 16:01:14 kso 1.2.30.1: #105906# - Checked/removed sprintf, strcpy, strcat
Revision 1.2.30.1 2003/02/10 16:01:14 kso
#105906# - Checked/removed sprintf, strcpy, strcat
Revision 1.2 2001/06/29 14:01:57 dbo
osl_executeProcess has changed
Revision 1.1 2001/05/04 07:05:18 kr
moved from grande to openoffice
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment