[Libreoffice-commits] core.git: testtools/com testtools/source
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
AuthorDate: Tue Aug 31 08:10:17 2021 +0200
Commit: Stephan Bergmann
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
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;
[Libreoffice-commits] core.git: testtools/com testtools/source
testtools/com/sun/star/comp/bridge/TestComponent.java | 32
testtools/source/bridgetest/bridgetest.cxx | 31 ++--
testtools/source/bridgetest/cli/cli_cpp_bridgetest.cxx | 34 +++--
testtools/source/bridgetest/cli/cli_cs_bridgetest.cs | 30 ++-
testtools/source/bridgetest/cli/cli_cs_testobj.cs | 24 +
testtools/source/bridgetest/cli/cli_vb_bridgetest.vb | 43 -
testtools/source/bridgetest/cppobj.cxx | 32 +++-
testtools/source/bridgetest/idl/bridgetest.idl | 10 +++
8 files changed, 209 insertions(+), 27 deletions(-)
New commits:
commit 76fc34baeb4257e71092690b7039c0befe371bae
Author: Tor Lillqvist
AuthorDate: Thu Nov 12 21:46:06 2020 +0200
Commit: Tor Lillqvist
CommitDate: Fri Nov 13 20:01:08 2020 +0100
Make bridgetest exercise parameter passing in the C++/UNO bridge harder
The C++/UNO bridge for macOS on arm64 currently uses the Linux code.
Apple's ABI uses slightly different parameter passing on the stack,
though. See
https://developer.apple.com/documentation/xcode/writing_arm64_code_for_apple_platforms?language=objc
That has not been taken into account yet in the bridge code. The
bridgetest, when run on macOS on arm64, didn't notice, sadly, but
succeeded. With this change it crashes, as one would expect it to do.
Add one more byte and short parameter to the setValues(), setValues2()
and getValues() calls in the XBridgeTestBase interface. The stack
allocation for those [in] parameters to setValues() differ between the
Linux and Apple ABIs. Add corresponding attributes to the interface,
and members to the SimpleTest struct.
The changes to the source files in the cli subdirectory (C++/CLI,
VB.NET, and C#) are done blindly as they aren't compiled even on
Windows currently. Most likely the changes to them are incomplete and
erroneous.
Change-Id: I6f689a130d89b23cad9918829107d7da49a79c55
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105770
Tested-by: Tor Lillqvist
Reviewed-by: Tor Lillqvist
diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java
b/testtools/com/sun/star/comp/bridge/TestComponent.java
index f8b50f23e222..7d59de570591 100644
--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
@@ -304,6 +304,8 @@ public class TestComponent {
private float_float;
private double _double;
private String _string;
+private byte _byte2;
+private short_short2;
private Object _xInterface;
private Object _any;
private TestEnum _testEnum = TestEnum.TEST;
@@ -353,6 +355,8 @@ public class TestComponent {
double fDouble,
TestEnum testEnum,
String string,
+ byte nByte2,
+ shortnShort2,
Object xInterface,
Object any,
TestElement testElements[],
@@ -373,6 +377,8 @@ public class TestComponent {
_double = fDouble;
_testEnum = testEnum;
_string = string;
+_byte2= nByte2;
+_short2 = nShort2;
_xInterface = xInterface;
_any = any;
_testElements = testElements;
@@ -394,6 +400,8 @@ public class TestComponent {
/*INOUT*/double[]
io_double,
/*INOUT*/TestEnum[]
io_testEnum,
/*INOUT*/String[]
io_string,
+ /*INOUT*/byte[]
io_byte2,
+ /*INOUT*/short[]
io_short2,
/*INOUT*/Object[]
io_xInterface,
/*INOUT*/Object[] io_any,
/*INOUT*/TestElement[][]
io_testElements,
@@ -414,6 +422,8 @@ public class TestComponent {
_double = io_double[0];
_testEnum = io_testEnum[0];
_string = io_string[0];
+_byte2= io_byte2[0];
+_short2 = io_short2[0];
_xInterface = io_xInterface[0];
_any = io_any[0];
_testElements = io_testElements[0];
@@ -438,6 +448,8 @@ public class TestComponent {
/*OUT*/double[]
[Libreoffice-commits] core.git: testtools/com
testtools/com/sun/star/comp/bridge/makefile.mk | 50 - 1 file changed, 50 deletions(-) New commits: commit 7eab7fc586b4a3d4d1a1c3b192567c58b72b369d Author: Stephan Bergmann sberg...@redhat.com Date: Thu Nov 27 09:22:07 2014 +0100 Remove dead dmake makefile.mk Change-Id: If57799fb00ce55818658cce375e1ab0244372772 diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk deleted file mode 100644 index 2d872ea..000 --- a/testtools/com/sun/star/comp/bridge/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed -# with this work for additional information regarding copyright -# ownership. The ASF licenses this file to you under the Apache -# License, Version 2.0 (the License); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.apache.org/licenses/LICENSE-2.0 . -# - -PRJ=..$/..$/..$/..$/.. -PRJNAME=testtools -PACKAGE=com$/sun$/star$/comp$/bridge -TARGET=com_sun_star_comp_bridge - -# --- Settings - - -.INCLUDE : settings.mk - -# -- - -.IF $(ENABLE_JAVA) != - -JARFILES = ridl.jar jurt.jar juh.jar - -JAVACLASSFILES= \ -$(CLASSDIR)$/$(PACKAGE)$/CurrentContextChecker.class \ -$(CLASSDIR)$/$(PACKAGE)$/TestComponent.class \ -$(CLASSDIR)$/$(PACKAGE)$/TestComponentMain.class - -JAVAFILES = $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) - -JARCLASSDIRS = $(PACKAGE) test$/testtools$/bridgetest -JARTARGET = testComponent.jar -JARCOMPRESS= TRUE -CUSTOMMANIFESTFILE = manifest - -.ENDIF - -# --- Targets -- - -.INCLUDE : target.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
