Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: oak-commits@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1335542 -
 /jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
Date: Tue, 08 May 2012 14:12:21 -0000
To: oak-commits@jackrabbit.apache.org
From: stefan@apache.org
Message-Id: <20120508141221.36A5B23889E1@eris.apache.org>

Author: stefan
Date: Tue May  8 14:12:20 2012
New Revision: 1335542

URL: http://svn.apache.org/viewvc?rev=1335542&view=rev
Log:
OAK-12: Implement a test suite for the MicroKernel (WIP)

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=1335542&r1=1335541&r2=1335542&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 Tue May  8 14:12:20 2012
@@ -146,6 +146,8 @@ public class MicroKernelIT extends Abstr
 
         // diff of rev0->rev2 should be empty
         assertEquals(mk.diff(rev0, rev2, null), "");
+
+
     }
 
     @Test
@@ -158,6 +160,7 @@ public class MicroKernelIT extends Abstr
         for (int i = 0; i < NUM_COMMITS; i++) {
             revs[i] = mk.commit("/test", "^\"cnt\":" + i, null, null);
         }
+        // verify that each revision contains the expected distinct property value
         for (int i = 0; i < NUM_COMMITS; i++) {
             JSONObject obj = parseJSONObject(mk.getNodes("/test", revs[i], 1, 0, -1, null));
             assertPropertyValue(obj, "cnt", (long) i);
@@ -321,6 +324,84 @@ public class MicroKernelIT extends Abstr
     }
 
     @Test
+    public void getNodesDepth() {
+        mk.commit("", "+\"/testRoot\":{\"depth\":0}", null, "");
+        mk.commit("/testRoot", "+\"a\":{\"depth\":1}\n" +
+                "+\"a/b\":{\"depth\":2}\n" +
+                "+\"a/b/c\":{\"depth\":3}\n" +
+                "+\"a/b/c/d\":{\"depth\":4}\n" +
+                "+\"a/b/c/d/e\":{\"depth\":5}\n",
+                null, "");
+
+        // depth = 0: properties, including :childNodeCount and empty child node objects
+        JSONObject obj = parseJSONObject(mk.getNodes("/testRoot", null, 0, 0, -1, null));
+        assertPropertyValue(obj, "depth", 0l);
+        assertPropertyValue(obj, ":childNodeCount", 1l);
+        JSONObject child = resolveObjectValue(obj, "a");
+        assertNotNull(child);
+        assertEquals(child.size(), 0);
+
+        // depth = 1: properties, child nodes and their properties (including :childNodeCount)
+        obj = parseJSONObject(mk.getNodes("/testRoot", null, 1, 0, -1, null));
+        assertPropertyValue(obj, "depth", 0l);
+        assertPropertyValue(obj, ":childNodeCount", 1l);
+        assertPropertyValue(obj, "a/depth", 1l);
+        assertPropertyValue(obj, "a/:childNodeCount", 1l);
+        child = resolveObjectValue(obj, "a/b");
+        assertNotNull(child);
+        assertEquals(child.size(), 0);
+
+        // depth = 2: [and so on...]
+        obj = parseJSONObject(mk.getNodes("/testRoot", null, 2, 0, -1, null));
+        assertPropertyValue(obj, "depth", 0l);
+        assertPropertyValue(obj, ":childNodeCount", 1l);
+        assertPropertyValue(obj, "a/depth", 1l);
+        assertPropertyValue(obj, "a/:childNodeCount", 1l);
+        assertPropertyValue(obj, "a/b/depth", 2l);
+        assertPropertyValue(obj, "a/b/:childNodeCount", 1l);
+        child = resolveObjectValue(obj, "a/b/c");
+        assertNotNull(child);
+        assertEquals(child.size(), 0);
+
+        // depth = 3: [and so on...]
+        obj = parseJSONObject(mk.getNodes("/testRoot", null, 3, 0, -1, null));
+        assertPropertyValue(obj, "depth", 0l);
+        assertPropertyValue(obj, ":childNodeCount", 1l);
+        assertPropertyValue(obj, "a/depth", 1l);
+        assertPropertyValue(obj, "a/:childNodeCount", 1l);
+        assertPropertyValue(obj, "a/b/depth", 2l);
+        assertPropertyValue(obj, "a/b/:childNodeCount", 1l);
+        assertPropertyValue(obj, "a/b/c/depth", 3l);
+        assertPropertyValue(obj, "a/b/c:childNodeCount", 1l);
+        child = resolveObjectValue(obj, "a/b/c/d");
+        assertNotNull(child);
+        assertEquals(child.size(), 0);
+    }
+
+    @Test
+    public void getNodesRevision() {
+        // 1st pass
+        long tst = System.currentTimeMillis();
+        String head = mk.commit("/test", "^\"tst\":" + tst, null, null);
+        assertEquals(head, mk.getHeadRevision());
+        // test getNodes with 'null' revision
+        assertPropertyValue(parseJSONObject(mk.getNodes("/test", null, 1, 0, -1, null)), "tst", tst);
+        // test getNodes with specific revision
+        assertPropertyValue(parseJSONObject(mk.getNodes("/test", head, 1, 0, -1, null)), "tst", tst);
+
+        // 2nd pass
+        tst = System.currentTimeMillis();
+        String oldHead = head;
+        head = mk.commit("/test", "^\"tst\":" + tst, null, null);
+        assertFalse(head.equals(oldHead));
+        assertEquals(head, mk.getHeadRevision());
+        // test getNodes with 'null' revision
+        assertPropertyValue(parseJSONObject(mk.getNodes("/test", null, 1, 0, -1, null)), "tst", tst);
+        // test getNodes with specific revision
+        assertPropertyValue(parseJSONObject(mk.getNodes("/test", head, 1, 0, -1, null)), "tst", tst);
+    }
+
+    @Test
     public void missingName() {
         String head = mk.getHeadRevision();