You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2016/05/13 14:11:46 UTC

svn commit: r1743677 - /jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java

Author: angela
Date: Fri May 13 14:11:46 2016
New Revision: 1743677

URL: http://svn.apache.org/viewvc?rev=1743677&view=rev
Log:
OAK-4366 : SyncMBeanImpl.testSyncExternalUsersLastSyncedProperty makes assumption about System.currentTimeMillis (Patch provided by Julian Reschke, Thanks a lot)

Modified:
    jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java

Modified: jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java?rev=1743677&r1=1743676&r2=1743677&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java Fri May 13 14:11:46 2016
@@ -478,12 +478,16 @@ public class SyncMBeanImplTest {
             assertTrue(lastSynced == groupLastSynced);
         }
 
+        while (System.currentTimeMillis() <= lastSynced) {
+            // wait for system time to move
+        }
+
         // default value for forceGroup sync is defined to be 'true' => verify result
         syncMBean.syncExternalUsers(externalId);
         testUser = userManager.getAuthorizable(externalUser.getId(), User.class);
         long lastSynced2 = testUser.getProperty(DefaultSyncContext.REP_LAST_SYNCED)[0].getLong();
 
-        assertTrue(lastSynced < lastSynced2);
+        assertTrue("lastSynced: " + lastSynced + ", lastSynced2: " + lastSynced2, lastSynced < lastSynced2);
         for (ExternalIdentityRef groupRef : externalUser.getDeclaredGroups()) {
             Group gr = userManager.getAuthorizable(groupRef.getId(), Group.class);
             long groupLastSynced = gr.getProperty(DefaultSyncContext.REP_LAST_SYNCED)[0].getLong();