Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 726A2E0DC for ; Wed, 13 Feb 2013 15:24:08 +0000 (UTC) Received: (qmail 50518 invoked by uid 500); 13 Feb 2013 15:24:08 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 50480 invoked by uid 500); 13 Feb 2013 15:24:08 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 50462 invoked by uid 99); 13 Feb 2013 15:24:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2013 15:24:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Feb 2013 15:24:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 68737238896F; Wed, 13 Feb 2013 15:23:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1445662 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java Date: Wed, 13 Feb 2013 15:23:47 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130213152347.68737238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Wed Feb 13 15:23:47 2013 New Revision: 1445662 URL: http://svn.apache.org/r1445662 Log: OAK-593: Segment-based MK Add test case for the size of ACL nodes Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java?rev=1445662&r1=1445661&r2=1445662&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/SegmentSizeTest.java Wed Feb 13 15:23:47 2013 @@ -18,14 +18,18 @@ package org.apache.jackrabbit.oak.plugin import static junit.framework.Assert.assertEquals; +import java.util.Calendar; import java.util.Collections; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeState; import org.apache.jackrabbit.oak.plugins.memory.PropertyStates; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; +import org.apache.jackrabbit.util.ISO8601; import org.junit.Test; +import com.google.common.collect.ImmutableList; + /** * Test case for ensuring that segment size remains within bounds. */ @@ -75,6 +79,60 @@ public class SegmentSizeTest { assertEquals(base + 100 * BYTES_PER_REFERENCE, getSize(builder)); } + @Test + public void testDuplicateDates() { + String now = ISO8601.format(Calendar.getInstance()); + + NodeBuilder builder = MemoryNodeState.EMPTY_NODE.builder(); + builder.setProperty(PropertyStates.createProperty( + "test", Collections.nCopies(1, now), Type.DATES)); + int base = getSize(builder); + + builder.setProperty(PropertyStates.createProperty( + "test", Collections.nCopies(10, now), Type.DATES)); + assertEquals(base + 10 * BYTES_PER_REFERENCE, getSize(builder)); + + builder.setProperty(PropertyStates.createProperty( + "test", Collections.nCopies(100, now), Type.DATES)); + assertEquals(base + 100 * BYTES_PER_REFERENCE, getSize(builder)); + } + + @Test + public void testAccessControlNodes() { + NodeBuilder builder = MemoryNodeState.EMPTY_NODE.builder(); + builder.setProperty("jcr:primaryType", "rep:ACL", Type.NAME); + assertEquals(64, getSize(builder)); + + NodeBuilder deny = builder.child("deny"); + deny.setProperty("jcr:primaryType", "rep:DenyACE", Type.NAME); + deny.setProperty("rep:principalName", "everyone"); + builder.setProperty(PropertyStates.createProperty( + "rep:privileges", ImmutableList.of("jcr:read"), Type.NAMES)); + assertEquals(232, getSize(builder)); + + NodeBuilder allow = builder.child("allow"); + allow.setProperty("jcr:primaryType", "rep:GrantACE"); + allow.setProperty("rep:principalName", "administrators"); + allow.setProperty(PropertyStates.createProperty( + "rep:privileges", ImmutableList.of("jcr:all"), Type.NAMES)); + assertEquals(374, getSize(builder)); + + NodeBuilder deny0 = builder.child("deny0"); + deny0.setProperty("jcr:primaryType", "rep:DenyACE", Type.NAME); + deny0.setProperty("rep:principalName", "everyone"); + deny0.setProperty("rep:glob", "*/activities/*"); + builder.setProperty(PropertyStates.createProperty( + "rep:privileges", ImmutableList.of("jcr:read"), Type.NAMES)); + assertEquals(504, getSize(builder)); + + NodeBuilder allow0 = builder.child("allow0"); + allow0.setProperty("jcr:primaryType", "rep:GrantACE"); + allow0.setProperty("rep:principalName", "user-administrators"); + allow0.setProperty(PropertyStates.createProperty( + "rep:privileges", ImmutableList.of("jcr:all"), Type.NAMES)); + assertEquals(631, getSize(builder)); + } + private int getSize(NodeBuilder builder) { SegmentStore store = new MemoryStore(); SegmentWriter writer = new SegmentWriter(store);