*** empty log message ***

7 files changed, 2214 insertions, 0 deletions

diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java b/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
new file mode 100644
index 000000000000..7050d898060e
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/AWeakBase.java
@@ -0,0 +1,84 @@
+/*************************************************************************
+ *
+ *  $RCSfile: AWeakBase.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.lib.uno.helper;
+import com.sun.star.lang.XEventListener;
+
+
+public class AWeakBase extends WeakBase implements XEventListener
+{
+    public int nDisposingCalled= 0;
+
+    public AWeakBase(int i)
+    {
+    }
+    public AWeakBase()
+    {
+    }
+
+    public void disposing(com.sun.star.lang.EventObject eventObject)
+    {
+//        System.out.println(getClass().getName() + " .disposing called");
+        nDisposingCalled++;
+    }
+
+}
+
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
new file mode 100644
index 000000000000..982c8ed3e9bf
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ComponentBase_Test.java
@@ -0,0 +1,188 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ComponentBase_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.lib.uno.helper;
+import com.sun.star.uno.XWeak;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.lang.XEventListener;
+
+public class ComponentBase_Test
+{
+    AWeakBase obj1, obj2, obj3;
+    Object proxyObj1Weak1;
+    Object proxyObj3Weak1;
+    Object proxyObj3Weak2;
+    Object proxyObj3TypeProv;
+    Object proxyObj2TypeProv;
+
+    /** Creates a new instance of ComponentBase_Test */
+    public ComponentBase_Test()
+    {
+        obj1= new AWeakBase();
+        obj2= new AWeakBase();
+        obj3= new AWeakBase();
+        proxyObj1Weak1= ProxyProvider.getHolderProxy(obj1, XWeak.class);
+        proxyObj3Weak1= ProxyProvider.getHolderProxy(obj3, XWeak.class);
+        proxyObj3Weak2= ProxyProvider.getHolderProxy(obj3, XWeak.class);
+        proxyObj2TypeProv= ProxyProvider.getHolderProxy(obj2, XTypeProvider.class);
+        proxyObj3TypeProv= ProxyProvider.getHolderProxy(obj3, XTypeProvider.class);
+
+    }
+
+    public boolean dispose()
+    {
+        System.out.println("Testing ComponentBase");
+        ComponentBase comp= new ComponentBase();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        // addEventListener
+
+        comp.addEventListener(obj1);
+        comp.addEventListener(obj2);
+        comp.addEventListener(obj3);
+        comp.addEventListener((XEventListener) UnoRuntime.queryInterface(XEventListener.class, proxyObj1Weak1));
+        comp.addEventListener((XEventListener) UnoRuntime.queryInterface(XEventListener.class, proxyObj3Weak2));
+        comp.addEventListener((XEventListener) UnoRuntime.queryInterface(XEventListener.class, proxyObj3TypeProv));
+        obj1.nDisposingCalled = 0;
+        obj2.nDisposingCalled = 0;
+        obj3.nDisposingCalled = 0;
+
+        comp.dispose();
+        r[i++]= obj1.nDisposingCalled == 1;
+        r[i++]= obj2.nDisposingCalled == 1;
+        r[i++]= obj3.nDisposingCalled == 1;
+        // adding a listener after dispose, causes a immediate call to the listerner
+        obj1.nDisposingCalled= 0;
+        comp.addEventListener(obj1);
+        r[i++]= obj1.nDisposingCalled == 1;
+        //calling dispose again must not notify the listeners again
+        obj1.nDisposingCalled= 0;
+        obj2.nDisposingCalled= 0;
+        obj3.nDisposingCalled= 0;
+        comp.dispose(); // allready disposed;
+        r[i++]= obj1.nDisposingCalled == 0;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean test_finalize()
+    {
+        System.out.println("Testing ComponentBase");
+        ComponentBase comp= new ComponentBase();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        obj1.nDisposingCalled = 0;
+        comp.addEventListener(obj1);
+
+        comp= null;
+        System.out.println("Waiting 10s");
+        for(int c= 0; c < 100; c++)
+        {
+            try
+            {
+                Thread.currentThread().sleep(100);
+                System.gc();
+                System.runFinalization();
+            }catch (InterruptedException ie)
+            {
+            }
+        }
+        r[i++]= obj1.nDisposingCalled == 1;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public static void main(String[] args)
+    {
+        ComponentBase_Test test= new ComponentBase_Test();
+
+        boolean r[]= new boolean[50];
+        int i= 0;
+        r[i++]= test.dispose();
+        r[i++]= test.test_finalize();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Errors occured!");
+        else
+            System.out.println("No errors.");
+
+    }
+
+}
+
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
new file mode 100644
index 000000000000..b9c989e12f03
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/InterfaceContainer_Test.java
@@ -0,0 +1,1027 @@
+/*************************************************************************
+ *
+ *  $RCSfile: InterfaceContainer_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.lib.uno.helper;
+
+import com.sun.star.uno.XInterface;
+import java.util.Iterator;
+import java.util.ListIterator;
+import com.sun.star.uno.Type;
+import com.sun.star.uno.XWeak;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.lang.XEventListener;
+import java.util.ArrayList;
+import com.sun.star.lang.XMultiComponentFactory;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.comp.helper.Bootstrap;
+import com.sun.star.bridge.XUnoUrlResolver;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XSingleServiceFactory;
+import com.sun.star.uno.IQueryInterface;
+import com.sun.star.lib.uno.environments.java.IRequester;
+import com.sun.star.bridge.XBridge;
+import com.sun.star.lib.uno.environments.java.Proxy;
+import com.sun.star.lib.uno.environments.java.java_environment;
+import com.sun.star.lib.uno.typedesc.TypeDescription;
+import java.util.HashMap;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class InterfaceContainer_Test
+{
+    java_environment env= new java_environment(null);
+    /** Creates a new instance of InterfaceContainerTest */
+    AWeakBase obj1,obj2,obj3,obj4;
+    Object proxyObj1Weak1;
+    Object proxyObj3Weak1;
+    Object proxyObj3Weak2;
+    Object proxyObj3TypeProv;
+    Object proxyObj2TypeProv;
+    //contains original objects
+    List list1;
+    //contains original objects + proxies
+    List list2;
+    //contains original object + proxies + null value
+    List list3;
+
+    public InterfaceContainer_Test()
+    {
+        obj1= new AWeakBase();
+        obj2= new AWeakBase();
+        obj3= new AWeakBase();
+        obj4= new AWeakBase();
+        proxyObj1Weak1= ProxyProvider.getHolderProxy(obj1, XWeak.class);
+        proxyObj3Weak1= ProxyProvider.getHolderProxy(obj3, XWeak.class);
+        proxyObj3Weak2= ProxyProvider.getHolderProxy(obj3, XWeak.class);
+        proxyObj2TypeProv= ProxyProvider.getHolderProxy(obj2, XTypeProvider.class);
+        proxyObj3TypeProv= ProxyProvider.getHolderProxy(obj3, XTypeProvider.class);
+
+        list1= new ArrayList();
+        list1.add(obj1);
+        list1.add(obj2);
+        list1.add(obj3);
+        list2= new ArrayList();
+        list2.add(obj1);
+        list2.add(proxyObj2TypeProv);
+        list2.add(proxyObj3TypeProv);
+        list3= new ArrayList();
+        list3.add(obj1);
+        list3.add(null);
+        list3.add(proxyObj2TypeProv);
+        list3.add(proxyObj3Weak1);
+    }
+
+    /** Tests add(object), size(), clear();
+     */
+    public boolean add()
+    {
+        System.out.println("Testing List.add(Object), List.size(), List.clear(), List.isEmpty()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        r[i++]= cont.size() == 0;
+        r[i++]= cont.add(obj1);
+        r[i++]= cont.size() == 1;
+        r[i++]= cont.add(obj1); // add the same object again
+        r[i++]= cont.size() == 2;
+        r[i++]= cont.add(proxyObj3TypeProv);
+        r[i++]= cont.size() == 3;
+        r[i++]= cont.isEmpty() ? false: true;
+        cont.clear();
+        r[i++]= cont.size() == 0;
+        r[i++]= cont.isEmpty();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    /**Tests list.addAll(Collection c), list.addAll(int index, Collection c)
+     */
+    public boolean listConstructors()
+    {
+        System.out.println("Testing Constructors of InterfaceContainer");
+        boolean r[]= new boolean[50];
+        int i= 0;
+        InterfaceContainer cont= new InterfaceContainer(100);
+
+        r[i++]= cont.elementData.length == 100;
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    public boolean trimToSize()
+    {
+        System.out.println("Testing InterfaceContainer.trimToSize");
+        InterfaceContainer cont= new InterfaceContainer(100);
+        boolean r[]= new boolean[50];
+        int i= 0;
+        cont.trimToSize();
+        r[i++]= cont.isEmpty();
+        cont= new InterfaceContainer(10);
+        cont.addAll(list1);
+        cont.trimToSize();
+        r[i++]= cont.elementData.length == list1.size();
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    public boolean ensureCapacity()
+    {
+        System.out.println("Testing InterfaceContainer.ensureCapacity");
+        InterfaceContainer cont= new InterfaceContainer(10);
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.ensureCapacity(9);
+        r[i++]= cont.elementData.length >= 9;
+        cont.ensureCapacity(11);
+        r[i++]= cont.elementData.length >= 11;
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean addAll()
+    {
+        System.out.println("Testing List.addAll(Collection c), List.addAll(int index, Collection c)");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        r[i++]= cont.addAll(list1);
+        r[i++]= cont.size() == list1.size();
+        for (int c= 0; c < cont.size(); c++)
+        {
+            r[i++]= list1.get(c) == cont.get(c);
+        }
+        cont.add(obj1);
+        r[i++]= cont.addAll(1, list2);
+        r[i++]= cont.get(0) == list1.get(0);
+        r[i++]= cont.get(1) == list2.get(0);
+        r[i++]= cont.get(2) == list2.get(1);
+        r[i++]= cont.get(3) == list2.get(2);
+        r[i++]= cont.get(4) == list1.get(1);
+        r[i++]= cont.get(5) == list1.get(2);
+        r[i++]= cont.get(6) == obj1;
+        cont.clear();
+        cont.addAll(list3);
+        // the null element in list3 at index 1 is not added to cont
+        r[i++]= cont.get(0) == list3.get(0);
+        r[i++]= cont.get(1) == list3.get(2);
+        r[i++]= cont.get(2) == list3.get(3);
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    /** Tests List.add(int index, Object element), List.get(int index)
+     */
+    public boolean get()
+    {
+        System.out.println("Testing List.add(int index, Object element), List.get(int index)");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.add(0, obj1);
+        cont.add(1, obj2);
+        cont.add(1, proxyObj3Weak1);
+        cont.add(3, obj3);
+        r[i++]= cont.get(0) == obj1;
+        r[i++]= cont.get(1) == proxyObj3Weak1;
+        r[i++]= cont.get(2) == obj2;
+        r[i++]= cont.get(3) == obj3;
+        try
+        {
+            cont.add(5, obj1);
+        }catch( java.lang.Exception e)
+        {
+            r[i++]= true;
+        }
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    /** Tests List.contains
+     */
+    public boolean contains()
+    {
+        System.out.println("Testing List.contains()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        r[i++]= cont.contains(obj1) ? false : true; // nothing in the list
+        cont.add(obj1);
+        cont.add(proxyObj2TypeProv);
+        cont.add(proxyObj3TypeProv);
+        r[i++]= cont.contains(obj1);
+        // can return false. cont contains a HolderProxy (proxyObj2TypeProv) for obj2 but in reality a VM will not
+        // contain both the original object and proxies for it.
+        r[i++]= cont.contains(obj2) ? false : true;
+        r[i++]= cont.contains(proxyObj3Weak1);
+        r[i++]= cont.contains(proxyObj3Weak2);
+        r[i++]= cont.contains(proxyObj1Weak1) ? false : true;
+        r[i++]= cont.contains(obj3) ? false : true;
+        r[i++]= cont.contains(null) ? false : true;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    /** Tests List.containsAll
+     */
+    public boolean containsAll()
+    {
+        System.out.println("Testing List.containsAll");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        cont.addAll(list1);
+        r[i++]= cont.containsAll(list1);
+        cont.clear();
+        cont.addAll(list2);
+        r[i++]= cont.containsAll(list2);
+        cont.clear();
+        cont.addAll(list3); // the null element in list3 is not added to cont
+        r[i++]= cont.containsAll(list3) ? false : true;
+        cont.clear();
+        for( int x= 0; x < 6; x++)
+            cont.add(obj4);
+        r[i++]= cont.contains(list1) ? false : true;
+        cont.add(1, list1.get(0));
+        cont.add(3, list1.get(1));
+        cont.add(5, list1.get(2));
+        r[i++]= cont.contains(list1) ? false : true;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    /** Tests List.indexOf, List.lastIndexOf
+     */
+    public boolean indexOf()
+    {
+        System.out.println("Testing List.indexOf(Object element), List.lastIndexOf(Object element)");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        cont.addAll(list1);
+        cont.addAll(list1);
+        r[i++]= cont.indexOf(obj3) == 2;
+        r[i++]= cont.lastIndexOf(obj3) == 5;
+        cont.clear();
+        cont.addAll(list2);
+        cont.addAll(list2);
+        r[i++]= cont.indexOf(proxyObj3Weak1) == 2;
+        r[i++]= cont.lastIndexOf(proxyObj3Weak2) == 5;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    /** Tests List.remove(int index), List.remove(Object element), List.removeAll(Collection c)
+     */
+    public boolean remove()
+    {
+        System.out.println("Testing List.remove(int index), List.remove(Object element), List.removeAll(Collection c)");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.addAll(list2);
+        r[i++]=  proxyObj2TypeProv.equals(cont.remove(1));
+        r[i++]= cont.size() == 2;
+        cont.clear();
+        cont.addAll(list2);
+        r[i++]= cont.remove(obj1);
+        r[i++]= cont.remove(proxyObj2TypeProv);
+        r[i++]= cont.remove(proxyObj3Weak2);
+        r[i++]= cont.isEmpty();
+        cont.clear();
+        cont.addAll(list3);
+        r[i++]= cont.removeAll(list3);
+        r[i++]= cont.isEmpty();
+        cont.addAll(list2);
+
+        List list= new ArrayList();
+        list.add(list2.get(0));
+        list.add(list2.get(1));
+        list.add(proxyObj3Weak2);
+        r[i++]= cont.removeAll(list);
+        r[i++]= cont.isEmpty();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    /** Tests List.retainAll
+     */
+    public boolean retainAll()
+    {
+        System.out.println("Testing List.retainAll(Collection c)");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.addAll(list1); //obj1, obj2, obj3
+        cont.addAll(list2); //obj1, proxyObj2TypeProv, proxyObj3TypeProv
+        List list = new ArrayList();
+        list.add(obj1);
+        list.add(proxyObj3Weak1);
+
+        r[i++]= cont.retainAll(list);
+        r[i++]= cont.get(0) == obj1;
+        r[i++]= cont.get(1) == obj1;
+        r[i++]= cont.get(2) == proxyObj3TypeProv;
+        r[i++]= 3 == cont.size();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    /** Tests List.set(int index, Object element)
+     **/
+    public boolean set()
+    {
+        System.out.println("Testing List.set(int index, Object element)");
+        boolean r[]= new boolean[50];
+        int i= 0;
+        InterfaceContainer cont= new InterfaceContainer();
+        cont.addAll(list2);
+        Object o1= cont.set(0, obj3);
+        Object o2= cont.set(2, proxyObj3Weak1);
+        r[i++]= o1 == list2.get(0);
+        r[i++]= o2 == list2.get(2);
+        r[i++]= cont.get(0) == obj3;
+        r[i++]= cont.get(2) == proxyObj3Weak1;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    /** Tests List.toArray(), List.toArray(Object[] a)
+     */
+    public boolean toArray()
+    {
+        System.out.println("Testing List.toArray(), List.toArray(Object[] a)");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.addAll(list1);
+        Object[] ar= cont.toArray();
+        Object[] arOrig= list1.toArray();
+        r[i++]= ar.length == arOrig.length;
+
+        r[i]= true;
+        for (int c= 0; c < ar.length; c++)
+            r[i]= r[i] && ar[c] == arOrig[c];
+
+        i++;
+        XWeak[] arWeak= new XWeak[3];
+        XWeak[] arWeak2= (XWeak[])cont.toArray(arWeak);
+        r[i++]= ar.length == arWeak2.length;
+        r[i]= true;
+        for (int c= 0; c < ar.length; c++)
+            r[i]= r[i] && ar[c] == arWeak2[c];
+
+        i++;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean Iterator_next()
+    {
+        System.out.println("Testing InterfaceContainer.iterator, Iterator.next()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.addAll(list1);
+        Iterator it= cont.iterator();
+        r[i++]= it.next() == list1.get(0);
+        r[i++]= it.next() == list1.get(1);
+        r[i++]= it.next() == list1.get(2);
+        try
+        {
+            it.next();
+        }catch(java.util.NoSuchElementException ne)
+        {
+            r[i++]= true;
+        }catch(Exception e)
+        {
+            r[i++]= false;
+        }
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean Iterator_hasNext()
+    {
+        System.out.println("Testing, Iterator.next()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        Iterator it= cont.iterator();
+        r[i++]= ! it.hasNext();
+        cont.addAll(list1);
+        it= cont.iterator();
+        r[i++]= it.hasNext();
+        it.next();
+        r[i++]= it.hasNext();
+        it.next();
+        r[i++]= it.hasNext();
+        it.next();
+        r[i++]= ! it.hasNext();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean Iterator_remove()
+    {
+        System.out.println("Testing, Iterator.remove()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        Iterator it= cont.iterator();
+        try
+        {
+            it.remove();
+        }
+        catch( IllegalStateException ie)
+        {
+            r[i++]= true;
+        }
+        catch(java.lang.Exception e)
+        {
+            r[i++]= false;
+        }
+        cont.add(obj1);
+        it= cont.iterator();
+        it.next();
+        it.remove();
+        r[i++]= cont.isEmpty();
+        try
+        {
+            it.remove();
+        }
+        catch (IllegalStateException ie)
+        {
+            r[i++]= true;
+        }
+        catch (Exception e)
+        {
+            r[i++]= false;
+        }
+        cont.clear();
+        cont.addAll(list1);
+        it= cont.iterator();
+        while (it.hasNext())
+        {
+            it.next();
+            it.remove();
+        }
+        r[i++]= cont.isEmpty();
+
+        // 2 iterators, remove must not impair the other iterator
+        cont.clear();
+        cont.addAll(list1);
+        int size= cont.size();
+        it= cont.iterator();
+        Iterator it2= cont.iterator();
+        while (it.hasNext())
+        {
+            it.next();
+            it.remove();
+        }
+        try
+        {
+            for( int c= 0; c < size; c++)
+                it2.next();
+            r[i++]= true;
+        }
+        catch(Exception e)
+        {
+            r[i++]= false;
+        }
+        r[i++]= cont.size() == 0;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    public boolean ListIterator_next()
+    {
+        System.out.println("Testing InterfaceContainer.listIerator, ListIterator.next()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.addAll(list1);
+        Iterator it= cont.listIterator();
+        r[i++]= it.next() == list1.get(0);
+        r[i++]= it.next() == list1.get(1);
+        r[i++]= it.next() == list1.get(2);
+        try
+        {
+            it.next();
+        }catch(java.util.NoSuchElementException ne)
+        {
+            r[i++]= true;
+        }catch(Exception e)
+        {
+            r[i++]= false;
+        }
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean ListIterator_hasNext()
+    {
+        System.out.println("Testing ListIterator.hasNext()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        Iterator it= cont.listIterator();
+        r[i++]= ! it.hasNext();
+        cont.addAll(list1);
+        it= cont.listIterator();
+        r[i++]= it.hasNext();
+        it.next();
+        r[i++]= it.hasNext();
+        it.next();
+        r[i++]= it.hasNext();
+        it.next();
+        r[i++]= ! it.hasNext();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean ListIterator_remove()
+    {
+        System.out.println("Testing ListIterator.remove()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        ListIterator it= cont.listIterator();
+        try
+        {
+            it.remove();
+        }
+        catch( IllegalStateException ie)
+        {
+            r[i++]= true;
+        }
+        catch(java.lang.Exception e)
+        {
+            r[i++]= false;
+        }
+        cont.add(obj1);
+        it= cont.listIterator();
+        it.next();
+        it.remove();
+        r[i++]= cont.isEmpty();
+        try
+        {
+            it.remove();
+        }
+        catch (IllegalStateException ie)
+        {
+            r[i++]= true;
+        }
+        catch (Exception e)
+        {
+            r[i++]= false;
+        }
+        cont.clear();
+        cont.addAll(list1);
+        it= cont.listIterator();
+        while (it.hasNext())
+        {
+            it.next();
+            it.remove();
+        }
+        r[i++]= cont.isEmpty();
+
+        // 2 iterators, remove must not impair the other iterator
+        cont.clear();
+        cont.addAll(list1);
+        int size= cont.size();
+        it= cont.listIterator();
+        Iterator it2= cont.listIterator();
+        while (it.hasNext())
+        {
+            it.next();
+            it.remove();
+        }
+        try
+        {
+            for( int c= 0; c < size; c++)
+                it2.next();
+            r[i++]= true;
+        }
+        catch(Exception e)
+        {
+            r[i++]= false;
+        }
+        r[i++]= cont.size() == 0;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean ListIterator_hasPrevious()
+    {
+        System.out.println("Testing ListIterator.hasPrevious()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        ListIterator it= cont.listIterator();
+        r[i++]= ! it.hasPrevious();
+        cont.addAll(list1);
+        it= cont.listIterator();
+        while (it.hasNext())
+        {
+            it.next();
+            r[i++]= it.hasPrevious();
+        }
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean ListIterator_previous()
+    {
+        System.out.println("Testing ListIterator.previous()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        boolean bOk= true;
+
+        cont.addAll(list1);
+        // go to the end of our list and list1
+        ListIterator it= cont.listIterator();
+        while (it.hasNext())
+            it.next();
+        ListIterator it_list1= list1.listIterator();
+        while (it_list1.hasNext())
+            it_list1.next();
+
+        while (it.hasPrevious())
+        {
+            r[i++]= it.previous() == it_list1.previous();
+        }
+        try
+        {
+            it.previous();
+            r[i++]= false;
+        }
+        catch (java.util.NoSuchElementException e)
+        {
+            r[i++]=true;
+        }
+
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean ListIterator_nextIndex()
+    {
+        System.out.println("Testing ListIterator.nextIndex()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        boolean bOk= true;
+
+        ListIterator it= cont.listIterator();
+        cont.addAll(list1);
+        it= cont.listIterator();
+        r[i++]= it.nextIndex() == 0;
+        it.next();
+        r[i++]= it.nextIndex() == 1;
+        it.next();
+        r[i++]= it.nextIndex() == 2;
+
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    public boolean ListIterator_previousIndex()
+    {
+        System.out.println("Testing ListIterator.previousIndex()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        boolean bOk= true;
+
+        ListIterator it= cont.listIterator();
+        cont.addAll(list1);
+        it= cont.listIterator();
+        while (it.hasNext())
+            it.next();
+
+        r[i++]= it.previousIndex() == 2;
+        it.previous();
+        r[i++]= it.previousIndex() == 1;
+        it.previous();
+        r[i++]= it.previousIndex() == 0;
+        it.previous();
+
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+    public boolean ListIterator_add()
+    {
+        System.out.println("Testing ListIterator.add()");
+        InterfaceContainer cont= new InterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        boolean bOk= true;
+
+        ListIterator it= cont.listIterator();
+        it.add(obj1);
+        r[i++]= cont.size() == 1;
+        it.add(obj2);
+        r[i++]= cont.size() == 2;
+        it.add(obj3);
+        r[i++]= it.previous() == obj3;
+        r[i++]= it.previous() == obj2;
+        r[i++]= it.previous() == obj1;
+
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean disposeAndClear()
+    {
+        System.out.println("Testing InterfaceContainer.disposeAndClear");
+        InterfaceContainer cont= new InterfaceContainer(10);
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.add(obj1);
+        cont.add(obj2);
+        cont.add(obj3);
+        cont.add(proxyObj1Weak1);
+        cont.add(proxyObj3TypeProv);
+        System.out.println("Two proxies are called. Check the output:");
+        cont.disposeAndClear(new com.sun.star.lang.EventObject());
+        r[i++]= obj1.nDisposingCalled == 1;
+        r[i++]= obj2.nDisposingCalled == 1;
+        r[i++]= obj3.nDisposingCalled == 1;
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+
+    public static void main(String[] args)
+    {
+        InterfaceContainer_Test test= new InterfaceContainer_Test();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        r[i++]= test.listConstructors();
+        r[i++]= test.trimToSize();
+        r[i++]= test.ensureCapacity();
+        r[i++]= test.add();
+        r[i++]= test.indexOf();
+        r[i++]= test.contains();
+        r[i++]= test.containsAll();
+        r[i++]= test.get();
+        r[i++]= test.addAll();
+        r[i++]= test.remove();
+        r[i++]= test.retainAll();
+        r[i++]= test.set();
+        r[i++]= test.toArray();
+        r[i++]= test.Iterator_next();
+        r[i++]= test.Iterator_hasNext();
+        r[i++]= test.Iterator_remove();
+        r[i++]= test.ListIterator_next();
+        r[i++]= test.ListIterator_hasNext();
+        r[i++]= test.ListIterator_remove();
+        r[i++]= test.ListIterator_hasPrevious();
+        r[i++]= test.ListIterator_previous();
+        r[i++]= test.ListIterator_nextIndex();
+        r[i++]= test.ListIterator_previousIndex();
+        r[i++]= test.ListIterator_add();
+        r[i++]= test.disposeAndClear();
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Test finished.\nErrors occured!!!");
+        else
+            System.out.println("Test finished. \nNo errors.");
+
+    }
+
+}
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
new file mode 100644
index 000000000000..5e92b3003370
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer_Test.java
@@ -0,0 +1,405 @@
+/*************************************************************************
+ *
+ *  $RCSfile: MultiTypeInterfaceContainer_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.lib.uno.helper;
+import com.sun.star.lib.uno.environments.java.java_environment;
+import java.util.List;
+import com.sun.star.uno.XWeak;
+import com.sun.star.lang.XTypeProvider;
+import java.util.ArrayList;
+import com.sun.star.uno.Type;
+import com.sun.star.lib.uno.typedesc.TypeDescription;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.lib.uno.environments.java.Proxy;
+import com.sun.star.uno.XInterface;
+import com.sun.star.lang.XSingleComponentFactory;
+
+public class MultiTypeInterfaceContainer_Test
+{
+    java_environment env= new java_environment(null);
+    /** Creates a new instance of InterfaceContainerTest */
+    AWeakBase obj1,obj2,obj3,obj4;
+    Object proxyObj1Weak1;
+    Object proxyObj3Weak1;
+    Object proxyObj3Weak2;
+    Object proxyObj3TypeProv;
+    Object proxyObj2TypeProv;
+    //contains original objects
+    List list1;
+    //contains original objects + proxies
+    List list2;
+    //contains original object + proxies + null value
+    List list3;
+
+    /** Creates a new instance of MultiTypeInterfaceContainer_Test */
+    public MultiTypeInterfaceContainer_Test()
+    {
+        obj1= new AWeakBase();
+        obj2= new AWeakBase();
+        obj3= new AWeakBase();
+        obj4= new AWeakBase();
+        proxyObj1Weak1= ProxyProvider.getHolderProxy(obj1, XWeak.class);
+        proxyObj3Weak1= ProxyProvider.getHolderProxy(obj3, XWeak.class);
+        proxyObj3Weak2= ProxyProvider.getHolderProxy(obj3, XWeak.class);
+        proxyObj2TypeProv= ProxyProvider.getHolderProxy(obj2, XTypeProvider.class);
+        proxyObj3TypeProv= ProxyProvider.getHolderProxy(obj3, XTypeProvider.class);
+
+        list1= new ArrayList();
+        list1.add(obj1);
+        list1.add(obj2);
+        list1.add(obj3);
+        list2= new ArrayList();
+        list2.add(obj1);
+        list2.add(proxyObj2TypeProv);
+        list2.add(proxyObj3TypeProv);
+        list3= new ArrayList();
+        list3.add(obj1);
+        list3.add(null);
+        list3.add(proxyObj2TypeProv);
+        list3.add(proxyObj3Weak1);
+    }
+    /** returns Holder proxy objects for the specified interface. If the method is called
+     *  several times with the same arguments then each time a new HolderProxy is returned.
+     *  Then all HolderProxy s refer to the same Proxy object.
+     *  The proxy can be queried for XEventListener. On the returned proxy disposing can be called
+     *
+     */
+    public Object getHolderProxy(Object obj, Class iface)
+    {
+        Object retVal= null;
+        if (obj == null || iface == null || iface.isInstance(obj) == false )
+            return retVal;
+
+        Type type= new Type(TypeDescription.getTypeDescription(iface));
+        Type evtType= new Type(TypeDescription.getTypeDescription(com.sun.star.lang.XEventListener.class));
+        // find the object identifier
+        String sOid= UnoRuntime.generateOid(obj);
+        retVal= env.getRegisteredInterface(sOid, type);
+        // if retVal == null then probably not registered
+        if (retVal == null)
+        {
+            // create the XEventListener proxy
+            Requester eventRequester = new Requester(false, false, null);
+            Object aProxyEvt = Proxy.create(eventRequester, sOid, evtType, false, false);
+            String[] arOid= new String[]{sOid};
+            retVal= env.registerInterface(aProxyEvt, arOid, evtType);
+
+            Requester requester = new Requester(false, false, aProxyEvt);
+            Object aProxy = Proxy.create(requester, sOid, type, false, false);
+            arOid= new String[] {sOid};
+            retVal= env.registerInterface(aProxy, arOid, type);
+        }
+        return retVal;
+    }
+
+    public boolean addInterface()
+    {
+        System.out.println("Testing MultiTypeInterfaceContainer.addInterface");
+        MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
+        boolean r[]= new boolean[200];
+        int i= 0;
+
+        int ci= 0;
+        ci= cont.addInterface(new Type(XInterface.class), obj1);
+        ci= cont.addInterface(new Type(XInterface.class), obj2);
+        ci= cont.addInterface(new Type(XInterface.class), obj3);
+        r[i++]= ci == 3;
+        ci= cont.addInterface(new Type(XWeak.class), obj1);
+        ci= cont.addInterface(new Type(XWeak.class), obj2);
+        r[i++]= ci ==2;
+        ci= cont.addInterface(null,obj1);
+        r[i++]= ci == 1;
+        ci= cont.addInterface(new Type(XTypeProvider.class), null);
+        r[i++]= ci == 0;
+
+        cont= new MultiTypeInterfaceContainer();
+        AWeakBase[] arObj= new AWeakBase[100];
+        for (int c= 0; c < 100; c++)
+        {
+            arObj[c]= new AWeakBase();
+            ci= cont.addInterface(new Type(XInterface.class), arObj[c]);
+        }
+        Type[] arT= cont.getContainedTypes();
+        for (int c=0; c < 100; c++)
+        {
+            ci= cont.removeInterface(new Type(XInterface.class), arObj[c]);
+            r[i++]= ci == 100 -c -1;
+
+        }
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean getContainedTypes()
+    {
+        System.out.println("Testing MultiTypeInterfaceContainer.getContainedTypes");
+        MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        cont.addInterface(new Type(XInterface.class), obj1);
+        cont.addInterface(new Type(XWeak.class), obj1);
+        cont.addInterface(null, obj1);
+        cont.addInterface(new Type(XTypeProvider.class), null);
+        Object aObj= new Object();
+        cont.addInterface(aObj, obj1);
+        cont.addInterface(XSingleComponentFactory.class, obj1);
+        Type[] types= cont.getContainedTypes();
+        // 3 types and no XTypeProvider
+        r[i++]= types.length == 5;
+        for (int c= 0; c < types.length; c++)
+        {
+            if (types[c] == null)
+                r[i++]= true;
+            else if(types[c].equals( new Type(XTypeProvider.class)))
+                r[i++]= false;
+            else if(types[c].equals(new Type(XInterface.class)))
+                r[i++]= true;
+            else if (types[c].equals(new Type(XWeak.class)))
+                r[i++]= true;
+            else if (types[c].equals(new Type()))
+                r[i++]= true;
+            else if (types[c].equals(new Type( aObj.getClass())))
+                r[i++]= true;
+            else if (types[c].equals(new Type(XSingleComponentFactory.class)))
+                r[i++]= true;
+            else
+                r[i++]= false;
+        }
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean getContainer()
+    {
+        System.out.println("Testing MultiTypeInterfaceContainer.getContainedTypes");
+        MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        int ci= 0;
+        ci= cont.addInterface(new Type(XInterface.class), obj1);
+        ci= cont.addInterface(new Type(XInterface.class), obj2);
+        ci= cont.addInterface(new Type(XInterface.class), obj3);
+        ci= cont.addInterface(new Type(XWeak.class), obj1);
+        ci= cont.addInterface(new Type(XWeak.class), obj2);
+        ci= cont.addInterface(null, obj1);
+        ci= cont.addInterface(new Type(XTypeProvider.class), null);
+
+        InterfaceContainer icont= null;
+        icont= cont.getContainer( new Type(XTypeProvider.class));
+        r[i++]= icont.size() == 0;
+        icont= cont.getContainer(new Type(XWeak.class));
+        r[i++]= icont.size() == 2;
+        icont= cont.getContainer(null);
+        r[i++]= icont.size() == 1;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean removeInterface()
+    {
+        System.out.println("Testing MultiTypeInterfaceContainer.removeInterface");
+        MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        int count= 0;
+        count= cont.removeInterface( new Type(XTypeProvider.class), obj1);
+        r[i++]= count == 0;
+        count= cont.removeInterface( new Type(XTypeProvider.class), null);
+        r[i++]= count == 0;
+        count= cont.removeInterface(null, obj2);
+        r[i++]= count == 0;
+
+        cont.addInterface(new Type(XInterface.class), obj1);
+        cont.addInterface(null, obj1);
+        count= cont.removeInterface(null, obj2);
+        // count must still be 1
+        r[i++]= count == 1;
+        count= cont.removeInterface(null, obj1);
+        r[i++]= count == 0;
+        count= cont.removeInterface(new Type(XInterface.class), obj1);
+        r[i++]= count == 0;
+
+          boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean clear()
+    {
+        System.out.println("Testing MultiTypeInterfaceContainer.clear");
+        MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+
+        int count= 0;
+        cont.clear();
+        Type[] types= cont.getContainedTypes();
+        r[i++]= types.length == 0;
+        int ci;
+        ci= cont.addInterface(new Type(XInterface.class), obj1);
+        ci= cont.addInterface(new Type(XInterface.class), obj2);
+        ci= cont.addInterface(new Type(XInterface.class), obj3);
+        ci= cont.addInterface(new Type(XWeak.class), obj1);
+        ci= cont.addInterface(new Type(XWeak.class), obj2);
+        ci= cont.addInterface(null, obj1);
+        ci= cont.addInterface(new Type(XTypeProvider.class), null);
+        types= cont.getContainedTypes();
+        r[i++]= types.length == 3;
+        cont.clear();
+        types= cont.getContainedTypes();
+        r[i++]= types.length == 0;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean disposeAndClear()
+    {
+        System.out.println("Testing MultiTypeInterfaceContainer.disposeAndClear");
+        MultiTypeInterfaceContainer cont= new MultiTypeInterfaceContainer();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        obj1.nDisposingCalled= 0;
+        obj2.nDisposingCalled= 0;
+        obj3.nDisposingCalled= 0;
+        cont.addInterface(new Type(XInterface.class), null);
+        cont.addInterface(new Type(XInterface.class), obj1);
+        cont.addInterface(new Type(XInterface.class), obj2);
+        cont.addInterface(new Type(XInterface.class), obj3);
+        cont.addInterface(new Type(XWeak.class),obj1);
+        cont.addInterface(new Type(XWeak.class), obj2);
+        cont.addInterface(new Type(XTypeProvider.class), obj1);
+        cont.disposeAndClear(new com.sun.star.lang.EventObject("blabla"));
+
+        r[i++]= obj1.nDisposingCalled == 3;
+        r[i++]= obj2.nDisposingCalled == 2;
+        r[i++]= obj3.nDisposingCalled == 1;
+        Type[] types= cont.getContainedTypes();
+        r[i++]= types.length == 0;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+
+    public static void main(String[] args)
+    {
+        MultiTypeInterfaceContainer_Test test= new MultiTypeInterfaceContainer_Test();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        r[i++]= test.addInterface();
+        r[i++]= test.getContainedTypes();
+        r[i++]= test.getContainer();
+        r[i++]= test.removeInterface();
+        r[i++]= test.clear();
+        r[i++]= test.disposeAndClear();
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if ( ! bOk )
+            System.out.println("Test finished.\nErrors occured!!!");
+        else
+            System.out.println("Test finished. \nNo errors.");
+
+    }
+}
+
+
+
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
new file mode 100644
index 000000000000..2e086f48cfd4
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/ProxyProvider.java
@@ -0,0 +1,163 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ProxyProvider.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.lib.uno.helper;
+import com.sun.star.uno.Type;
+import com.sun.star.lib.uno.typedesc.TypeDescription;
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.lib.uno.environments.java.Proxy;
+import com.sun.star.lib.uno.environments.java.java_environment;
+import com.sun.star.lib.uno.environments.java.IRequester;
+
+
+public class ProxyProvider
+{
+    static java_environment env= new java_environment(null);
+
+    /** Creates a new instance of ProxyProvider */
+    public ProxyProvider()
+    {
+    }
+    /** returns Holder proxy objects for the specified interface. If the method is called
+     * several times with the same arguments then each time a new HolderProxy is returned.
+     * Then all HolderProxy s refer to the same Proxy object.
+     * The proxy can be queried for XEventListener. On the returned proxy disposing can be called
+     *
+     */
+    public static Object getHolderProxy(Object obj, Class iface)
+    {
+
+        Object retVal= null;
+        if (obj == null || iface == null || iface.isInstance(obj) == false )
+            return retVal;
+
+        Type type= new Type(TypeDescription.getTypeDescription(iface));
+        Type evtType= new Type(TypeDescription.getTypeDescription(com.sun.star.lang.XEventListener.class));
+        // find the object identifier
+        String sOid= UnoRuntime.generateOid(obj);
+        retVal= env.getRegisteredInterface(sOid, type);
+        // if retVal == null then probably not registered
+        if (retVal == null)
+        {
+            // create the XEventListener proxy
+            Requester eventRequester = new Requester(false, false, null);
+            Object aProxyEvt = Proxy.create(eventRequester, sOid, evtType, false, false);
+            eventRequester._xEventListenerProxy= aProxyEvt;
+            String[] arOid= new String[]
+            {sOid};
+            retVal= env.registerInterface(aProxyEvt, arOid, evtType);
+
+            Requester requester = new Requester(false, false, aProxyEvt);
+            Object aProxy = Proxy.create(requester, sOid, type, false, false);
+            arOid= new String[]
+            {sOid};
+            retVal= env.registerInterface(aProxy, arOid, type);
+        }
+        return retVal;
+    }
+}
+
+class Requester implements IRequester
+{
+    int _modus;
+    boolean _virtual;
+    boolean _forceSynchronous;
+    boolean _passed = true;
+
+    Object _xEventListenerProxy;
+    int nDisposingCalled= 0;
+
+    Requester(boolean virtual, boolean forceSynchronous, Object evtListener)
+    {
+        _virtual = virtual;
+        _forceSynchronous = forceSynchronous;
+        _xEventListenerProxy= evtListener;
+
+    }
+
+    public Object sendRequest(Object object,
+    Type type,
+    String operation,
+    Object params[],
+    Boolean synchron[],
+    Boolean mustReply[]) throws Throwable
+    {
+
+        Object result = null;
+        if (operation.equals("disposing"))
+        {
+            System.out.println("Disposing called on XEventListener proxy");
+            nDisposingCalled++;
+        }
+        else if (operation.equals("queryInterface"))
+        {
+            if (params[0] instanceof Type)
+            {
+                Type t= (Type) params[0];
+                if (t.equals( new Type("com.sun.star.lang.XEventListener")))
+                    result= _xEventListenerProxy;
+            }
+        }
+        return result;
+    }
+}
+
+
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
new file mode 100644
index 000000000000..0c69992c058a
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/WeakBase_Test.java
@@ -0,0 +1,259 @@
+/*************************************************************************
+ *
+ *  $RCSfile: WeakBase_Test.java,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (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.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+
+package com.sun.star.lib.uno.helper;
+import com.sun.star.uno.Type;
+import com.sun.star.bridge.XBridgeSupplier2;
+import com.sun.star.uno.XReference;
+import com.sun.star.uno.XWeak;
+import com.sun.star.lang.XTypeProvider;
+import com.sun.star.uno.XAdapter;
+
+public class WeakBase_Test
+{
+
+    /** Creates a new instance of WeakBase_Test */
+    public WeakBase_Test()
+    {
+    }
+
+    public boolean getTypes()
+    {
+        System.out.println("Testing WeakBase.getTypes");
+        boolean[] r= new boolean[50];
+        int i= 0;
+
+        SomeClass comp= new SomeClass();
+        Type[] types= comp.getTypes(); //XWeak,XTypeProvider,XReference,XBridgeSupplier2
+        r[i++]= types.length == 4;
+        for (int c= 0; c < types.length; c++)
+        {
+            if (types[c].equals( new Type( XWeak.class)))
+                r[i++]= true;
+            else if (types[c].equals(new Type(XTypeProvider.class)))
+                r[i++]= true;
+            else if (types[c].equals(new Type(XReference.class)))
+                r[i++]= true;
+            else if (types[c].equals(new Type(XBridgeSupplier2.class)))
+                r[i++]= true;
+            else
+                r[i++]= false;
+
+        }
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean getImplementationId()
+    {
+        System.out.println("Testing WeakBase.getImplementationId");
+        boolean[] r= new boolean[50];
+        int i= 0;
+
+        SomeClass comp= new SomeClass();
+        // byte 0 - 3 contain hashcode and the remaining bytes represent the classname
+        byte [] ar= comp.getImplementationId();
+
+        StringBuffer buff= new StringBuffer();
+        for (int c= 0; c < ar.length - 4; c++){
+            buff.append((char) ar[4 + c]);
+//            buff.append(" ");
+        }
+        String retStr= buff.toString();
+        r[i++]= retStr.equals("com.sun.star.lib.uno.helper.SomeClass");
+        System.out.println(buff.toString());
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public boolean queryAdapter()
+    {
+        System.out.println("Testing WeakBase.queryAdapter, XAdapter tests");
+        boolean[] r= new boolean[50];
+        int i= 0;
+
+        SomeClass comp= new SomeClass();
+        XAdapter adapter= comp.queryAdapter();
+        MyRef aRef1= new MyRef();
+        MyRef aRef2= new MyRef();
+        adapter.addReference(aRef1);
+        adapter.addReference(aRef2);
+
+        r[i++]= adapter.queryAdapted() == comp;
+        comp= null;
+        System.out.println("Wait 5 sec");
+        for(int c= 0; c < 50; c++)
+        {
+            try
+            {
+                Thread.currentThread().sleep(100);
+                System.gc();
+                System.runFinalization();
+            }catch (InterruptedException ie)
+            {
+            }
+        }
+
+        r[i++]= aRef1.nDisposeCalled == 1;
+        r[i++]= aRef2.nDisposeCalled == 1;
+        r[i++]= adapter.queryAdapted() == null;
+        adapter.removeReference(aRef1); // should not do any harm
+        adapter.removeReference(aRef2);
+
+        comp= new SomeClass();
+        adapter= comp.queryAdapter();
+        aRef1.nDisposeCalled= 0;
+        aRef2.nDisposeCalled= 0;
+
+        adapter.addReference(aRef1);
+        adapter.addReference(aRef2);
+
+        adapter.removeReference(aRef1);
+        System.out.println("Wait 5 sec");
+        comp= null;
+        for(int c= 0; c < 50; c++)
+        {
+            try
+            {
+                Thread.currentThread().sleep(100);
+                System.gc();
+                System.runFinalization();
+            }catch (InterruptedException ie)
+            {
+            }
+        }
+        r[i++]= aRef1.nDisposeCalled == 0;
+        r[i++]= aRef2.nDisposeCalled == 1;
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Failed");
+        else
+            System.out.println("Ok");
+        return bOk;
+    }
+
+    public static void main(String[] args)
+    {
+        WeakBase_Test test= new WeakBase_Test();
+        boolean r[]= new boolean[50];
+        int i= 0;
+        r[i++]= test.getTypes();
+        r[i++]= test.getImplementationId();
+        r[i++]= test.queryAdapter();
+
+        boolean bOk= true;
+        for (int c= 0; c < i; c++)
+            bOk= bOk && r[c];
+        if (bOk == false)
+            System.out.println("Errors occured!");
+        else
+            System.out.println("No errors.");
+
+    }
+
+}
+
+interface Aint
+{
+}
+class OtherClass extends WeakBase implements XBridgeSupplier2
+{
+
+    public Object createBridge(Object obj, byte[] values, short param, short param3) throws com.sun.star.lang.IllegalArgumentException
+    {
+        return null;
+    }
+}
+
+class SomeClass extends OtherClass implements Aint,XReference
+{
+
+    public void dispose()
+    {
+    }
+
+}
+
+class MyRef implements XReference
+{
+    int nDisposeCalled;
+
+    public void dispose()
+    {
+        nDisposeCalled++;
+    }
+}
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk b/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
new file mode 100644
index 000000000000..5e1f4d682236
--- /dev/null
+++ b/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
@@ -0,0 +1,88 @@
+#*************************************************************************
+#
+#   $RCSfile: makefile.mk,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: jl $ $Date: 2002-04-11 13:43:14 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (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.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************
+
+PRJ=..$/..$/..$/..$/..$/..$/..
+PRJNAME = juhelper
+PACKAGE = com$/sun$/star$/lib$/uno$/helper
+TARGET  = com_sun_star_lib_uno_helper_test
+
+# --- Settings -----------------------------------------------------
+
+#.INCLUDE :  settings.mk
+.INCLUDE : $(PRJ)$/util$/makefile.pmk
+# --- Files --------------------------------------------------------
+
+JARFILES = sandbox.jar jurt.jar ridl.jar
+
+JAVACLASSFILES=	\
+    $(CLASSDIR)$/$(PACKAGE)$/WeakBase_Test.class \
+    $(CLASSDIR)$/$(PACKAGE)$/ComponentBase_Test.class \
+    $(CLASSDIR)$/$(PACKAGE)$/InterfaceContainer_Test.class \
+    $(CLASSDIR)$/$(PACKAGE)$/MultiTypeInterfaceContainer_Test.class \
+    $(CLASSDIR)$/$(PACKAGE)$/ProxyProvider.class \
+    $(CLASSDIR)$/$(PACKAGE)$/AWeakBase.class
+
+#JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE :  target.mk