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 st...@apache.org on 2017/12/08 08:34:12 UTC

svn commit: r1817475 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java

Author: stillalex
Date: Fri Dec  8 08:34:12 2017
New Revision: 1817475

URL: http://svn.apache.org/viewvc?rev=1817475&view=rev
Log:
OAK-6982 Test failure: TokenCleanupTest.testAllExpiredReachingThreshold



Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java?rev=1817475&r1=1817474&r2=1817475&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java Fri Dec  8 08:34:12 2017
@@ -17,13 +17,11 @@
 package org.apache.jackrabbit.oak.security.authentication.token;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assume.assumeFalse;
 
 import javax.annotation.Nonnull;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.jackrabbit.oak.api.Tree;
-import org.apache.jackrabbit.oak.commons.CIHelper;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenConstants;
 import org.apache.jackrabbit.oak.spi.security.authentication.token.TokenInfo;
@@ -85,25 +83,14 @@ public class TokenCleanupTest extends Ab
     }
 
     @Test
-    public void testAllExpiredReachingThreshold() throws Exception {
-        assumeFalse(CIHelper.windows());  // FIXME OAK-6982
-        createExpiredTokens(5);
+    public void testExpiredReachingThreshold() throws Exception {
+        // one under the cleanup limit so cleanup doesn't get triggered
+        createExpiredTokens(4);
         int extras = createTokensUntilCleanup();
         assertTokenNodes(extras);
     }
 
     @Test
-    public void testSomeExpiredReachingThreshold() throws Exception {
-        createExpiredTokens(3);
-        tokenProvider.createToken(userId, ImmutableMap.of());
-
-        assertTokenNodes(4);
-
-        int extras = createTokensUntilCleanup();
-        assertTokenNodes(1 + extras);
-    }
-
-    @Test
     public void testNotExpiredReachingThreshold() throws Exception {
         for (int i = 0; i < 10; i++) {
             tokenProvider.createToken(userId, ImmutableMap.of());