[458349] Consolidate UI

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

1 files changed, 18 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java
index bdf2e83812..b47d8db8a2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LockingManagerTest.java
@@ -1135,9 +1135,24 @@ public class LockingManagerTest extends AbstractLockingTest
     final CDOObject category2cv = CDOUtil.getCDOObject(r.getContents().get(1));
     final CDOObject category3cv = CDOUtil.getCDOObject(r.getContents().get(2));
 
-    assertEquals(true, category1cv.cdoReadLock().isLockedByOthers());
-    assertEquals(true, category2cv.cdoWriteLock().isLockedByOthers());
-    assertEquals(true, category3cv.cdoWriteOption().isLockedByOthers());
+    new PollingTimeOuter()
+    {
+      @Override
+      protected boolean successful()
+      {
+        try
+        {
+          assertEquals(true, category1cv.cdoReadLock().isLockedByOthers());
+          assertEquals(true, category2cv.cdoWriteLock().isLockedByOthers());
+          assertEquals(true, category3cv.cdoWriteOption().isLockedByOthers());
+          return true;
+        }
+        catch (Exception ex)
+        {
+          return false;
+        }
+      }
+    }.assertNoTimeOut();
 
     readUnlock(category1);
     writeUnlock(category2);