mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove visual noise from testtools

Browse Source 
Change-Id: Idbf31a46a9e174b96b3cac76be6a01a6ada0abde
Reviewed-on: https://gerrit.libreoffice.org/8325
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexander Wilms
2014-02-25 22:27:51 +01:00
committed by Caolán McNamara
parent a27462189d
commit a9311d6b1a
9 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
testtools/source/bridgetest/bridgetest.cxx
View File

@@ -100,7 +100,7 @@ bool checkEmpty(OUString const & string, char const * message) {
} }
//==================================================================================================
class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>, class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>,
public WeakImplHelper2< XMain, XServiceInfo > public WeakImplHelper2< XMain, XServiceInfo >
{ {
@@ -123,7 +123,7 @@ public:
virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception); virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception);
}; };
//==================================================================================================
static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 ) static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
{ {
check( rData1.Bool == rData2.Bool, "### bool does not match!" ); check( rData1.Bool == rData2.Bool, "### bool does not match!" );
@@ -158,7 +158,7 @@ static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
rData1.Interface == rData2.Interface && rData1.Interface == rData2.Interface &&
rData1.Any == rData2.Any); rData1.Any == rData2.Any);
} }
//==================================================================================================
static sal_Bool equals( const TestData & rData1, const TestData & rData2 ) static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
{ {
sal_Int32 nLen; sal_Int32 nLen;
@@ -182,7 +182,7 @@ static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
} }
return sal_False; return sal_False;
} }
//==================================================================================================
static void assign( TestElement & rData, static void assign( TestElement & rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort, sal_Int16 nShort, sal_uInt16 nUShort,
@@ -363,7 +363,7 @@ void MyClass::release() throw ()
OWeakObject::release(); OWeakObject::release();
} }
//==================================================================================================
static sal_Bool performTest( static sal_Bool performTest(
const Reference<XComponentContext> & xContext, const Reference<XComponentContext> & xContext,
const Reference<XBridgeTest > & xLBT, const Reference<XBridgeTest > & xLBT,
@@ -948,7 +948,7 @@ static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
return bReturn; return bReturn;
} }
//==================================================================================================
static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT ) static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
{ {
sal_Int32 nCount = 0; sal_Int32 nCount = 0;
@@ -1138,7 +1138,7 @@ inline bool makeSurrogate(
return rOut.is(); return rOut.is();
} }
//==================================================================================================
sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs ) sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
throw (RuntimeException, std::exception) throw (RuntimeException, std::exception)
{ {
@@ -1253,9 +1253,9 @@ Sequence< OUString > TestBridgeImpl::getSupportedServiceNames()
return bridge_test::getSupportedServiceNames(); return bridge_test::getSupportedServiceNames();
} }
// ...
//==================================================================================================
static Reference< XInterface > SAL_CALL TestBridgeImpl_create( static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
const Reference< XComponentContext > & xContext ) const Reference< XComponentContext > & xContext )
{ {
@@ -1267,7 +1267,7 @@ static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
extern "C" extern "C"
{ {
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * ) SAL_UNUSED_PARAMETER void * )

2
testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
View File

@@ -25,7 +25,7 @@ using unoidl.com.sun.star.lang;
using unoidl.com.sun.star.container; using unoidl.com.sun.star.container;
//==============================================================================
internal class Factory : internal class Factory :
WeakComponentBase, XSingleComponentFactory, XServiceInfo WeakComponentBase, XSingleComponentFactory, XServiceInfo
{ {

6
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
View File

@@ -356,7 +356,7 @@ static bool performQueryForUnknownType(XBridgeTest* xLBT)
return bRet; return bRet;
} }
// //==================================================================================================
static bool performTest(XBridgeTest* xLBT) static bool performTest(XBridgeTest* xLBT)
{ {
check( xLBT != 0, "### no test interface!" ); check( xLBT != 0, "### no test interface!" );
@@ -389,7 +389,7 @@ static bool performTest(XBridgeTest* xLBT)
aData->Sequence[1] = new TestElement(); //is empty aData->Sequence[1] = new TestElement(); //is empty
// aData complete // aData complete
//
// this is a manually copy of aData for first setting... // this is a manually copy of aData for first setting...
TestDataElements* aSetData = new TestDataElements; TestDataElements* aSetData = new TestDataElements;
Any aAnySet(__typeof(Object), xI); Any aAnySet(__typeof(Object), xI);
@@ -728,7 +728,7 @@ static bool raiseOnewayException(XBridgeTest* xLBT)
return bReturn; return bReturn;
} }
// //==================================================================================================
static bool raiseException(XBridgeTest* xLBT ) static bool raiseException(XBridgeTest* xLBT )
{ {
int nCount = 0; int nCount = 0;

6
testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
View File

@@ -339,7 +339,7 @@ static bool performQueryForUnknownType(XBridgeTest xLBT)
return bRet; return bRet;
} }
// //==================================================================================================
bool performTest(XBridgeTest xLBT) bool performTest(XBridgeTest xLBT)
{ {
check( xLBT != null, "### no test interface!" ); check( xLBT != null, "### no test interface!" );
@@ -373,7 +373,7 @@ bool performTest(XBridgeTest xLBT)
aData.Sequence[1] = new TestElement(); //is empty aData.Sequence[1] = new TestElement(); //is empty
// aData complete // aData complete
//
// this is a manually copy of aData for first setting... // this is a manually copy of aData for first setting...
TestDataElements aSetData = new TestDataElements(); TestDataElements aSetData = new TestDataElements();
Any aAnySet= new Any(typeof(Object), xI); Any aAnySet= new Any(typeof(Object), xI);
@@ -898,7 +898,7 @@ static bool raiseOnewayException(XBridgeTest xLBT)
return bReturn; return bReturn;
} }
// //==================================================================================================
static bool raiseException(XBridgeTest xLBT ) static bool raiseException(XBridgeTest xLBT )
{ {
int nCount = 0; int nCount = 0;

10
testtools/source/bridgetest/cppobj.cxx
View File

@@ -68,7 +68,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
return Sequence< OUString >( &aName, 1 ); return Sequence< OUString >( &aName, 1 );
} }
//==================================================================================================
static void assign( TestElement & rData, static void assign( TestElement & rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort, sal_Int16 nShort, sal_uInt16 nUShort,
@@ -95,7 +95,7 @@ static void assign( TestElement & rData,
rData.Interface = xTest; rData.Interface = xTest;
rData.Any = rAny; rData.Any = rAny;
} }
//==================================================================================================
static void assign( TestData & rData, static void assign( TestData & rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte, sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort, sal_Int16 nShort, sal_uInt16 nUShort,
@@ -113,7 +113,7 @@ static void assign( TestData & rData,
rData.Sequence = rSequence; rData.Sequence = rSequence;
} }
//==================================================================================================
class Test_Impl : class Test_Impl :
public osl::DebugBase<Test_Impl>, public osl::DebugBase<Test_Impl>,
public WeakImplHelper3< XBridgeTest2, XServiceInfo , XRecursiveCall > public WeakImplHelper3< XBridgeTest2, XServiceInfo , XRecursiveCall >
@@ -1164,9 +1164,9 @@ Sequence< OUString > Test_Impl::getSupportedServiceNames()
return bridge_object::getSupportedServiceNames(); return bridge_object::getSupportedServiceNames();
} }
// ...
//==================================================================================================
static Reference< XInterface > SAL_CALL Test_Impl_create( static Reference< XInterface > SAL_CALL Test_Impl_create(
SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & ) SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
{ {

12
testtools/source/cliversioning/version.cs
View File

@@ -251,7 +251,7 @@ class SpreadsheetDocHelper : System.IDisposable
private unoidl.com.sun.star.lang.XMultiServiceFactory mxMSFactory; private unoidl.com.sun.star.lang.XMultiServiceFactory mxMSFactory;
private unoidl.com.sun.star.sheet.XSpreadsheetDocument mxDocument; private unoidl.com.sun.star.sheet.XSpreadsheetDocument mxDocument;
// ________________________________________________________________
public SpreadsheetDocHelper() public SpreadsheetDocHelper()
{ {
@@ -316,7 +316,7 @@ class SpreadsheetDocHelper : System.IDisposable
return xSheet; return xSheet;
} }
// ________________________________________________________________
// Methods to fill values into cells. // Methods to fill values into cells.
/** Writes a double value into a spreadsheet. /** Writes a double value into a spreadsheet.
@@ -436,7 +436,7 @@ class SpreadsheetDocHelper : System.IDisposable
new uno.Any( (Single) unoidl.com.sun.star.awt.FontWeight.BOLD ) ); new uno.Any( (Single) unoidl.com.sun.star.awt.FontWeight.BOLD ) );
} }
// ________________________________________________________________
// Methods to create cell addresses and range addresses. // Methods to create cell addresses and range addresses.
/** Creates a unoidl.com.sun.star.table.CellAddress and initializes it /** Creates a unoidl.com.sun.star.table.CellAddress and initializes it
@@ -466,7 +466,7 @@ class SpreadsheetDocHelper : System.IDisposable
return xAddr.getRangeAddress(); return xAddr.getRangeAddress();
} }
// ________________________________________________________________
// Methods to convert cell addresses and range addresses to strings. // Methods to convert cell addresses and range addresses to strings.
/** Returns the text address of the cell. /** Returns the text address of the cell.
@@ -539,7 +539,7 @@ class SpreadsheetDocHelper : System.IDisposable
return aStr; return aStr;
} }
// ________________________________________________________________
/** Connect to a running office that is accepting connections. /** Connect to a running office that is accepting connections.
@return The ServiceManager to instantiate office components. */ @return The ServiceManager to instantiate office components. */
@@ -593,7 +593,7 @@ class SpreadsheetDocHelper : System.IDisposable
} }
} }
// ________________________________________________________________
} }
} }

