bridges/test/inter_libs_exc/inter.cxx | 55 bridges/test/inter_libs_exc/makefile.mk | 71 bridges/test/inter_libs_exc/share.h | 25 bridges/test/inter_libs_exc/starter.cxx | 54 bridges/test/inter_libs_exc/starter.map | 25 bridges/test/inter_libs_exc/thrower.cxx | 37 bridges/test/inter_libs_exc/thrower.map | 25 bridges/test/java_remote/Bug107753_Test.java | 383 - bridges/test/java_remote/Bug108825_Test.java | 159 bridges/test/java_remote/Bug110892_Test.java | 117 bridges/test/java_remote/Bug111153_Test.java | 96 bridges/test/java_remote/Bug114133_Test.java | 69 bridges/test/java_remote/Bug51323_Test.java | 76 bridges/test/java_remote/Bug92174_Test.java | 92 bridges/test/java_remote/Bug97697_Test.java | 99 bridges/test/java_remote/Bug98508_Test.idl | 31 bridges/test/java_remote/Bug98508_Test.java | 99 bridges/test/java_remote/MethodIdTest.java | 466 -- bridges/test/java_remote/PolyStructTest.idl | 46 bridges/test/java_remote/PolyStructTest.java | 247 - bridges/test/java_remote/StopMessageDispatcherTest.java | 100 bridges/test/java_remote/makefile.mk | 42 bridges/test/java_uno/acquire/TestAcquire.java | 295 - bridges/test/java_uno/acquire/makefile.mk | 108 bridges/test/java_uno/acquire/readme.txt | 21 bridges/test/java_uno/acquire/testacquire.cxx | 543 -- bridges/test/java_uno/acquire/types.idl | 62 bridges/test/java_uno/any/TestAny.java | 2246 ---------- bridges/test/java_uno/any/TestJni.java | 42 bridges/test/java_uno/any/TestRemote.java | 59 bridges/test/java_uno/any/makefile.mk | 118 bridges/test/java_uno/any/test_javauno_any.map | 24 bridges/test/java_uno/any/transport.cxx | 99 bridges/test/java_uno/any/types.idl | 36 bridges/test/java_uno/equals/TestEquals.java | 1297 ----- bridges/test/java_uno/equals/makefile.mk | 87 bridges/test/java_uno/equals/testequals.cxx | 202 bridges/test/java_uno/equals/types.idl | 41 bridges/test/java_uno/nativethreadpool/Relay.java | 116 bridges/test/java_uno/nativethreadpool/makefile.mk | 112 bridges/test/java_uno/nativethreadpool/readme | 30 bridges/test/java_uno/nativethreadpool/relay.manifest | 2 bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx | 157 bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx | 121 bridges/test/java_uno/nativethreadpool/types.idl | 34 bridges/test/java_uno/nativethreadpool/version.map | 24 bridges/test/lib/TestBed.java | 216 bridges/test/lib/makefile.mk | 27 bridges/test/makefile.mk | 166 bridges/test/performance/makefile.mk | 52 bridges/test/performance/testperformance.cxx | 179 bridges/test/test_bridge.idl | 76 bridges/test/testclient.cxx | 237 - bridges/test/testclient.java | 134 bridges/test/testcomp.cxx | 738 --- bridges/test/testcomp.h | 148 bridges/test/testoffice.cxx | 261 - bridges/test/testsameprocess.cxx | 206 bridges/test/testserver.cxx | 243 - vcl/source/gdi/bitmap.cxx | 10 60 files changed, 5 insertions(+), 10978 deletions(-)
New commits: commit 9921bae92ebfe1f1372fb4158a51a6f70ea738bd Author: Caolán McNamara <caol...@redhat.com> Date: Sat Jan 9 20:46:39 2016 +0000 cppcheck: truncLongCastAssignment Change-Id: I55f684c0afb8b0d4ab4b749084a3ab7b66201bda diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 6b675ed..d0f2666 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -809,7 +809,7 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst, if( nSrcBitCount > nDstBitCount ) { - long nNextIndex = 0L; + int nNextIndex = 0; if( ( nSrcBitCount == 24 ) && ( nDstBitCount < 24 ) ) Convert( BMP_CONVERSION_24BIT ); @@ -831,16 +831,16 @@ bool Bitmap::CopyPixel( const Rectangle& rRectDst, if( pSrcAcc && pDstAcc ) { - const long nSrcCount = pDstAcc->GetPaletteEntryCount(); - const long nDstCount = 1 << nDstBitCount; + const int nSrcCount = pDstAcc->GetPaletteEntryCount(); + const int nDstCount = 1 << nDstBitCount; - for( long i = 0L; ( i < nSrcCount ) && ( nNextIndex < nSrcCount ); i++ ) + for (int i = 0; ( i < nSrcCount ) && ( nNextIndex < nSrcCount ); ++i) { const BitmapColor& rSrcCol = pSrcAcc->GetPaletteColor( (sal_uInt16) i ); bool bFound = false; - for( long j = 0L; j < nDstCount; j++ ) + for (int j = 0; j < nDstCount; ++j) { if( rSrcCol == pDstAcc->GetPaletteColor( (sal_uInt16) j ) ) { commit 4cf87913dbb3fdf336e518e8cae9b4bff56edf6a Author: Caolán McNamara <caol...@redhat.com> Date: Sat Jan 9 20:39:48 2016 +0000 this dir has lain unused for years now Change-Id: Ia6638f316b9d7c67e45a30b5808c68b54fdb1680 diff --git a/bridges/test/inter_libs_exc/inter.cxx b/bridges/test/inter_libs_exc/inter.cxx deleted file mode 100644 index 0e8a85c..0000000 --- a/bridges/test/inter_libs_exc/inter.cxx +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <stdio.h> -#include "share.h" - -#include <rtl/string.hxx> -#include <osl/module.hxx> - - -using namespace ::osl; -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; - -extern "C" int main( int argc, char const * argv [] ) -{ -#ifdef SAL_W32 -#define SAL_DLLPREFIX "" -#endif - Module mod_starter( - SAL_DLLPREFIX "starter" SAL_DLLEXTENSION, - SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); - Module mod_thrower( - SAL_DLLPREFIX "thrower" SAL_DLLEXTENSION, - SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL ); - - typedef t_throws_exc (SAL_CALL * t_get_thrower)(); - t_get_thrower get_thrower = (t_get_thrower)mod_thrower.getSymbol( "get_thrower" ); - t_throws_exc thrower = (*get_thrower)(); - - typedef void (SAL_CALL * t_starter)( t_throws_exc ); - t_starter start = (t_starter)mod_starter.getSymbol( "start" ); - - (*start)( thrower ); - - return 0; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/inter_libs_exc/makefile.mk b/bridges/test/inter_libs_exc/makefile.mk deleted file mode 100644 index 1555fac..0000000 --- a/bridges/test/inter_libs_exc/makefile.mk +++ /dev/null @@ -1,71 +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=bridges -TARGET=inter -LIBTARGET=NO -TARGETTYPE=CUI -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb -UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb - -# output directory (one dir for each project) -UNOUCROUT=$(OUT)$/inc$/$(TARGET) - -# adding to inludeoath -INCPRE+=$(UNOUCROUT) - -UNOTYPESTYPES := \ - com.sun.star.lang.IllegalArgumentException \ - com.sun.star.uno.DeploymentException - -SLOFILES=$(SLO)$/starter.obj $(SLO)$/thrower.obj - -SHL1TARGET=starter -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1IMPLIB=i$(SHL1TARGET) -SHL1OBJS=$(SLO)$/starter.obj -DEF1NAME=$(SHL1TARGET) -SHL1STDLIBS+= $(CPPULIB) $(SALLIB) -SHL1VERSIONMAP=$(SHL1TARGET).map - -SHL2TARGET=thrower -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -SHL2IMPLIB=i$(SHL2TARGET) -SHL2OBJS=$(SLO)$/thrower.obj -DEF2NAME=$(SHL2TARGET) -SHL2STDLIBS+= $(CPPULIB) $(SALLIB) -SHL2VERSIONMAP=$(SHL2TARGET).map - -OBJFILES=$(OBJ)$/inter.obj -APP1TARGET=inter -APP1OBJS=$(OBJ)$/inter.obj -APP1STDLIBS+=\ - $(SALLIB) - -.INCLUDE : target.mk - diff --git a/bridges/test/inter_libs_exc/share.h b/bridges/test/inter_libs_exc/share.h deleted file mode 100644 index 260883d..0000000 --- a/bridges/test/inter_libs_exc/share.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/uno/DeploymentException.hpp> - -typedef void (SAL_CALL * t_throws_exc)(); - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/inter_libs_exc/starter.cxx b/bridges/test/inter_libs_exc/starter.cxx deleted file mode 100644 index f9fcf88..0000000 --- a/bridges/test/inter_libs_exc/starter.cxx +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <stdio.h> -#include "share.h" - - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; - -static void some_more( t_throws_exc p ) -{ - (*p)(); -} - -extern "C" void SAL_CALL start( t_throws_exc p ) -{ - try - { - some_more( p ); - } - catch (lang::IllegalArgumentException & exc) - { - OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - printf( "starter.cxx: caught IllegalArgumentException: %s\n", msg.getStr() ); - } - catch (Exception & exc) - { - OString msg( OUStringToOString( exc.Message, RTL_TEXTENCODING_ASCII_US ) ); - printf( "starter.cxx: caught some UNO exc: %s\n", msg.getStr() ); - } - catch (...) - { - printf( "starter.cxx: caught something\n" ); - } -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/inter_libs_exc/starter.map b/bridges/test/inter_libs_exc/starter.map deleted file mode 100644 index dc361ce..0000000 --- a/bridges/test/inter_libs_exc/starter.map +++ /dev/null @@ -1,25 +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 . -# - -UDK_3_0_0 { - global: - start; - local: - *; -}; - diff --git a/bridges/test/inter_libs_exc/thrower.cxx b/bridges/test/inter_libs_exc/thrower.cxx deleted file mode 100644 index b9794a0..0000000 --- a/bridges/test/inter_libs_exc/thrower.cxx +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include "share.h" - - -using namespace ::com::sun::star; -using namespace ::com::sun::star::uno; - -static void SAL_CALL throws_exc() -{ - throw lang::IllegalArgumentException( - "bla", Reference< XInterface >(), 0 ); -} - -extern "C" t_throws_exc SAL_CALL get_thrower() -{ - return throws_exc; -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/inter_libs_exc/thrower.map b/bridges/test/inter_libs_exc/thrower.map deleted file mode 100644 index 7227e34..0000000 --- a/bridges/test/inter_libs_exc/thrower.map +++ /dev/null @@ -1,25 +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 . -# - -UDK_3_0_0 { - global: - get_thrower; - local: - *; -}; - diff --git a/bridges/test/java_remote/Bug107753_Test.java b/bridges/test/java_remote/Bug107753_Test.java deleted file mode 100644 index 46ff857..0000000 --- a/bridges/test/java_remote/Bug107753_Test.java +++ /dev/null @@ -1,383 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #107753#. - * - * <p>Bug #107753# "Java UNO: Proxies should implement intuitive semantics of - * equals and hashCode" requests that two proxies are equal iff they represent - * the same UNO object. This implies that if two proxies represent the same UNO - * object, they must have the same hash code.</p> - */ -public final class Bug107753_Test extends ComplexTestCase { - @Override - public String getTestObjectName() { - return getClass().getName(); - } - - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - TestBed t = new TestBed(); - assure("test", t.execute(new Provider(), false, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - boolean success = true; - XTransport transport = UnoRuntime.queryInterface( - XTransport.class, getBridge(context).getInstance("Transport")); - - Object obj1a = new XType1() {}; - XType1 obj1b = UnoRuntime.queryInterface(XType1.class, obj1a); - success &= test("obj1a == obj1b", obj1a == obj1b); - - Object obj2a = new XType2() {}; - XType2 obj2b = UnoRuntime.queryInterface(XType2.class, obj2a); - success &= test("obj2a == obj2b", obj2a == obj2b); - - Object obj3a = transport.getType1(); - XType1 obj3b = UnoRuntime.queryInterface(XType1.class, obj3a); - success &= test( - "obj3a != obj3b; only meaningful as long as different proxy" - + " instances are used for different UNO interfaces of one UNO" - + " object", - obj3a != obj3b); - - Object obj4a = transport.getType2(); - XType2 obj4b = UnoRuntime.queryInterface(XType2.class, obj4a); - success &= test( - "obj4a != obj4b; only meaningful as long as different proxy" - + " instances are used for different UNO interfaces of one UNO" - + " object", - obj4a != obj4b); - - success &= test("UnoRuntime.areSame(null, null)", - UnoRuntime.areSame(null, null)); - success &= test("!UnoRuntime.areSame(null, obj1a)", - !UnoRuntime.areSame(null, obj1a)); - success &= test("!UnoRuntime.areSame(null, obj1b)", - !UnoRuntime.areSame(null, obj1b)); - success &= test("!UnoRuntime.areSame(null, obj2a)", - !UnoRuntime.areSame(null, obj2a)); - success &= test("!UnoRuntime.areSame(null, obj2b)", - !UnoRuntime.areSame(null, obj2b)); - success &= test("!UnoRuntime.areSame(null, obj3a)", - !UnoRuntime.areSame(null, obj3a)); - success &= test("!UnoRuntime.areSame(null, obj3b)", - !UnoRuntime.areSame(null, obj3b)); - success &= test("!UnoRuntime.areSame(null, obj4a)", - !UnoRuntime.areSame(null, obj4a)); - success &= test("!UnoRuntime.areSame(null, obj4b)", - !UnoRuntime.areSame(null, obj4b)); - - success &= test("!obj1a.equals(null)", !obj1a.equals(null)); - success &= test("!UnoRuntime.areSame(obj1a, null)", - !UnoRuntime.areSame(obj1a, null)); - success &= test("obj1a.equals(obj1a)", obj1a.equals(obj1a)); - success &= test("UnoRuntime.areSame(obj1a, obj1a)", - UnoRuntime.areSame(obj1a, obj1a)); - success &= test("obj1a.equals(obj1b)", obj1a.equals(obj1b)); - success &= test("UnoRuntime.areSame(obj1a, obj1b)", - UnoRuntime.areSame(obj1a, obj1b)); - success &= test("!obj1a.equals(obj2a)", !obj1a.equals(obj2a)); - success &= test("!UnoRuntime.areSame(obj1a, obj2a)", - !UnoRuntime.areSame(obj1a, obj2a)); - success &= test("!obj1a.equals(obj2b)", !obj1a.equals(obj2b)); - success &= test("!UnoRuntime.areSame(obj1a, obj2b)", - !UnoRuntime.areSame(obj1a, obj2b)); - success &= test("!obj1a.equals(obj3a)", !obj1a.equals(obj3a)); - success &= test("!UnoRuntime.areSame(obj1a, obj3a)", - !UnoRuntime.areSame(obj1a, obj3a)); - success &= test("!obj1a.equals(obj3b)", !obj1a.equals(obj3b)); - success &= test("!UnoRuntime.areSame(obj1a, obj3b)", - !UnoRuntime.areSame(obj1a, obj3b)); - success &= test("!obj1a.equals(obj4a)", !obj1a.equals(obj4a)); - success &= test("!UnoRuntime.areSame(obj1a, obj4a)", - !UnoRuntime.areSame(obj1a, obj4a)); - success &= test("!obj1a.equals(obj4b)", !obj1a.equals(obj4b)); - success &= test("!UnoRuntime.areSame(obj1a, obj4b)", - !UnoRuntime.areSame(obj1a, obj4b)); - - success &= test("!obj1b.equals(null)", !obj1b.equals(null)); - success &= test("!UnoRuntime.areSame(obj1b, null)", - !UnoRuntime.areSame(obj1b, null)); - success &= test("obj1b.equals(obj1a)", obj1b.equals(obj1a)); - success &= test("UnoRuntime.areSame(obj1b, obj1a)", - UnoRuntime.areSame(obj1b, obj1a)); - success &= test("obj1b.equals(obj1b)", obj1b.equals(obj1b)); - success &= test("UnoRuntime.areSame(obj1b, obj1b)", - UnoRuntime.areSame(obj1b, obj1b)); - success &= test("!obj1b.equals(obj2a)", !obj1b.equals(obj2a)); - success &= test("!UnoRuntime.areSame(obj1b, obj2a)", - !UnoRuntime.areSame(obj1b, obj2a)); - success &= test("!obj1b.equals(obj2b)", !obj1b.equals(obj2b)); - success &= test("!UnoRuntime.areSame(obj1b, obj2b)", - !UnoRuntime.areSame(obj1b, obj2b)); - success &= test("!obj1b.equals(obj3a)", !obj1b.equals(obj3a)); - success &= test("!UnoRuntime.areSame(obj1b, obj3a)", - !UnoRuntime.areSame(obj1b, obj3a)); - success &= test("!obj1b.equals(obj3b)", !obj1b.equals(obj3b)); - success &= test("!UnoRuntime.areSame(obj1b, obj3b)", - !UnoRuntime.areSame(obj1b, obj3b)); - success &= test("!obj1b.equals(obj4a)", !obj1b.equals(obj4a)); - success &= test("!UnoRuntime.areSame(obj1b, obj4a)", - !UnoRuntime.areSame(obj1b, obj4a)); - success &= test("!obj1b.equals(obj4b)", !obj1b.equals(obj4b)); - success &= test("!UnoRuntime.areSame(obj1b, obj4b)", - !UnoRuntime.areSame(obj1b, obj4b)); - - success &= test("!obj2a.equals(null)", !obj2a.equals(null)); - success &= test("!UnoRuntime.areSame(obj2a, null)", - !UnoRuntime.areSame(obj2a, null)); - success &= test("!obj2a.equals(obj1a)", !obj2a.equals(obj1a)); - success &= test("!UnoRuntime.areSame(obj2a, obj1a)", - !UnoRuntime.areSame(obj2a, obj1a)); - success &= test("!obj2a.equals(obj1b)", !obj2a.equals(obj1b)); - success &= test("!UnoRuntime.areSame(obj2a, obj1b)", - !UnoRuntime.areSame(obj2a, obj1b)); - success &= test("obj2a.equals(obj2a)", obj2a.equals(obj2a)); - success &= test("UnoRuntime.areSame(obj2a, obj2a)", - UnoRuntime.areSame(obj2a, obj2a)); - success &= test("obj2a.equals(obj2b)", obj2a.equals(obj2b)); - success &= test("UnoRuntime.areSame(obj2a, obj2b)", - UnoRuntime.areSame(obj2a, obj2b)); - success &= test("!obj2a.equals(obj3a)", !obj2a.equals(obj3a)); - success &= test("!UnoRuntime.areSame(obj2a, obj3a)", - !UnoRuntime.areSame(obj2a, obj3a)); - success &= test("!obj2a.equals(obj3b)", !obj2a.equals(obj3b)); - success &= test("!UnoRuntime.areSame(obj2a, obj3b)", - !UnoRuntime.areSame(obj2a, obj3b)); - success &= test("!obj2a.equals(obj4a)", !obj2a.equals(obj4a)); - success &= test("!UnoRuntime.areSame(obj2a, obj4a)", - !UnoRuntime.areSame(obj2a, obj4a)); - success &= test("!obj2a.equals(obj4b)", !obj2a.equals(obj4b)); - success &= test("!UnoRuntime.areSame(obj2a, obj4b)", - !UnoRuntime.areSame(obj2a, obj4b)); - - success &= test("!obj2b.equals(null)", !obj2b.equals(null)); - success &= test("!UnoRuntime.areSame(obj2b, null)", - !UnoRuntime.areSame(obj2b, null)); - success &= test("!obj2b.equals(obj1a)", !obj2b.equals(obj1a)); - success &= test("!UnoRuntime.areSame(obj2b, obj1a)", - !UnoRuntime.areSame(obj2b, obj1a)); - success &= test("!obj2b.equals(obj1b)", !obj2b.equals(obj1b)); - success &= test("!UnoRuntime.areSame(obj2b, obj1b)", - !UnoRuntime.areSame(obj2b, obj1b)); - success &= test("obj2b.equals(obj2a)", obj2b.equals(obj2a)); - success &= test("UnoRuntime.areSame(obj2b, obj2a)", - UnoRuntime.areSame(obj2b, obj2a)); - success &= test("obj2b.equals(obj2b)", obj2b.equals(obj2b)); - success &= test("UnoRuntime.areSame(obj2b, obj2b)", - UnoRuntime.areSame(obj2b, obj2b)); - success &= test("!obj2b.equals(obj3a)", !obj2b.equals(obj3a)); - success &= test("!UnoRuntime.areSame(obj2b, obj3a)", - !UnoRuntime.areSame(obj2b, obj3a)); - success &= test("!obj2b.equals(obj3b)", !obj2b.equals(obj3b)); - success &= test("!UnoRuntime.areSame(obj2b, obj3b)", - !UnoRuntime.areSame(obj2b, obj3b)); - success &= test("!obj2b.equals(obj4a)", !obj2b.equals(obj4a)); - success &= test("!UnoRuntime.areSame(obj2b, obj4a)", - !UnoRuntime.areSame(obj2b, obj4a)); - success &= test("!obj2b.equals(obj4b)", !obj2b.equals(obj4b)); - success &= test("!UnoRuntime.areSame(obj2b, obj4b)", - !UnoRuntime.areSame(obj2b, obj4b)); - - success &= test("!obj3a.equals(null)", !obj3a.equals(null)); - success &= test("!UnoRuntime.areSame(obj3a, null)", - !UnoRuntime.areSame(obj3a, null)); - success &= test("!obj3a.equals(obj1a)", !obj3a.equals(obj1a)); - success &= test("!UnoRuntime.areSame(obj3a, obj1a)", - !UnoRuntime.areSame(obj3a, obj1a)); - success &= test("!obj3a.equals(obj1b)", !obj3a.equals(obj1b)); - success &= test("!UnoRuntime.areSame(obj3a, obj1b)", - !UnoRuntime.areSame(obj3a, obj1b)); - success &= test("!obj3a.equals(obj2a)", !obj3a.equals(obj2a)); - success &= test("!UnoRuntime.areSame(obj3a, obj2a)", - !UnoRuntime.areSame(obj3a, obj2a)); - success &= test("!obj3a.equals(obj2b)", !obj3a.equals(obj2b)); - success &= test("!UnoRuntime.areSame(obj3a, obj2b)", - !UnoRuntime.areSame(obj3a, obj2b)); - success &= test("obj3a.equals(obj3a)", obj3a.equals(obj3a)); - success &= test("UnoRuntime.areSame(obj3a, obj3a)", - UnoRuntime.areSame(obj3a, obj3a)); - success &= test("obj3a.equals(obj3b)", obj3a.equals(obj3b)); - success &= test("UnoRuntime.areSame(obj3a, obj3b)", - UnoRuntime.areSame(obj3a, obj3b)); - success &= test("!obj3a.equals(obj4a)", !obj3a.equals(obj4a)); - success &= test("!UnoRuntime.areSame(obj3a, obj4a)", - !UnoRuntime.areSame(obj3a, obj4a)); - success &= test("!obj3a.equals(obj4b)", !obj3a.equals(obj4b)); - success &= test("!UnoRuntime.areSame(obj3a, obj4b)", - !UnoRuntime.areSame(obj3a, obj4b)); - - success &= test("!obj3b.equals(null)", !obj3b.equals(null)); - success &= test("!UnoRuntime.areSame(obj3b, null)", - !UnoRuntime.areSame(obj3b, null)); - success &= test("!obj3b.equals(obj1a)", !obj3b.equals(obj1a)); - success &= test("!UnoRuntime.areSame(obj3b, obj1a)", - !UnoRuntime.areSame(obj3b, obj1a)); - success &= test("!obj3b.equals(obj1b)", !obj3b.equals(obj1b)); - success &= test("!UnoRuntime.areSame(obj3b, obj1b)", - !UnoRuntime.areSame(obj3b, obj1b)); - success &= test("!obj3b.equals(obj2a)", !obj3b.equals(obj2a)); - success &= test("!UnoRuntime.areSame(obj3b, obj2a)", - !UnoRuntime.areSame(obj3b, obj2a)); - success &= test("!obj3b.equals(obj2b)", !obj3b.equals(obj2b)); - success &= test("!UnoRuntime.areSame(obj3b, obj2b)", - !UnoRuntime.areSame(obj3b, obj2b)); - success &= test("obj3b.equals(obj3a)", obj3b.equals(obj3a)); - success &= test("UnoRuntime.areSame(obj3b, obj3a)", - UnoRuntime.areSame(obj3b, obj3a)); - success &= test("obj3b.equals(obj3b)", obj3b.equals(obj3b)); - success &= test("UnoRuntime.areSame(obj3b, obj3b)", - UnoRuntime.areSame(obj3b, obj3b)); - success &= test("!obj3b.equals(obj4a)", !obj3b.equals(obj4a)); - success &= test("!UnoRuntime.areSame(obj3b, obj4a)", - !UnoRuntime.areSame(obj3b, obj4a)); - success &= test("!obj3b.equals(obj4b)", !obj3b.equals(obj4b)); - success &= test("!UnoRuntime.areSame(obj3b, obj4b)", - !UnoRuntime.areSame(obj3b, obj4b)); - - success &= test("!obj4a.equals(null)", !obj4a.equals(null)); - success &= test("!UnoRuntime.areSame(obj4a, null)", - !UnoRuntime.areSame(obj4a, null)); - success &= test("!obj4a.equals(obj1a)", !obj4a.equals(obj1a)); - success &= test("!UnoRuntime.areSame(obj4a, obj1a)", - !UnoRuntime.areSame(obj4a, obj1a)); - success &= test("!obj4a.equals(obj1b)", !obj4a.equals(obj1b)); - success &= test("!UnoRuntime.areSame(obj4a, obj1b)", - !UnoRuntime.areSame(obj4a, obj1b)); - success &= test("!obj4a.equals(obj2a)", !obj4a.equals(obj2a)); - success &= test("!UnoRuntime.areSame(obj4a, obj2a)", - !UnoRuntime.areSame(obj4a, obj2a)); - success &= test("!obj4a.equals(obj2b)", !obj4a.equals(obj2b)); - success &= test("!UnoRuntime.areSame(obj4a, obj2b)", - !UnoRuntime.areSame(obj4a, obj2b)); - success &= test("!obj4a.equals(obj3a)", !obj4a.equals(obj3a)); - success &= test("!UnoRuntime.areSame(obj4a, obj3a)", - !UnoRuntime.areSame(obj4a, obj3a)); - success &= test("!obj4a.equals(obj3b)", !obj4a.equals(obj3b)); - success &= test("!UnoRuntime.areSame(obj4a, obj3b)", - !UnoRuntime.areSame(obj4a, obj3b)); - success &= test("obj4a.equals(obj4a)", obj4a.equals(obj4a)); - success &= test("UnoRuntime.areSame(obj4a, obj4a)", - UnoRuntime.areSame(obj4a, obj4a)); - success &= test("obj4a.equals(obj4b)", obj4a.equals(obj4b)); - success &= test("UnoRuntime.areSame(obj4a, obj4b)", - UnoRuntime.areSame(obj4a, obj4b)); - - success &= test("!obj4b.equals(null)", !obj4b.equals(null)); - success &= test("!UnoRuntime.areSame(obj4b, null)", - !UnoRuntime.areSame(obj4b, null)); - success &= test("!obj4b.equals(obj1a)", !obj4b.equals(obj1a)); - success &= test("!UnoRuntime.areSame(obj4b, obj1a)", - !UnoRuntime.areSame(obj4b, obj1a)); - success &= test("!obj4b.equals(obj1b)", !obj4b.equals(obj1b)); - success &= test("!UnoRuntime.areSame(obj4b, obj1b)", - !UnoRuntime.areSame(obj4b, obj1b)); - success &= test("!obj4b.equals(obj2a)", !obj4b.equals(obj2a)); - success &= test("!UnoRuntime.areSame(obj4b, obj2a)", - !UnoRuntime.areSame(obj4b, obj2a)); - success &= test("!obj4b.equals(obj2b)", !obj4b.equals(obj2b)); - success &= test("!UnoRuntime.areSame(obj4b, obj2b)", - !UnoRuntime.areSame(obj4b, obj2b)); - success &= test("!obj4b.equals(obj3a)", !obj4b.equals(obj3a)); - success &= test("!UnoRuntime.areSame(obj4b, obj3a)", - !UnoRuntime.areSame(obj4b, obj3a)); - success &= test("!obj4b.equals(obj3b)", !obj4b.equals(obj3b)); - success &= test("!UnoRuntime.areSame(obj4b, obj3b)", - !UnoRuntime.areSame(obj4b, obj3b)); - success &= test("obj4b.equals(obj4a)", obj4b.equals(obj4a)); - success &= test("UnoRuntime.areSame(obj4b, obj4a)", - UnoRuntime.areSame(obj4b, obj4a)); - success &= test("obj4b.equals(obj4b)", obj4b.equals(obj4b)); - success &= test("UnoRuntime.areSame(obj4b, obj4b)", - UnoRuntime.areSame(obj4b, obj4b)); - - success &= test("obj1a.hashCode() == obj1b.hashCode()", - obj1a.hashCode() == obj1b.hashCode()); - success &= test("obj2a.hashCode() == obj2b.hashCode()", - obj2a.hashCode() == obj2b.hashCode()); - success &= test("obj3a.hashCode() == obj3b.hashCode()", - obj3a.hashCode() == obj3b.hashCode()); - success &= test("obj4a.hashCode() == obj4b.hashCode()", - obj4a.hashCode() == obj4b.hashCode()); - - return success; - } - - private static boolean test(String message, boolean condition) { - if (!condition) { - System.err.println("Failed: " + message); - } - return condition; - } - } - - private static final class Provider implements XInstanceProvider { - - public Object getInstance(String instanceName) { - return new XTransport() { - public Object getType1() { - return new XType1() {}; - } - - public Object getType2() { - return new XType2() {}; - } - }; - } - } - - public interface XTransport extends XInterface { - Object getType1(); - - Object getType2(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("getType1", 0, 0), - new MethodTypeInfo("getType2", 1, 0) }; - } - - public interface XType1 extends XInterface { - TypeInfo[] UNOTYPEINFO = null; - } - - public interface XType2 extends XInterface { - TypeInfo[] UNOTYPEINFO = null; - } -} diff --git a/bridges/test/java_remote/Bug108825_Test.java b/bridges/test/java_remote/Bug108825_Test.java deleted file mode 100644 index 182ae35..0000000 --- a/bridges/test/java_remote/Bug108825_Test.java +++ /dev/null @@ -1,159 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #108825#. - * - * <p>Bug #108825# "Java UNO Remote Bridge: Mapped-out Objects Not Held" shows - * that local objects that are mapped out via a remote bridge, but not held - * locally, might be garbage collected while there are still remote references - * to them. This test is not guaranteed to always work reliably, see comment in - * the code.</p> - */ -public final class Bug108825_Test extends ComplexTestCase { - @Override - public String getTestObjectName() { - return getClass().getName(); - } - - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - TestBed t = new TestBed(); - assure("test", t.execute(new Provider(t), true, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XTest test = UnoRuntime.queryInterface( - XTest.class, getBridge(context).getInstance("Test")); - // Send the XObject that is held on the server side amidst two - // dummies that are not held on the server side; then wait for the - // dummies to be garbage collected, hoping that the XObject, if it - // is erroneously not held on the client side, will be garbage - // collected, too. Obviously, this is not guaranteed to always work - // (the VM might chose not to garbage collect the dummies, hanging - // the test forever; or the VM might chose to garbage collect the - // dummies but not the XObject, making the test pass erroneously). - test.offer(new Dummy(), new XObject() { public void call() {} }, - new Dummy()); - System.out.println("Client waiting for garbage collection..."); - for (;;) { - synchronized (lock) { - if (finalizedCount == 2) { - break; - } - } - test.remoteGc(); - gc(); - } - System.out.println("Client garbage collection done."); - test.notification(); - return true; - } - - private final class Dummy implements XDummy { - @Override - protected void finalize() throws Throwable { - synchronized (lock) { - ++finalizedCount; - } - super.finalize(); - } - } - - private final Object lock = new Object(); - private int finalizedCount = 0; - } - - // Make it as likely as possible that the VM reclaims all garbage: - private static void gc() { - System.gc(); - System.runFinalization(); - byte[] garbage = new byte[1024 * 1024]; - } - - private static final class Provider implements XInstanceProvider { - public Provider(TestBed testBed) { - this.testBed = testBed; - } - - public Object getInstance(String instanceName) { - return new XTest() { - public void offer(XDummy dummy1, XObject obj, XDummy dummy2) - { - this.obj = obj; - } - - public void remoteGc() { - gc(); - } - - public void notification() { - obj.call(); - testBed.serverDone(true); - } - - private XObject obj; - }; - } - - private final TestBed testBed; - } - - public interface XDummy extends XInterface { - TypeInfo[] UNOTYPEINFO = null; - } - - public interface XObject extends XInterface { - void call(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("call", 0, 0) }; - } - - public interface XTest extends XInterface { - void offer(XDummy dummy1, XObject obj, XDummy dummy2); - - void remoteGc(); - - void notification(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("offer", 0, 0), - new MethodTypeInfo("remoteGc", 1, 0), - new MethodTypeInfo("notification", 2, 0) }; - } -} diff --git a/bridges/test/java_remote/Bug110892_Test.java b/bridges/test/java_remote/Bug110892_Test.java deleted file mode 100644 index e43ea5a..0000000 --- a/bridges/test/java_remote/Bug110892_Test.java +++ /dev/null @@ -1,117 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import util.WaitUnreachable; -import test.lib.TestBed; - -/** - * Test case for bug #110892#. - * - * <p>Bug #110892# "Java URP bridge holds objects indefinitely" applies to cases - * where an object is sent from server to client, then recursively back from - * client to server. In such a case, the client should not increment its - * internal reference count for the object, as the server will never send back a - * corresponding release message.</p> - * - * <p>This test has to detect whether the spawned client process fails to - * garbage-collect an object, which can not be done reliably. As an - * approximation, it waits for 10 sec and considers the process failing if it - * has not garbage-collected the object by then.</p> - */ -public final class Bug110892_Test extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure("test", - new TestBed().execute(new Provider(), false, Client.class, - 10000)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XTest test = UnoRuntime.queryInterface( - XTest.class, getBridge(context).getInstance("Test")); - test.start(new ClientObject()); - synchronized (lock) { - unreachable.waitUnreachable(); - } - return true; - } - - private final class ClientObject implements XClientObject { - public void call(XServerObject server, XInterface object) { - synchronized (lock) { - unreachable = new WaitUnreachable(object); - } - server.call(object); - } - } - - private final Object lock = new Object(); - private WaitUnreachable unreachable = null; - } - - private static final class Provider implements XInstanceProvider { - public Object getInstance(String instanceName) { - return new XTest() { - public void start(XClientObject client) { - client.call( - new XServerObject() { - public void call(XInterface object) {} - }, - new XInterface() {}); - } - }; - } - } - - public interface XClientObject extends XInterface { - void call(XServerObject server, XInterface object); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("call", 0, 0) }; - } - - public interface XServerObject extends XInterface { - void call(XInterface object); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("call", 0, 0) }; - } - - public interface XTest extends XInterface { - void start(XClientObject client); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("start", 0, 0) }; - } -} diff --git a/bridges/test/java_remote/Bug111153_Test.java b/bridges/test/java_remote/Bug111153_Test.java deleted file mode 100644 index 8fe8be0..0000000 --- a/bridges/test/java_remote/Bug111153_Test.java +++ /dev/null @@ -1,96 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #111153#. - * - * <P>Bug #111153# "jni_uno bridge sometimes fails to map objects - * correctly" describes that mapping a local object out with type XDerived and - * then mapping it back in with type XBase produces a proxy, instead of - * short-cutting to the local object.</P> - */ -public final class Bug111153_Test extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure("test", new TestBed().execute(new Provider(), false, - Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XTransport t = UnoRuntime.queryInterface( - XTransport.class, getBridge(context).getInstance("Transport")); - XDerived d = new XDerived() {}; - t.setDerived(d); - return t.getBase() == d; - } - } - - private static final class Provider implements XInstanceProvider { - public Object getInstance(String instanceName) { - return new XTransport() { - public synchronized void setDerived(XDerived derived) { - this.derived = derived; - } - - public synchronized XBase getBase() { - return this.derived; - } - - private XDerived derived = null; - }; - } - } - - public interface XBase extends XInterface { - TypeInfo[] UNOTYPEINFO = null; - } - - public interface XDerived extends XBase { - TypeInfo[] UNOTYPEINFO = null; - } - - public interface XTransport extends XInterface { - void setDerived(XDerived derived); - - XBase getBase(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("setDerived", 0, 0), - new MethodTypeInfo("getBase", 1, 0) }; - } -} diff --git a/bridges/test/java_remote/Bug114133_Test.java b/bridges/test/java_remote/Bug114133_Test.java deleted file mode 100644 index 84088839..0000000 --- a/bridges/test/java_remote/Bug114133_Test.java +++ /dev/null @@ -1,69 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import util.WaitUnreachable; -import test.lib.TestBed; - -/** - * Test case for bug #114133#. - * - * <p>Bug #114133# "Java UNO: UnoRuntime.getBride and disposed bridges." The - * client calls UnoRuntime.getBridge to get a bridge to the server, uses the - * bridge, waits until it terminates itself (when all bridged objects have been - * garbage-collected), then calls UnoRuntime.getBridge again. This must return - * a fresh, unterminated bridge.</p> - */ -public final class Bug114133_Test extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure( - "test", - new TestBed().execute(new Provider(), false, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - new WaitUnreachable(getBridge(context).getInstance("Test")). - waitUnreachable(); - new WaitUnreachable(getBridge(context).getInstance("Test")). - waitUnreachable(); - return true; - } - } - - private static final class Provider implements XInstanceProvider { - public Object getInstance(String instanceName) { - return new XInterface() {}; - } - } -} diff --git a/bridges/test/java_remote/Bug51323_Test.java b/bridges/test/java_remote/Bug51323_Test.java deleted file mode 100644 index dc59be6..0000000 --- a/bridges/test/java_remote/Bug51323_Test.java +++ /dev/null @@ -1,76 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XBridgeFactory; -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.connection.Connector; -import com.sun.star.connection.XConnection; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #i51323#. - * - * <p>Bug #i51323# "jurt: BridgeFactory.createBridge creates bridge names." - * Make sure that multiple calls to BridgeFactory.getBridge with empty names - * create different bridges.</p> - */ -public final class Bug51323_Test extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure( - "test", - new TestBed().execute(new Provider(), false, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XConnection connection = - Connector.create(context).connect(getConnectionDescription()); - XBridgeFactory factory = UnoRuntime.queryInterface( - XBridgeFactory.class, - context.getServiceManager().createInstanceWithContext( - "com.sun.star.bridge.BridgeFactory", context)); - return !UnoRuntime.areSame( - factory.createBridge( - "", getProtocolDescription(), connection, null), - factory.createBridge( - "", getProtocolDescription(), connection, null)); - } - } - - private static final class Provider implements XInstanceProvider { - public Object getInstance(String instanceName) { - return new XInterface() {}; - } - } -} diff --git a/bridges/test/java_remote/Bug92174_Test.java b/bridges/test/java_remote/Bug92174_Test.java deleted file mode 100644 index 5ddf4b3..0000000 --- a/bridges/test/java_remote/Bug92174_Test.java +++ /dev/null @@ -1,92 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -public final class Bug92174_Test extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure("test", - new TestBed().execute(new Provider(), false, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XTransport t = UnoRuntime.queryInterface( - XTransport.class, getBridge(context).getInstance("Transport")); - t.setDerived(new XDerived() { - public void fn() {} - }); - t.getBase().fn(); - return true; - } - } - - private static final class Provider implements XInstanceProvider { - public Object getInstance(String instanceName) { - return new XTransport() { - public XBase getBase() { - return derived; - } - - public synchronized void setDerived(XDerived derived) { - this.derived = derived; - } - - private XDerived derived = null; - }; - } - } - - public interface XBase extends XInterface { - void fn(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("fn", 0, 0) }; - } - - public interface XDerived extends XBase { - TypeInfo[] UNOTYPEINFO = null; - } - - public interface XTransport extends XInterface { - XBase getBase(); - - void setDerived(XDerived derived); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("getBase", 0, 0), - new MethodTypeInfo("setDerived", 1, 0) }; - } -} diff --git a/bridges/test/java_remote/Bug97697_Test.java b/bridges/test/java_remote/Bug97697_Test.java deleted file mode 100644 index 233efe1..0000000 --- a/bridges/test/java_remote/Bug97697_Test.java +++ /dev/null @@ -1,99 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lang.DisposedException; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #97697#. - * - * <p>Bug #97697# "GPF in java-uno bridge in bugdoc scenario" shows that sending - * a plain <code>Object</code> as an <code>Any</code> over the URP bridge lead - * to a <code>StackOverflowError</code> on the writer thread, which was silently - * discarded (and the bridge was not disposed).</p> - * - * <p>This test has to detect whether the spawned client process indeed hangs, - * which can not be done reliably. As an approximation, it waits for 10 sec and - * considers the process hanging if it has not completed by then.</p> - */ -public final class Bug97697_Test extends ComplexTestCase { - @Override - public String getTestObjectName() { - return getClass().getName(); - } - - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - TestBed t = new TestBed(); - assure("test", t.execute(new Provider(t), true, Client.class, 10000)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XTransport transport = UnoRuntime.queryInterface( - XTransport.class, getBridge(context).getInstance("Transport")); - try { - transport.getAny(); - } catch (DisposedException e) { - return true; - } - return false; - } - } - - private static final class Provider implements XInstanceProvider { - public Provider(TestBed testBed) { - this.testBed = testBed; - } - - public Object getInstance(String instanceName) { - return new XTransport() { - public Object getAny() { - testBed.serverDone(true); - return new Object(); - } - }; - } - - private final TestBed testBed; - } - - public interface XTransport extends XInterface { - Object getAny(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("getAny", 0, 0) }; - } -} diff --git a/bridges/test/java_remote/Bug98508_Test.idl b/bridges/test/java_remote/Bug98508_Test.idl deleted file mode 100644 index c2636b6..0000000 --- a/bridges/test/java_remote/Bug98508_Test.idl +++ /dev/null @@ -1,31 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <com/sun/star/uno/XInterface.idl> - -module com { module sun { module star { module lib { module uno { -module bridges { module javaremote { - -struct Test98508Struct<T> { T member; }; - -interface Test98508Interface { Test98508Struct<long> get(); }; - -}; }; }; }; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_remote/Bug98508_Test.java b/bridges/test/java_remote/Bug98508_Test.java deleted file mode 100644 index ea0fa7c..0000000 --- a/bridges/test/java_remote/Bug98508_Test.java +++ /dev/null @@ -1,99 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lang.DisposedException; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #98508#. - * - * <p>Bug #98508# "JAVA UNO bridge is not disposed when Exception occurs during - * sendReply()" states that the server returning <code>null</code> instead of a - * valid <code>String</code> from <code>XServiceName.getServiceName</code> - * causes an exception when sending the reply, but this exception did not cause - * the bridge to be disposed, it rather caused both client and server to - * hang.</p> - * - * <p>Since null instead of a <code>String</code> no longer causes an exception - * in the bridge, this test has been redesigned to send a value of a wrong - * instantiated polymorphic struct type instead.</p> - * - * <p>This test has to detect whether the spawned client process indeed hangs, - * which can not be done reliably. As an approximation, it waits for 10 sec and - * considers the process hanging if it has not completed by then.</p> - */ -public final class Bug98508_Test extends ComplexTestCase { - @Override - public String getTestObjectName() { - return getClass().getName(); - } - - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - TestBed t = new TestBed(); - assure("test", t.execute(new Provider(t), true, Client.class, 10000)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - Test98508Interface ifc - = UnoRuntime.queryInterface( - Test98508Interface.class, - getBridge(context).getInstance("")); - try { - ifc.get(); - } catch (DisposedException e) { - return true; - } - return false; - } - } - - private static final class Provider implements XInstanceProvider { - public Provider(TestBed testBed) { - this.testBed = testBed; - } - - public Object getInstance(String instanceName) { - return new Test98508Interface() { - @Override - public Test98508Struct get() { - testBed.serverDone(true); - return new Test98508Struct(Boolean.FALSE); - } - }; - } - - private final TestBed testBed; - } -} diff --git a/bridges/test/java_remote/MethodIdTest.java b/bridges/test/java_remote/MethodIdTest.java deleted file mode 100644 index 212fc3b..0000000 --- a/bridges/test/java_remote/MethodIdTest.java +++ /dev/null @@ -1,466 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.lib.uno.typeinfo.MethodTypeInfo; -import com.sun.star.lib.uno.typeinfo.TypeInfo; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import com.sun.star.uno.XInterface; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -/** - * Test case for bug #111153#. - * - * <P>Bug #111153# "jni_uno bridge sometimes fails to map objects - * correctly" describes that mapping a local object out with type XDerived and - * then mapping it back in with type XBase produces a proxy, instead of - * short-cutting to the local object.</P> - */ -public final class MethodIdTest extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure( - "test", - new TestBed().execute(new Provider(), false, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - XTest t = UnoRuntime.queryInterface( - XTest.class, getBridge(context).getInstance("Test")); - return t.f129() == 129; - } - } - - private static final class Provider implements XInstanceProvider { - public Object getInstance(String instanceName) { - return new XTest() { - public int f0() { return 0; } - public int f1() { return 1; } - public int f2() { return 2; } - public int f3() { return 3; } - public int f4() { return 4; } - public int f5() { return 5; } - public int f6() { return 6; } - public int f7() { return 7; } - public int f8() { return 8; } - public int f9() { return 9; } - public int f10() { return 10; } - public int f11() { return 11; } - public int f12() { return 12; } - public int f13() { return 13; } - public int f14() { return 14; } - public int f15() { return 15; } - public int f16() { return 16; } - public int f17() { return 17; } - public int f18() { return 18; } - public int f19() { return 19; } - public int f20() { return 20; } - public int f21() { return 21; } - public int f22() { return 22; } - public int f23() { return 23; } - public int f24() { return 24; } - public int f25() { return 25; } - public int f26() { return 26; } - public int f27() { return 27; } - public int f28() { return 28; } - public int f29() { return 29; } - public int f30() { return 30; } - public int f31() { return 31; } - public int f32() { return 32; } - public int f33() { return 33; } - public int f34() { return 34; } - public int f35() { return 35; } - public int f36() { return 36; } - public int f37() { return 37; } - public int f38() { return 38; } - public int f39() { return 39; } - public int f40() { return 40; } - public int f41() { return 41; } - public int f42() { return 42; } - public int f43() { return 43; } - public int f44() { return 44; } - public int f45() { return 45; } - public int f46() { return 46; } - public int f47() { return 47; } - public int f48() { return 48; } - public int f49() { return 49; } - public int f50() { return 50; } - public int f51() { return 51; } - public int f52() { return 52; } - public int f53() { return 53; } - public int f54() { return 54; } - public int f55() { return 55; } - public int f56() { return 56; } - public int f57() { return 57; } - public int f58() { return 58; } - public int f59() { return 59; } - public int f60() { return 60; } - public int f61() { return 61; } - public int f62() { return 62; } - public int f63() { return 63; } - public int f64() { return 64; } - public int f65() { return 65; } - public int f66() { return 66; } - public int f67() { return 67; } - public int f68() { return 68; } - public int f69() { return 69; } - public int f70() { return 70; } - public int f71() { return 71; } - public int f72() { return 72; } - public int f73() { return 73; } - public int f74() { return 74; } - public int f75() { return 75; } - public int f76() { return 76; } - public int f77() { return 77; } - public int f78() { return 78; } - public int f79() { return 79; } - public int f80() { return 80; } - public int f81() { return 81; } - public int f82() { return 82; } - public int f83() { return 83; } - public int f84() { return 84; } - public int f85() { return 85; } - public int f86() { return 86; } - public int f87() { return 87; } - public int f88() { return 88; } - public int f89() { return 89; } - public int f90() { return 90; } - public int f91() { return 91; } - public int f92() { return 92; } - public int f93() { return 93; } - public int f94() { return 94; } - public int f95() { return 95; } - public int f96() { return 96; } - public int f97() { return 97; } - public int f98() { return 98; } - public int f99() { return 99; } - public int f100() { return 100; } - public int f101() { return 101; } - public int f102() { return 102; } - public int f103() { return 103; } - public int f104() { return 104; } - public int f105() { return 105; } - public int f106() { return 106; } - public int f107() { return 107; } - public int f108() { return 108; } - public int f109() { return 109; } - public int f110() { return 110; } - public int f111() { return 111; } - public int f112() { return 112; } - public int f113() { return 113; } - public int f114() { return 114; } - public int f115() { return 115; } - public int f116() { return 116; } - public int f117() { return 117; } - public int f118() { return 118; } - public int f119() { return 119; } - public int f120() { return 120; } - public int f121() { return 121; } - public int f122() { return 122; } - public int f123() { return 123; } - public int f124() { return 124; } - public int f125() { return 125; } - public int f126() { return 126; } - public int f127() { return 127; } - public int f128() { return 128; } - public int f129() { return 129; } - public int f130() { return 130; } - }; - } - } - - public interface XTest extends XInterface { - int f0(); - int f1(); - int f2(); - int f3(); - int f4(); - int f5(); - int f6(); - int f7(); - int f8(); - int f9(); - int f10(); - int f11(); - int f12(); - int f13(); - int f14(); - int f15(); - int f16(); - int f17(); - int f18(); - int f19(); - int f20(); - int f21(); - int f22(); - int f23(); - int f24(); - int f25(); - int f26(); - int f27(); - int f28(); - int f29(); - int f30(); - int f31(); - int f32(); - int f33(); - int f34(); - int f35(); - int f36(); - int f37(); - int f38(); - int f39(); - int f40(); - int f41(); - int f42(); - int f43(); - int f44(); - int f45(); - int f46(); - int f47(); - int f48(); - int f49(); - int f50(); - int f51(); - int f52(); - int f53(); - int f54(); - int f55(); - int f56(); - int f57(); - int f58(); - int f59(); - int f60(); - int f61(); - int f62(); - int f63(); - int f64(); - int f65(); - int f66(); - int f67(); - int f68(); - int f69(); - int f70(); - int f71(); - int f72(); - int f73(); - int f74(); - int f75(); - int f76(); - int f77(); - int f78(); - int f79(); - int f80(); - int f81(); - int f82(); - int f83(); - int f84(); - int f85(); - int f86(); - int f87(); - int f88(); - int f89(); - int f90(); - int f91(); - int f92(); - int f93(); - int f94(); - int f95(); - int f96(); - int f97(); - int f98(); - int f99(); - int f100(); - int f101(); - int f102(); - int f103(); - int f104(); - int f105(); - int f106(); - int f107(); - int f108(); - int f109(); - int f110(); - int f111(); - int f112(); - int f113(); - int f114(); - int f115(); - int f116(); - int f117(); - int f118(); - int f119(); - int f120(); - int f121(); - int f122(); - int f123(); - int f124(); - int f125(); - int f126(); - int f127(); - int f128(); - int f129(); - int f130(); - - TypeInfo[] UNOTYPEINFO = { new MethodTypeInfo("f0", 0, 0), - new MethodTypeInfo("f1", 1, 0), - new MethodTypeInfo("f2", 2, 0), - new MethodTypeInfo("f3", 3, 0), - new MethodTypeInfo("f4", 4, 0), - new MethodTypeInfo("f5", 5, 0), - new MethodTypeInfo("f6", 6, 0), - new MethodTypeInfo("f7", 7, 0), - new MethodTypeInfo("f8", 8, 0), - new MethodTypeInfo("f9", 9, 0), - new MethodTypeInfo("f10", 10, 0), - new MethodTypeInfo("f11", 11, 0), - new MethodTypeInfo("f12", 12, 0), - new MethodTypeInfo("f13", 13, 0), - new MethodTypeInfo("f14", 14, 0), - new MethodTypeInfo("f15", 15, 0), - new MethodTypeInfo("f16", 16, 0), - new MethodTypeInfo("f17", 17, 0), - new MethodTypeInfo("f18", 18, 0), - new MethodTypeInfo("f19", 19, 0), - new MethodTypeInfo("f20", 20, 0), - new MethodTypeInfo("f21", 21, 0), - new MethodTypeInfo("f22", 22, 0), - new MethodTypeInfo("f23", 23, 0), - new MethodTypeInfo("f24", 24, 0), - new MethodTypeInfo("f25", 25, 0), - new MethodTypeInfo("f26", 26, 0), - new MethodTypeInfo("f27", 27, 0), - new MethodTypeInfo("f28", 28, 0), - new MethodTypeInfo("f29", 29, 0), - new MethodTypeInfo("f30", 30, 0), - new MethodTypeInfo("f31", 31, 0), - new MethodTypeInfo("f32", 32, 0), - new MethodTypeInfo("f33", 33, 0), - new MethodTypeInfo("f34", 34, 0), - new MethodTypeInfo("f35", 35, 0), - new MethodTypeInfo("f36", 36, 0), - new MethodTypeInfo("f37", 37, 0), - new MethodTypeInfo("f38", 38, 0), - new MethodTypeInfo("f39", 39, 0), - new MethodTypeInfo("f40", 40, 0), - new MethodTypeInfo("f41", 41, 0), - new MethodTypeInfo("f42", 42, 0), - new MethodTypeInfo("f43", 43, 0), - new MethodTypeInfo("f44", 44, 0), - new MethodTypeInfo("f45", 45, 0), - new MethodTypeInfo("f46", 46, 0), - new MethodTypeInfo("f47", 47, 0), - new MethodTypeInfo("f48", 48, 0), - new MethodTypeInfo("f49", 49, 0), - new MethodTypeInfo("f50", 50, 0), - new MethodTypeInfo("f51", 51, 0), - new MethodTypeInfo("f52", 52, 0), - new MethodTypeInfo("f53", 53, 0), - new MethodTypeInfo("f54", 54, 0), - new MethodTypeInfo("f55", 55, 0), - new MethodTypeInfo("f56", 56, 0), - new MethodTypeInfo("f57", 57, 0), - new MethodTypeInfo("f58", 58, 0), - new MethodTypeInfo("f59", 59, 0), - new MethodTypeInfo("f60", 60, 0), - new MethodTypeInfo("f61", 61, 0), - new MethodTypeInfo("f62", 62, 0), - new MethodTypeInfo("f63", 63, 0), - new MethodTypeInfo("f64", 64, 0), - new MethodTypeInfo("f65", 65, 0), - new MethodTypeInfo("f66", 66, 0), - new MethodTypeInfo("f67", 67, 0), - new MethodTypeInfo("f68", 68, 0), - new MethodTypeInfo("f69", 69, 0), - new MethodTypeInfo("f70", 70, 0), - new MethodTypeInfo("f71", 71, 0), - new MethodTypeInfo("f72", 72, 0), - new MethodTypeInfo("f73", 73, 0), - new MethodTypeInfo("f74", 74, 0), - new MethodTypeInfo("f75", 75, 0), - new MethodTypeInfo("f76", 76, 0), - new MethodTypeInfo("f77", 77, 0), - new MethodTypeInfo("f78", 78, 0), - new MethodTypeInfo("f79", 79, 0), - new MethodTypeInfo("f80", 80, 0), - new MethodTypeInfo("f81", 81, 0), - new MethodTypeInfo("f82", 82, 0), - new MethodTypeInfo("f83", 83, 0), - new MethodTypeInfo("f84", 84, 0), - new MethodTypeInfo("f85", 85, 0), - new MethodTypeInfo("f86", 86, 0), - new MethodTypeInfo("f87", 87, 0), - new MethodTypeInfo("f88", 88, 0), - new MethodTypeInfo("f89", 89, 0), - new MethodTypeInfo("f90", 90, 0), - new MethodTypeInfo("f91", 91, 0), - new MethodTypeInfo("f92", 92, 0), - new MethodTypeInfo("f93", 93, 0), - new MethodTypeInfo("f94", 94, 0), - new MethodTypeInfo("f95", 95, 0), - new MethodTypeInfo("f96", 96, 0), - new MethodTypeInfo("f97", 97, 0), - new MethodTypeInfo("f98", 98, 0), - new MethodTypeInfo("f99", 99, 0), - new MethodTypeInfo("f100", 100, 0), - new MethodTypeInfo("f101", 101, 0), - new MethodTypeInfo("f102", 102, 0), - new MethodTypeInfo("f103", 103, 0), - new MethodTypeInfo("f104", 104, 0), - new MethodTypeInfo("f105", 105, 0), - new MethodTypeInfo("f106", 106, 0), - new MethodTypeInfo("f107", 107, 0), - new MethodTypeInfo("f108", 108, 0), - new MethodTypeInfo("f109", 109, 0), - new MethodTypeInfo("f110", 110, 0), - new MethodTypeInfo("f111", 111, 0), - new MethodTypeInfo("f112", 112, 0), - new MethodTypeInfo("f113", 113, 0), - new MethodTypeInfo("f114", 114, 0), - new MethodTypeInfo("f115", 115, 0), - new MethodTypeInfo("f116", 116, 0), - new MethodTypeInfo("f117", 117, 0), - new MethodTypeInfo("f118", 118, 0), - new MethodTypeInfo("f119", 119, 0), - new MethodTypeInfo("f120", 120, 0), - new MethodTypeInfo("f121", 121, 0), - new MethodTypeInfo("f122", 122, 0), - new MethodTypeInfo("f123", 123, 0), - new MethodTypeInfo("f124", 124, 0), - new MethodTypeInfo("f125", 125, 0), - new MethodTypeInfo("f126", 126, 0), - new MethodTypeInfo("f127", 127, 0), - new MethodTypeInfo("f128", 128, 0), - new MethodTypeInfo("f129", 129, 0), - new MethodTypeInfo("f130", 130, 0) }; - } -} diff --git a/bridges/test/java_remote/PolyStructTest.idl b/bridges/test/java_remote/PolyStructTest.idl deleted file mode 100644 index ec9977c..0000000 --- a/bridges/test/java_remote/PolyStructTest.idl +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 . - */ - -#include <com/sun/star/uno/XInterface.idl> - -module com { module sun { module star { module lib { module uno { -module bridges { module javaremote { - -enum TestEnum { VALUE1 = 100, VALUE2 = -100 }; - -struct TestPolyStruct<T> { T member; }; - -interface TestTransport { - TestPolyStruct<boolean> transportBoolean([in] TestPolyStruct<boolean> arg); - TestPolyStruct<byte> transportByte([in] TestPolyStruct<byte> arg); - TestPolyStruct<short> transportShort([in] TestPolyStruct<short> arg); - TestPolyStruct<long> transportLong([in] TestPolyStruct<long> arg); - TestPolyStruct<hyper> transportHyper([in] TestPolyStruct<hyper> arg); - TestPolyStruct<float> transportFloat([in] TestPolyStruct<float> arg); - TestPolyStruct<double> transportDouble([in] TestPolyStruct<double> arg); - TestPolyStruct<char> transportChar([in] TestPolyStruct<char> arg); - TestPolyStruct<string> transportString([in] TestPolyStruct<string> arg); - TestPolyStruct<type> transportType([in] TestPolyStruct<type> arg); - TestPolyStruct<any> transportAny([in] TestPolyStruct<any> arg); - TestPolyStruct<TestEnum> transportEnum([in] TestPolyStruct<TestEnum> arg); -}; - -}; }; }; }; }; }; }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/bridges/test/java_remote/PolyStructTest.java b/bridges/test/java_remote/PolyStructTest.java deleted file mode 100644 index bf4fdf5..0000000 --- a/bridges/test/java_remote/PolyStructTest.java +++ /dev/null @@ -1,247 +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 . - */ - -package test.java_remote; - -import com.sun.star.bridge.XInstanceProvider; -import com.sun.star.uno.Any; -import com.sun.star.uno.Type; -import com.sun.star.uno.UnoRuntime; -import com.sun.star.uno.XComponentContext; -import complexlib.ComplexTestCase; -import test.lib.TestBed; - -public final class PolyStructTest extends ComplexTestCase { - @Override - public String[] getTestMethodNames() { - return new String[] { "test" }; - } - - public void test() throws Exception { - assure( - "test", - new TestBed().execute(new Provider(), false, Client.class, 0)); - } - - public static final class Client extends TestBed.Client { - public static void main(String[] args) { - new Client().execute(); - } - - @Override - protected boolean run(XComponentContext context) throws Throwable { - TestTransport t = UnoRuntime.queryInterface( - TestTransport.class, getBridge(context).getInstance("")); - - assertEquals( - Boolean.FALSE, t.transportBoolean(new TestPolyStruct()).member); - assertEquals( - Boolean.FALSE, - t.transportBoolean(new TestPolyStruct(Boolean.FALSE)).member); - assertEquals( - Boolean.TRUE, - t.transportBoolean(new TestPolyStruct(Boolean.TRUE)).member); - - assertEquals( - Byte.valueOf((byte) 0), - t.transportByte(new TestPolyStruct()).member); - assertEquals( - Byte.valueOf(Byte.MIN_VALUE), - t.transportByte( - new TestPolyStruct(Byte.valueOf(Byte.MIN_VALUE))).member); - assertEquals( - Byte.valueOf(Byte.MAX_VALUE), - t.transportByte( - new TestPolyStruct(Byte.valueOf(Byte.MAX_VALUE))).member); - - assertEquals( - Short.valueOf((short) 0), - t.transportShort(new TestPolyStruct()).member); - assertEquals( - Short.valueOf(Short.MIN_VALUE), - t.transportShort( - new TestPolyStruct(Short.valueOf(Short.MIN_VALUE))).member); - assertEquals( - Short.valueOf(Short.MAX_VALUE), - t.transportShort( - new TestPolyStruct(Short.valueOf(Short.MAX_VALUE))).member); - - assertEquals( - Integer.valueOf(0), t.transportLong(new TestPolyStruct()).member); - assertEquals( - Integer.valueOf(Integer.MIN_VALUE), - t.transportLong( - new TestPolyStruct(Integer.valueOf(Integer.MIN_VALUE))).member); - assertEquals( - Integer.valueOf(Integer.MAX_VALUE), - t.transportLong( - new TestPolyStruct(Integer.valueOf(Integer.MAX_VALUE))).member); - - assertEquals( - Long.valueOf(0L), t.transportHyper(new TestPolyStruct()).member); - assertEquals( - Long.valueOf(Long.MIN_VALUE), - t.transportHyper( - new TestPolyStruct(Long.valueOf(Long.MIN_VALUE))).member); - assertEquals( - Long.valueOf(Long.MAX_VALUE), - t.transportHyper( - new TestPolyStruct(Long.valueOf(Long.MAX_VALUE))).member); - - assertEquals( - new Float(0.0f), t.transportFloat(new TestPolyStruct()).member); - assertEquals( - new Float(Float.MIN_VALUE), - t.transportFloat( - new TestPolyStruct(new Float(Float.MIN_VALUE))).member); - assertEquals( - new Float(Float.MAX_VALUE), - t.transportFloat( - new TestPolyStruct(new Float(Float.MAX_VALUE))).member); - - assertEquals( - new Double(0.0), - t.transportDouble(new TestPolyStruct()).member); - assertEquals( - new Double(Double.MIN_VALUE), - t.transportDouble( - new TestPolyStruct(new Double(Double.MIN_VALUE))).member); - assertEquals( - new Double(Double.MAX_VALUE), - t.transportDouble( - new TestPolyStruct(new Double(Double.MAX_VALUE))).member); - - assertEquals( - new Character(Character.MIN_VALUE), - t.transportChar(new TestPolyStruct()).member); - assertEquals( - new Character(Character.MIN_VALUE), - t.transportChar( - new TestPolyStruct( - new Character(Character.MIN_VALUE))).member); - assertEquals( - new Character(Character.MAX_VALUE), - t.transportChar( - new TestPolyStruct( - new Character(Character.MAX_VALUE))).member); - - assertEquals("", t.transportString(new TestPolyStruct()).member); - assertEquals( - "ABC", t.transportString(new TestPolyStruct("ABC")).member); - - assertEquals( - Type.VOID, t.transportType(new TestPolyStruct()).member); - assertEquals( - new Type( - "[]com.sun.star.lib.uno.bridges.javaremote.TestPolyStruct" - + "<long>"), - t.transportType( - new TestPolyStruct( - new Type( - "[]com.sun.star.lib.uno.bridges.javaremote." - + "TestPolyStruct<long>"))).member); - - assertEquals(null, t.transportAny(new TestPolyStruct()).member); - assertEquals( - Any.VOID, t.transportAny(new TestPolyStruct(Any.VOID)).member); - assertEquals(null, t.transportAny(new TestPolyStruct(null)).member); - assertEquals( - new Any(Type.UNSIGNED_LONG, Integer.valueOf(5)), - t.transportAny( - new TestPolyStruct( - new Any(Type.UNSIGNED_LONG, Integer.valueOf(5)))).member); - - assertEquals( - TestEnum.VALUE1, t.transportEnum(new TestPolyStruct()).member); - assertEquals( - TestEnum.VALUE1, - t.transportEnum(new TestPolyStruct(TestEnum.VALUE1)).member); - assertEquals( - TestEnum.VALUE2, - t.transportEnum(new TestPolyStruct(TestEnum.VALUE2)).member); - - return success; - } - - private void assertEquals(Object expected, Object actual) { - if (!(expected == null ? actual == null : expected.equals(actual))) - { - new RuntimeException( - "failed; expected " + expected + ", got " + actual). - printStackTrace(); - success = false; - } - } - - private boolean success = true; - } - - private static final class Provider implements XInstanceProvider { ... etc. - the rest is truncated
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits