1 files changed, 24 insertions, 27 deletions
diff --git a/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java b/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java
index de605502b172..9415ee1e2bb5 100644
--- a/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java
+++ b/ridljar/test/com/sun/star/lib/util/WeakMap_Test.java
@@ -27,45 +27,42 @@
 
 package com.sun.star.lib.util;
 
-import complexlib.ComplexTestCase;
+import org.junit.Test;
 import util.WaitUnreachable;
+import static org.junit.Assert.*;
 
-public final class WeakMap_Test extends ComplexTestCase {
-    public String[] getTestMethodNames() {
-        return new String[] { "test" };
-    }
-
-    public void test() {
+public final class WeakMap_Test {
+    @Test public void test() {
         WeakMap m = new WeakMap();
-        assure("", m.size() == 0);
-        assure("", m.isEmpty());
-        assure("", !m.containsKey("key1"));
-        assure("", !m.containsValue(null));
+        assertEquals(0, m.size());
+        assertTrue(m.isEmpty());
+        assertFalse(m.containsKey("key1"));
+        assertFalse(m.containsValue(null));
         WaitUnreachable u1 = new WaitUnreachable(new Object());
         m.put("key1", u1.get());
         WaitUnreachable u2 = new WaitUnreachable(new Disposable());
         m.put("key2", u2.get());
-        assure("", m.size() == 2);
-        assure("", !m.isEmpty());
-        assure("", m.containsKey("key1"));
-        assure("", m.containsKey("key2"));
-        assure("", !m.containsKey("key3"));
-        assure("", m.containsValue(m.get("key1")));
-        assure("", m.containsValue(m.get("key2")));
-        assure("", WeakMap.getValue(m.get("key1")).equals(u1.get()));
-        assure("", WeakMap.getValue(m.get("key2")).equals(u2.get()));
-        assure("", m.values().size() == 2);
-        assure("", m.values().contains(m.get("key1")));
-        assure("", m.values().contains(m.get("key2")));
+        assertEquals(2, m.size());
+        assertFalse(m.isEmpty());
+        assertTrue(m.containsKey("key1"));
+        assertTrue(m.containsKey("key2"));
+        assertFalse(m.containsKey("key3"));
+        assertTrue(m.containsValue(m.get("key1")));
+        assertTrue(m.containsValue(m.get("key2")));
+        assertEquals(u1.get(), WeakMap.getValue(m.get("key1")));
+        assertEquals(u2.get(), WeakMap.getValue(m.get("key2")));
+        assertEquals(2, m.values().size());
+        assertTrue(m.values().contains(m.get("key1")));
+        assertTrue(m.values().contains(m.get("key2")));
         u1.waitUnreachable();
-        assure("", WeakMap.getValue(m.get("key1")) == null);
+        assertNull(WeakMap.getValue(m.get("key1")));
         ((Disposable) u2.get()).dispose();
-        assure("", WeakMap.getValue(m.get("key2")) == null);
+        assertNull(WeakMap.getValue(m.get("key2")));
         m.clear();
         u2.waitUnreachable();
-        assure("", m.size() == 0);
+        assertEquals(0, m.size());
         m.put("key2", new Object());
-        assure("", m.size() == 1);
+        assertEquals(1, m.size());
     }
 
     // This simple class (single listener, no synchronization) exploits