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

[mr...@apache.org]

Author: mreutegg
Date: Tue Jul 12 09:54:38 2016
New Revision: 1752259

URL: http://svn.apache.org/viewvc?rev=1752259&view=rev
Log:
OAK-4552: Checkpoints.getOldestRevisionToKeep() returns newest valid revision

Add ignored test

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

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java?rev=1752259&r1=1752258&r2=1752259&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/CheckpointsTest.java Tue Jul 12 09:54:38 2016
@@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.spi.sta
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -36,6 +37,7 @@ import com.google.common.collect.Immutab
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
@@ -137,6 +139,29 @@ public class CheckpointsTest {
         assertNull(store.getCheckpoints().getOldestRevisionToKeep());
     }
 
+    // OAK-4552
+    @Ignore("OAK-4552")
+    @Test
+    public void testGetOldestRevisionToKeep2() throws Exception {
+        long lifetime = TimeUnit.HOURS.toMillis(1);
+
+        String r1 = store.getHeadRevision().toString();
+        String c1 = store.checkpoint(lifetime);
+
+        // Do some commit to change headRevision
+        NodeBuilder b2 = store.getRoot().builder();
+        b2.child("x");
+        store.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+        String r2 = store.getHeadRevision().toString();
+        String c2 = store.checkpoint(lifetime);
+        assertNotEquals(r1, r2);
+        assertNotEquals(c1, c2);
+
+        // r1 is older
+        assertEquals(r1, store.getCheckpoints().getOldestRevisionToKeep().toString());
+    }
+
     @Test
     public void checkpointRemove() throws Exception{
         long et1 = 1000, et2 = et1 + 1000;