INTEGRATION: CWS uno2 (1.2.2); FILE MERGED

2003/04/15 09:39:19 sb 1.2.2.1: #107753# Moved code down from any/ subdir.

2 files changed, 7 insertions, 20 deletions

diff --git a/bridges/test/java_uno/any/TestRemote.java b/bridges/test/java_uno/any/TestRemote.java
index 29a408d990d1..a270c98bc0f7 100644
--- a/bridges/test/java_uno/any/TestRemote.java
+++ b/bridges/test/java_uno/any/TestRemote.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TestRemote.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-18 19:07:16 $
+ *  last change: $Author: rt $ $Date: 2003-04-23 16:34:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,14 +63,12 @@ package test.java_uno.anytest;
 
 import com.sun.star.bridge.XBridge;
 import com.sun.star.bridge.XInstanceProvider;
-import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
+import test.java_uno.TestBed;
 
 public final class TestRemote {
     public static void main(String[] args) throws Exception {
-        TestBed t = new TestBed();
-        t.setProvider(new Provider(t));
-        t.execute(Client.class, 0);
+        new TestBed().execute(new Provider(), false, Client.class, 0);
     }
 
     public static final class Client extends TestBed.Client {
@@ -81,27 +79,17 @@ public final class TestRemote {
         protected boolean run(XBridge bridge) throws Throwable {
             XTransport transport = (XTransport) UnoRuntime.queryInterface(
                 XTransport.class, bridge.getInstance("Transport"));
-            boolean success = TestAny.test(transport, true);
-            ((XComponent) UnoRuntime.queryInterface(XComponent.class, bridge)).
-                dispose();
-            return success;
+            return TestAny.test(transport, true);
         }
     }
 
     private static final class Provider implements XInstanceProvider {
-        public Provider(TestBed testBed) {
-            this.testBed = testBed;
-        }
-
         public Object getInstance(String instanceName) {
-            testBed.serverDone(true);
             return new XTransport() {
                     public Object mapAny(Object any) {
                         return any;
                     }
                 };
         }
-
-        private final TestBed testBed;
     }
 }
diff --git a/bridges/test/java_uno/any/makefile.mk b/bridges/test/java_uno/any/makefile.mk
index 7868115e4e47..652d3318add9 100644
--- a/bridges/test/java_uno/any/makefile.mk
+++ b/bridges/test/java_uno/any/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: hr $ $Date: 2003-03-18 19:07:17 $
+#   last change: $Author: rt $ $Date: 2003-04-23 16:34:22 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -86,7 +86,6 @@ EXEC_CLASSPATH = \
 JARFILES = juh.jar jurt.jar ridl.jar sandbox.jar
 JAVACLASSFILES = \
     $(CLASSDIR)$/$(PACKAGE)$/TestAny.class \
-    $(CLASSDIR)$/$(PACKAGE)$/TestBed.class \
     $(CLASSDIR)$/$(PACKAGE)$/TestRemote.class \
     $(CLASSDIR)$/$(PACKAGE)$/TestJni.class