1 files changed, 13 insertions, 20 deletions
diff --git a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java b/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
index d027a412ca5c..477a260400ee 100644
--- a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
+++ b/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
@@ -33,18 +33,11 @@ import com.sun.star.comp.connections.PipedConnection;
 import com.sun.star.connection.XConnection;
 import com.sun.star.lang.XComponent;
 import com.sun.star.uno.UnoRuntime;
-import complexlib.ComplexTestCase;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
-public final class BridgeFactory_Test extends ComplexTestCase {
-    public String getTestObjectName() {
-        return getClass().getName();
-    }
-
-    public String[] getTestMethodNames() {
-        return new String[] { "test" };
-    }
-
-    public void test() throws Exception {
+public final class BridgeFactory_Test {
+    @Test public void test() throws Exception {
         PipedConnection rightSide = new PipedConnection(new Object[0]);
         PipedConnection leftSide = new PipedConnection(new Object[]{rightSide});
 
@@ -54,14 +47,15 @@ public final class BridgeFactory_Test extends ComplexTestCase {
         XBridge xBridge = bridgeFactory.createBridge("testbridge", "urp", (XConnection)leftSide, null);
 
         // test that we get the same bridge
-        assure("", UnoRuntime.areSame(xBridge,
-                                      bridgeFactory.getBridge("testbridge")));
+        assertTrue(
+            UnoRuntime.areSame(
+                xBridge, bridgeFactory.getBridge("testbridge")));
 
         // test that we can not create another bridge with same name
         try {
             XBridge dummy = bridgeFactory.createBridge("testbridge", "urp", (XConnection)leftSide, null);
 
-            failed("");
+            fail();
         }
         catch(BridgeExistsException bridgeExistsException) {
         }
@@ -69,7 +63,7 @@ public final class BridgeFactory_Test extends ComplexTestCase {
 
         // test getExistingBridges
         XBridge xBridges[] = bridgeFactory.getExistingBridges();
-        assure("", UnoRuntime.areSame(xBridge, xBridges[0]));
+        assertTrue(UnoRuntime.areSame(xBridge, xBridges[0]));
 
         // dispose the bridge
         XComponent xComponent = UnoRuntime.queryInterface(XComponent.class, xBridge);
@@ -77,7 +71,7 @@ public final class BridgeFactory_Test extends ComplexTestCase {
 
 
         // test that the bridge has been removed
-        assure("", bridgeFactory.getBridge("testbridge") == null);
+        assertTrue(bridgeFactory.getBridge("testbridge") == null);
 
 
 
@@ -87,7 +81,7 @@ public final class BridgeFactory_Test extends ComplexTestCase {
 
         // test that we really get a new bridge
         XBridge xBridge_new = bridgeFactory.createBridge("testbridge", "urp", (XConnection)leftSide, null);
-        assure("", !UnoRuntime.areSame(xBridge, xBridge_new));
+        assertFalse(UnoRuntime.areSame(xBridge, xBridge_new));
 
         for(int i = 0; i <10000; ++ i) {
             Object x[] = new Object[100];
@@ -95,9 +89,8 @@ public final class BridgeFactory_Test extends ComplexTestCase {
 
         // test getExistingBridges
         xBridges = bridgeFactory.getExistingBridges();
-        assure("",
-               xBridges.length == 1
-               && UnoRuntime.areSame(xBridge_new, xBridges[0]));
+        assertEquals(1, xBridges.length);
+        assertTrue(UnoRuntime.areSame(xBridge_new, xBridges[0]));
 
         // dispose the new bridge
         XComponent xComponent_new = UnoRuntime.queryInterface(XComponent.class, xBridge_new);