[Libreoffice-commits] core.git: testtools/com testtools/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Aug 31 09:03:11 UTC 2021
testtools/com/sun/star/comp/bridge/TestComponent.java | 8 ++---
testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl | 8 ++---
testtools/source/performance/cli_testobj_performance.cs | 8 ++---
testtools/source/performance/ubobject.cxx | 8 ++---
testtools/source/performance/ubtest.cxx | 16 +++++-----
5 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit 04117f78f235a60094f8d92ce983ebcc495ecc49
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Aug 31 08:10:17 2021 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Aug 31 11:02:37 2021 +0200
Fix UNOIDL identifiers that started with lowercase and contained underlines
...which are reserved in UNOIDL (though unoidl-write does not enforce that for
now, see the TODO in unoidl/source/sourceprovider-scanner.l, and idlc only
warned about it with an explicit -cid option)
Change-Id: I529f385e9c263d2dab9baf3b99f0208457da04c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121346
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java b/testtools/com/sun/star/comp/bridge/TestComponent.java
index dcc835125219..271b139565fb 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
@@ -161,18 +161,18 @@ public class TestComponent {
public void sync( ) throws com.sun.star.uno.RuntimeException {
}
- public ComplexTypes complex_in( /*IN*/ComplexTypes aVal ) throws com.sun.star.uno.RuntimeException {
+ public ComplexTypes complexIn( /*IN*/ComplexTypes aVal ) throws com.sun.star.uno.RuntimeException {
return aVal;
}
- public ComplexTypes complex_inout( /*INOUT*/ComplexTypes[] aVal ) throws com.sun.star.uno.RuntimeException {
+ public ComplexTypes complexInout( /*INOUT*/ComplexTypes[] aVal ) throws com.sun.star.uno.RuntimeException {
return aVal[0];
}
- public void complex_oneway( /*IN*/ComplexTypes aVal ) throws com.sun.star.uno.RuntimeException {
+ public void complexOneway( /*IN*/ComplexTypes aVal ) throws com.sun.star.uno.RuntimeException {
}
- public void complex_noreturn( /*IN*/ComplexTypes aVal ) throws com.sun.star.uno.RuntimeException {
+ public void complexNoreturn( /*IN*/ComplexTypes aVal ) throws com.sun.star.uno.RuntimeException {
}
public XPerformanceTest createObject( ) throws com.sun.star.uno.RuntimeException {
diff --git a/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl b/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl
index 7e3ae8e96a95..b92b7b4c3dbc 100644
--- a/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl
+++ b/testtools/source/bridgetest/idl/com/sun/star/test/performance/XPerformanceTest.idl
@@ -78,11 +78,11 @@ published interface XPerformanceTest : com::sun::star::uno::XInterface
void async();
void sync();
- ComplexTypes complex_in( [in] ComplexTypes aVal );
- ComplexTypes complex_inout( [inout] ComplexTypes aVal );
+ ComplexTypes complexIn( [in] ComplexTypes aVal );
+ ComplexTypes complexInout( [inout] ComplexTypes aVal );
- void complex_oneway( [in] ComplexTypes aVal );
- void complex_noreturn( [in] ComplexTypes aVal );
+ void complexOneway( [in] ComplexTypes aVal );
+ void complexNoreturn( [in] ComplexTypes aVal );
XPerformanceTest createObject();
diff --git a/testtools/source/performance/cli_testobj_performance.cs b/testtools/source/performance/cli_testobj_performance.cs
index 4affe89cd70f..c5e338fcd15a 100644
--- a/testtools/source/performance/cli_testobj_performance.cs
+++ b/testtools/source/performance/cli_testobj_performance.cs
@@ -73,10 +73,10 @@ public class PerformanceTestObject : ServiceBase, XPerformanceTest
// Methods
public void async() {}
public void sync( ) {}
- public ComplexTypes complex_in( /*IN*/ComplexTypes aVal ) { return aVal; }
- public ComplexTypes complex_inout( /*INOUT*/ref ComplexTypes aVal ) { return aVal; }
- public void complex_oneway( /*IN*/ComplexTypes aVal ) {}
- public void complex_noreturn( /*IN*/ComplexTypes aVal ) {}
+ public ComplexTypes complexIn( /*IN*/ComplexTypes aVal ) { return aVal; }
+ public ComplexTypes complexInout( /*INOUT*/ref ComplexTypes aVal ) { return aVal; }
+ public void complexOneway( /*IN*/ComplexTypes aVal ) {}
+ public void complexNoreturn( /*IN*/ComplexTypes aVal ) {}
public XPerformanceTest createObject( ) { return new PerformanceTestObject(); }
public int getLong() { return _long; }
public void setLong(/*IN*/int n) { _long = n; }
diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx
index e437e9c9cdaa..acd199268f26 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -183,13 +183,13 @@ public:
{}
virtual void SAL_CALL sync() throw(css::uno::RuntimeException)
{}
- virtual ComplexTypes SAL_CALL complex_in( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
+ virtual ComplexTypes SAL_CALL complexIn( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
{ return aVal; }
- virtual ComplexTypes SAL_CALL complex_inout( css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
+ virtual ComplexTypes SAL_CALL complexInout( css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
{ return aVal; }
- virtual void SAL_CALL complex_oneway( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
+ virtual void SAL_CALL complexOneway( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
{}
- virtual void SAL_CALL complex_noreturn( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
+ virtual void SAL_CALL complexNoreturn( const css::test::performance::ComplexTypes& aVal ) throw(css::uno::RuntimeException)
{}
virtual Reference< XPerformanceTest > SAL_CALL createObject() throw(css::uno::RuntimeException)
{ return new ServiceImpl(); }
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 38950b8bda5d..17601820c966 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -626,28 +626,28 @@ static void benchmark(
i = nLoop;
tStart = getSystemTicks();
while (i--)
- xBench->complex_in( aDummyStruct );
+ xBench->complexIn( aDummyStruct );
tEnd = getSystemTicks();
- rSheet.insert( "4a: complex_in() calls (in struct; return struct)", nLoop, tEnd - tStart );
+ rSheet.insert( "4a: complexIn() calls (in struct; return struct)", nLoop, tEnd - tStart );
i = nLoop;
tStart = getSystemTicks();
while (i--)
- xBench->complex_inout( aDummyStruct );
+ xBench->complexInout( aDummyStruct );
tEnd = getSystemTicks();
- rSheet.insert( "4b: complex_inout() calls (inout struct; return struct)", nLoop, tEnd - tStart );
+ rSheet.insert( "4b: complexInout() calls (inout struct; return struct)", nLoop, tEnd - tStart );
i = nLoop;
tStart = getSystemTicks();
while (i--)
- xBench->complex_oneway( aDummyStruct );
+ xBench->complexOneway( aDummyStruct );
tEnd = getSystemTicks();
- rSheet.insert( "4c: complex_oneway() oneway calls (in struct)", nLoop, tEnd - tStart );
+ rSheet.insert( "4c: complexOneway() oneway calls (in struct)", nLoop, tEnd - tStart );
i = nLoop;
tStart = getSystemTicks();
while (i--)
- xBench->complex_noreturn( aDummyStruct );
+ xBench->complexNoreturn( aDummyStruct );
tEnd = getSystemTicks();
- rSheet.insert( "4d: complex_noreturn() calls (in struct)", nLoop, tEnd - tStart );
+ rSheet.insert( "4d: complexNoreturn() calls (in struct)", nLoop, tEnd - tStart );
// attributes, get() methods
i = nLoop;
More information about the Libreoffice-commits
mailing list