[Libreoffice-commits] core.git: testtools/source
Alexander Wilms
f.alexander.wilms at gmail.com
Thu Feb 27 07:45:04 PST 2014
testtools/source/bridgetest/bridgetest.cxx | 20 ++++-----
testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs | 2
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 6 +-
testtools/source/bridgetest/cli/cli_cs_bridgetest.cs | 6 +-
testtools/source/bridgetest/cppobj.cxx | 10 ++--
testtools/source/cliversioning/version.cs | 12 ++---
testtools/source/performance/pseudo.cxx | 8 +--
testtools/source/performance/ubobject.cxx | 16 +++----
testtools/source/performance/ubtest.cxx | 26 ++++++------
9 files changed, 53 insertions(+), 53 deletions(-)
New commits:
commit a9311d6b1a8528d009bc25a4f1c80c7d9db58e49
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 22:27:51 2014 +0100
Remove visual noise from testtools
Change-Id: Idbf31a46a9e174b96b3cac76be6a01a6ada0abde
Reviewed-on: https://gerrit.libreoffice.org/8325
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 3bc84e2..c647b1c 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -100,7 +100,7 @@ bool checkEmpty(OUString const & string, char const * message) {
}
-//==================================================================================================
+
class TestBridgeImpl : public osl::DebugBase<TestBridgeImpl>,
public WeakImplHelper2< XMain, XServiceInfo >
{
@@ -123,7 +123,7 @@ public:
virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException, std::exception);
};
-//==================================================================================================
+
static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
{
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.Any == rData2.Any);
}
-//==================================================================================================
+
static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
{
sal_Int32 nLen;
@@ -182,7 +182,7 @@ static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
}
return sal_False;
}
-//==================================================================================================
+
static void assign( TestElement & rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
@@ -363,7 +363,7 @@ void MyClass::release() throw ()
OWeakObject::release();
}
-//==================================================================================================
+
static sal_Bool performTest(
const Reference<XComponentContext> & xContext,
const Reference<XBridgeTest > & xLBT,
@@ -948,7 +948,7 @@ static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
return bReturn;
}
-//==================================================================================================
+
static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
{
sal_Int32 nCount = 0;
@@ -1138,7 +1138,7 @@ inline bool makeSurrogate(
return rOut.is();
}
-//==================================================================================================
+
sal_Int32 TestBridgeImpl::run( const Sequence< OUString > & rArgs )
throw (RuntimeException, std::exception)
{
@@ -1253,9 +1253,9 @@ Sequence< OUString > TestBridgeImpl::getSupportedServiceNames()
return bridge_test::getSupportedServiceNames();
}
-// ...
-//==================================================================================================
+
+
static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
const Reference< XComponentContext > & xContext )
{
@@ -1267,7 +1267,7 @@ static Reference< XInterface > SAL_CALL TestBridgeImpl_create(
extern "C"
{
-//==================================================================================================
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager,
SAL_UNUSED_PARAMETER void * )
diff --git a/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs b/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
index c90b75c..1cb4f31 100644
--- a/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
+++ b/testtools/source/bridgetest/cli/cli_bridgetest_inprocess.cs
@@ -25,7 +25,7 @@ using unoidl.com.sun.star.lang;
using unoidl.com.sun.star.container;
-//==============================================================================
+
internal class Factory :
WeakComponentBase, XSingleComponentFactory, XServiceInfo
{
diff --git a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
index c2e7bda..793436f 100644
--- a/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
+++ b/testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx
@@ -356,7 +356,7 @@ static bool performQueryForUnknownType(XBridgeTest* xLBT)
return bRet;
}
-// //==================================================================================================
+
static bool performTest(XBridgeTest* xLBT)
{
check( xLBT != 0, "### no test interface!" );
@@ -389,7 +389,7 @@ static bool performTest(XBridgeTest* xLBT)
aData->Sequence[1] = new TestElement(); //is empty
// aData complete
- //
+
// this is a manually copy of aData for first setting...
TestDataElements* aSetData = new TestDataElements;
Any aAnySet(__typeof(Object), xI);
@@ -728,7 +728,7 @@ static bool raiseOnewayException(XBridgeTest* xLBT)
return bReturn;
}
-// //==================================================================================================
+
static bool raiseException(XBridgeTest* xLBT )
{
int nCount = 0;
diff --git a/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs b/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
index 341a77d..ed4f483 100644
--- a/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
+++ b/testtools/source/bridgetest/cli/cli_cs_bridgetest.cs
@@ -339,7 +339,7 @@ static bool performQueryForUnknownType(XBridgeTest xLBT)
return bRet;
}
-// //==================================================================================================
+
bool performTest(XBridgeTest xLBT)
{
check( xLBT != null, "### no test interface!" );
@@ -373,7 +373,7 @@ bool performTest(XBridgeTest xLBT)
aData.Sequence[1] = new TestElement(); //is empty
// aData complete
- //
+
// this is a manually copy of aData for first setting...
TestDataElements aSetData = new TestDataElements();
Any aAnySet= new Any(typeof(Object), xI);
@@ -898,7 +898,7 @@ static bool raiseOnewayException(XBridgeTest xLBT)
return bReturn;
}
-// //==================================================================================================
+
static bool raiseException(XBridgeTest xLBT )
{
int nCount = 0;
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 72d0bb6..50c3992 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -68,7 +68,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
return Sequence< OUString >( &aName, 1 );
}
-//==================================================================================================
+
static void assign( TestElement & rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
@@ -95,7 +95,7 @@ static void assign( TestElement & rData,
rData.Interface = xTest;
rData.Any = rAny;
}
-//==================================================================================================
+
static void assign( TestData & rData,
sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
@@ -113,7 +113,7 @@ static void assign( TestData & rData,
rData.Sequence = rSequence;
}
-//==================================================================================================
+
class Test_Impl :
public osl::DebugBase<Test_Impl>,
public WeakImplHelper3< XBridgeTest2, XServiceInfo , XRecursiveCall >
@@ -1164,9 +1164,9 @@ Sequence< OUString > Test_Impl::getSupportedServiceNames()
return bridge_object::getSupportedServiceNames();
}
-// ...
-//==================================================================================================
+
+
static Reference< XInterface > SAL_CALL Test_Impl_create(
SAL_UNUSED_PARAMETER const Reference< XMultiServiceFactory > & )
{
diff --git a/testtools/source/cliversioning/version.cs b/testtools/source/cliversioning/version.cs
index 144bd8c..b171714 100644
--- a/testtools/source/cliversioning/version.cs
+++ b/testtools/source/cliversioning/version.cs
@@ -251,7 +251,7 @@ class SpreadsheetDocHelper : System.IDisposable
private unoidl.com.sun.star.lang.XMultiServiceFactory mxMSFactory;
private unoidl.com.sun.star.sheet.XSpreadsheetDocument mxDocument;
-// ________________________________________________________________
+
public SpreadsheetDocHelper()
{
@@ -316,7 +316,7 @@ class SpreadsheetDocHelper : System.IDisposable
return xSheet;
}
-// ________________________________________________________________
+
// Methods to fill values into cells.
/** 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 ) );
}
-// ________________________________________________________________
+
// Methods to create cell addresses and range addresses.
/** Creates a unoidl.com.sun.star.table.CellAddress and initializes it
@@ -466,7 +466,7 @@ class SpreadsheetDocHelper : System.IDisposable
return xAddr.getRangeAddress();
}
-// ________________________________________________________________
+
// Methods to convert cell addresses and range addresses to strings.
/** Returns the text address of the cell.
@@ -539,7 +539,7 @@ class SpreadsheetDocHelper : System.IDisposable
return aStr;
}
-// ________________________________________________________________
+
/** Connect to a running office that is accepting connections.
@return The ServiceManager to instantiate office components. */
@@ -593,7 +593,7 @@ class SpreadsheetDocHelper : System.IDisposable
}
}
-// ________________________________________________________________
+
}
}
diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx
index 613ae9a..a23ea01 100644
--- a/testtools/source/performance/pseudo.cxx
+++ b/testtools/source/performance/pseudo.cxx
@@ -30,7 +30,7 @@
namespace pseudo_uno
{
-//==================================================================================================
+
struct pseudo_Mapping : public uno_Mapping
{
oslInterlockedCount nRef;
@@ -215,7 +215,7 @@ pseudo_Mapping::pseudo_Mapping( uno_ExtEnvironment * pFrom_, uno_ExtEnvironment
{
(*((uno_Environment *)pFrom)->acquire)( (uno_Environment *)pFrom );
(*((uno_Environment *)pTo)->acquire)( (uno_Environment *)pTo );
- //
+
uno_Mapping::acquire = pseudo_Mapping_acquire;
uno_Mapping::release = pseudo_Mapping_release;
uno_Mapping::mapInterface = pseudo_Mapping_mapInterface;
@@ -229,12 +229,12 @@ pseudo_Mapping::~pseudo_Mapping()
}
-//##################################################################################################
+
extern "C" void SAL_CALL uno_initEnvironment( uno_Environment * pUnoEnv )
{
OSL_FAIL( "### no impl: unexpected call!" );
}
-//##################################################################################################
+
extern "C" void SAL_CALL uno_ext_getMapping(
uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo )
{
diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx
index 1556043..2a23d5c 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -51,7 +51,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
return Sequence< OUString >( &aName, 1 );
}
-//==================================================================================================
+
class ServiceImpl
: public XServiceInfo
, public XPerformanceTest
@@ -198,7 +198,7 @@ public:
{ throw _aDummyRE; }
};
-//##################################################################################################
+
// XServiceInfo
@@ -220,9 +220,9 @@ Sequence< OUString > ServiceImpl::getSupportedServiceNames()
return benchmark_object::getSupportedServiceNames();
}
-// ...
-//==================================================================================================
+
+
static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMultiServiceFactory > & xSMgr )
{
return Reference< XInterface >( (XPerformanceTest *)new ServiceImpl( xSMgr ) );
@@ -231,9 +231,9 @@ static Reference< XInterface > SAL_CALL ServiceImpl_create( const Reference< XMu
}
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
+
+
+
extern "C"
@@ -259,7 +259,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
return sal_False;
}
-//==================================================================================================
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 783c28a..a1a641b 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -154,7 +154,7 @@ static inline void out( sal_Int64 nVal, FILE * stream = stderr,
out( ar, stream, nStart, cFillchar );
}
-//==================================================================================================
+
Reference< XSingleServiceFactory > loadLibComponentFactory(
const OUString & rLibName, const OUString & rImplName,
const Reference< XMultiServiceFactory > & xSF, const Reference< XRegistryKey > & xKey )
@@ -399,7 +399,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
return Sequence< OUString >( &aName, 1 );
}
-//==================================================================================================
+
class TestImpl : public WeakImplHelper2< XServiceInfo, XMain >
{
Reference< XMultiServiceFactory > _xSMgr;
@@ -421,7 +421,7 @@ public:
virtual sal_Int32 SAL_CALL run( const Sequence< OUString > & rArgs ) throw (RuntimeException);
};
-//##################################################################################################
+
TestImpl::TestImpl( const Reference< XMultiServiceFactory > & xSMgr )
@@ -433,7 +433,7 @@ TestImpl::~TestImpl()
{
}
-//==================================================================================================
+
static Reference< XInterface > SAL_CALL TestImpl_create( const Reference< XMultiServiceFactory > & xSMgr )
{
return Reference< XInterface >( *new TestImpl( xSMgr ) );
@@ -502,7 +502,7 @@ Reference< XInterface > TestImpl::resolveObject( const OUString & rUnoUrl )
return xResolvedObject;
}
-//==================================================================================================
+
class TimeEntry
{
sal_Int64 nLoop;
@@ -535,10 +535,10 @@ double TimeEntry::ratio( const TimeEntry & rEntry ) const
}
}
-//==================================================================================================
+
typedef std::map< std::string, TimeEntry > t_TimeEntryMap;
-//==================================================================================================
+
struct TimingSheet
{
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 );
}
-//==================================================================================================
+
typedef boost::unordered_map< std::string, TimingSheet > t_TimingSheetMap;
@@ -1258,14 +1258,14 @@ sal_Int32 TestImpl::run( const Sequence< OUString > & rArgs )
}
-//##################################################################################################
-//##################################################################################################
-//##################################################################################################
+
+
+
extern "C"
{
-//==================================================================================================
+
sal_Bool SAL_CALL component_writeInfo(
void * pServiceManager, void * pRegistryKey )
{
@@ -1287,7 +1287,7 @@ sal_Bool SAL_CALL component_writeInfo(
}
return sal_False;
}
-//==================================================================================================
+
SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
More information about the Libreoffice-commits
mailing list