8
testtools/source/performance/pseudo.cxx
View File

@@ -30,7 +30,7 @@
namespace pseudo_uno namespace pseudo_uno
{ {
//==================================================================================================
struct pseudo_Mapping : public uno_Mapping struct pseudo_Mapping : public uno_Mapping
{ {
oslInterlockedCount nRef; oslInterlockedCount nRef;
@@ -215,7 +215,7 @@ pseudo_Mapping::pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment
{ {
(*((uno_Environment *)pFrom)->acquire)( (uno_Environment *)pFrom ); (*((uno_Environment *)pFrom)->acquire)( (uno_Environment *)pFrom );
(*((uno_Environment *)pTo)->acquire)( (uno_Environment *)pTo ); (*((uno_Environment *)pTo)->acquire)( (uno_Environment *)pTo );
//
uno_Mapping::acquire = pseudo_Mapping_acquire; uno_Mapping::acquire = pseudo_Mapping_acquire;
uno_Mapping::release = pseudo_Mapping_release; uno_Mapping::release = pseudo_Mapping_release;
uno_Mapping::mapInterface = pseudo_Mapping_mapInterface; uno_Mapping::mapInterface = pseudo_Mapping_mapInterface;
@@ -229,12 +229,12 @@ pseudo_Mapping::~pseudo_Mapping()
} }
//##################################################################################################
extern "C" void SAL_CALL uno_initEnvironment( uno_Environment * pUnoEnv ) extern "C" void SAL_CALL uno_initEnvironment( uno_Environment * pUnoEnv )
{ {
OSL_FAIL( "### no impl: unexpected call!" ); OSL_FAIL( "### no impl: unexpected call!" );
} }
//##################################################################################################
extern "C" void SAL_CALL uno_ext_getMapping( extern "C" void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo ) uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
{ {

16
testtools/source/performance/ubobject.cxx
View File

@@ -51,7 +51,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
return Sequence< OUString >( &aName, 1 ); return Sequence< OUString >( &aName, 1 );
} }
//==================================================================================================
class ServiceImpl class ServiceImpl
: public XServiceInfo : public XServiceInfo
, public XPerformanceTest , public XPerformanceTest
@@ -198,7 +198,7 @@ public:
{ throw _aDummyRE; } { throw _aDummyRE; }
}; };
//##################################################################################################
// XServiceInfo // XServiceInfo
@@ -220,9 +220,9 @@ Sequence< OUString > ServiceImpl::getSupportedServiceNames()
return benchmark_object::getSupportedServiceNames(); return benchmark_object::getSupportedServiceNames();
} }
// ...
//==================================================================================================
static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMultiServiceFactory > & xSMgr ) static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMultiServiceFactory > & xSMgr )
{ {
return Reference< XInterface >( (XPerformanceTest *)new ServiceImpl( xSMgr ) ); return Reference< XInterface >( (XPerformanceTest *)new ServiceImpl( xSMgr ) );
@@ -231,9 +231,9 @@ static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMu
} }
//##################################################################################################
//##################################################################################################
//##################################################################################################
extern "C" extern "C"
@@ -259,7 +259,7 @@ sal_Bool SAL_CALL component_writeInfo(
} }
return sal_False; return sal_False;
} }
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {

26
testtools/source/performance/ubtest.cxx
View File

@@ -154,7 +154,7 @@ static inline void out( sal_Int64 nVal, FILE * stream = stderr,
out( ar, stream, nStart, cFillchar ); out( ar, stream, nStart, cFillchar );
} }
//==================================================================================================
Reference< XSingleServiceFactory > loadLibComponentFactory( Reference< XSingleServiceFactory > loadLibComponentFactory(
const OUString & rLibName, const OUString & rImplName, const OUString & rLibName, const OUString & rImplName,
const Reference< XMultiServiceFactory > & xSF, const Reference< XRegistryKey > & xKey ) const Reference< XMultiServiceFactory > & xSF, const Reference< XRegistryKey > & xKey )
@@ -399,7 +399,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
return Sequence< OUString >( &aName, 1 ); return Sequence< OUString >( &aName, 1 );
} }
//==================================================================================================
class TestImpl : public WeakImplHelper2< XServiceInfo, XMain > class TestImpl : public WeakImplHelper2< XServiceInfo, XMain >
{ {
Reference< XMultiServiceFactory > _xSMgr; Reference< XMultiServiceFactory > _xSMgr;
@@ -421,7 +421,7 @@ public:
virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException); virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException);
}; };
//##################################################################################################
TestImpl::TestImpl( const Reference< XMultiServiceFactory > & xSMgr ) TestImpl::TestImpl( const Reference< XMultiServiceFactory > & xSMgr )
@@ -433,7 +433,7 @@ TestImpl::~TestImpl()
{ {
} }
//==================================================================================================
static Reference< XInterface > SAL_CALL TestImpl_create( const Reference< XMultiServiceFactory > & xSMgr ) static Reference< XInterface > SAL_CALL TestImpl_create( const Reference< XMultiServiceFactory > & xSMgr )
{ {
return Reference< XInterface >( *new TestImpl( xSMgr ) ); return Reference< XInterface >( *new TestImpl( xSMgr ) );
@@ -502,7 +502,7 @@ Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl )
return xResolvedObject; return xResolvedObject;
} }
//==================================================================================================
class TimeEntry class TimeEntry
{ {
sal_Int64 nLoop; sal_Int64 nLoop;
@@ -535,10 +535,10 @@ double TimeEntry::ratio( const TimeEntry & rEntry ) const
} }
} }
//==================================================================================================
typedef std::map< std::string, TimeEntry > t_TimeEntryMap; typedef std::map< std::string, TimeEntry > t_TimeEntryMap;
//==================================================================================================
struct TimingSheet struct TimingSheet
{ {
t_TimeEntryMap _entries; t_TimeEntryMap _entries;
@@ -550,7 +550,7 @@ void TimingSheet::insert( const sal_Char * pText, sal_Int64 nLoop, sal_uInt32 nT
_entries[ pText ] = TimeEntry( nLoop, nTicks ); _entries[ pText ] = TimeEntry( nLoop, nTicks );
} }
//==================================================================================================
typedef boost::unordered_map< std::string, TimingSheet > t_TimingSheetMap; typedef boost::unordered_map< std::string, TimingSheet > t_TimingSheetMap;
@@ -1258,14 +1258,14 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
} }
//##################################################################################################
//##################################################################################################
//##################################################################################################
extern "C" extern "C"
{ {
//==================================================================================================
sal_Bool SAL_CALL component_writeInfo( sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey ) void * pServiceManager, void * pRegistryKey )
{ {
@@ -1287,7 +1287,7 @@ sal_Bool SAL_CALL component_writeInfo(
} }
return sal_False; return sal_False;
} }
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{ {