svn commit: r1581290 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorTest.java

[chetanm]

Author: chetanm
Date: Tue Mar 25 10:18:11 2014
New Revision: 1581290

URL: http://svn.apache.org/r1581290
Log:
OAK-1341 - DocumentNodeStore: Implement revision garbage collection (WIP)

Enabling the testcase again

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorTest.java?rev=1581290&r1=1581289&r2=1581290&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorTest.java
 Tue Mar 25 10:18:11 2014
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertTru
 
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class VersionGarbageCollectorTest {
@@ -45,7 +44,6 @@ public class VersionGarbageCollectorTest
         clock.waitUntil(Revision.getCurrentTimestamp());
     }
 
-    @Ignore("OAK-1341") // FIXME OAK-1341
     @Test
     public void gcIgnoredForCheckpoint() throws Exception {
         long expiryTime = 100, maxAge = 20;
@@ -54,7 +52,7 @@ public class VersionGarbageCollectorTest
         gc.setMaxRevisionAge(maxAge);
 
         //Fast forward time to future but before expiry of checkpoint
-        clock.waitUntil(cp.getTimestamp() + maxAge);
+        clock.waitUntil(cp.getTimestamp() + expiryTime - maxAge);
         VersionGCStats stats = gc.gc();
         assertTrue(stats.ignoredGCDueToCheckPoint);