svn commit: r1629247 - /jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java

[st...@apache.org]

Author: stefan
Date: Fri Oct  3 16:10:06 2014
New Revision: 1629247

URL: http://svn.apache.org/r1629247
Log:
OAK-12: fix branchAndMerge() test

Modified:
    jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java

Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java?rev=1629247&r1=1629246&r2=1629247&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java Fri Oct  3 16:10:06 2014
@@ -1024,6 +1024,8 @@ public class MicroKernelIT extends Abstr
         // make sure /branch doesn't exist in head
         assertFalse(mk.nodeExists("/branch", null));
 
+        long ts = System.currentTimeMillis();
+
         String oldHead = mk.getHeadRevision();
 
         // create a branch on head
@@ -1041,7 +1043,8 @@ public class MicroKernelIT extends Abstr
         branchRev = mk.commit("", "+\"/branch/foo\":{}", branchRev, "");
 
         // make sure branchRev doesn't show up in revision history
-        String hist = mk.getRevisionHistory(0, -1, null);
+        // get history since initial timestamp
+        String hist = mk.getRevisionHistory(ts, -1, null);
         JSONArray array = parseJSONArray(hist);
         for (Object entry : array) {
             assertTrue(entry instanceof JSONObject);