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 2DC979590 for ; Thu, 26 Jul 2012 13:35:22 +0000 (UTC) Received: (qmail 56901 invoked by uid 500); 26 Jul 2012 13:24:59 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 38737 invoked by uid 500); 26 Jul 2012 13:22:54 -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-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 2568 invoked by uid 99); 26 Jul 2012 13:16:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2012 13:16:59 +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; Thu, 26 Jul 2012 13:16:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DFDD823888E4; Thu, 26 Jul 2012 13:16:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1365977 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/oak/plugins/memory/ test/java/org/apache/jackrabbit/oak/plugins/memory/ Date: Thu, 26 Jul 2012 13:16:11 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120726131611.DFDD823888E4@eris.apache.org> Author: jukka Date: Thu Jul 26 13:16:11 2012 New Revision: 1365977 URL: http://svn.apache.org/viewvc?rev=1365977&view=rev Log: OAK-167: Caching NodeStore implementation Add test cases for basic MNSB state changes Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStateBuilderTest.java (with props) Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanValue.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanValue.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanValue.java?rev=1365977&r1=1365976&r2=1365977&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanValue.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/BooleanValue.java Thu Jul 26 13:16:11 2012 @@ -18,22 +18,32 @@ package org.apache.jackrabbit.oak.plugin import javax.jcr.PropertyType; +import org.apache.jackrabbit.oak.api.CoreValue; + abstract class BooleanValue extends MemoryValue { - public static final BooleanValue TRUE = new BooleanValue() { + public static final CoreValue TRUE = new BooleanValue() { @Override public boolean getBoolean() { return true; } }; - public static final BooleanValue FALSE = new BooleanValue() { + public static final CoreValue FALSE = new BooleanValue() { @Override public boolean getBoolean() { return false; } }; + public static CoreValue create(boolean value) { + if (value) { + return TRUE; + } else { + return FALSE; + } + } + @Override public int getType() { return PropertyType.BOOLEAN; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java?rev=1365977&r1=1365976&r2=1365977&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/memory/SinglePropertyState.java Thu Jul 26 13:16:11 2012 @@ -18,24 +18,42 @@ */ package org.apache.jackrabbit.oak.plugins.memory; +import static com.google.common.base.Preconditions.checkNotNull; + import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; import org.apache.jackrabbit.oak.api.CoreValue; +import org.apache.jackrabbit.oak.api.PropertyState; /** * Single-valued property state. */ public class SinglePropertyState extends EmptyPropertyState { + public static PropertyState create(String name, boolean value) { + return new SinglePropertyState(name, BooleanValue.create(value)); + } + + public static PropertyState create(String name, double value) { + return new SinglePropertyState(name, new DoubleValue(value)); + } + + public static PropertyState create(String name, long value) { + return new SinglePropertyState(name, new LongValue(value)); + } + + public static PropertyState create(String name, String value) { + return new SinglePropertyState(name, new StringValue(value)); + } + private final CoreValue value; public SinglePropertyState(String name, CoreValue value) { super(name); - assert value != null; - this.value = value; + this.value = checkNotNull(value); } @Override Added: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStateBuilderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStateBuilderTest.java?rev=1365977&view=auto ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStateBuilderTest.java (added) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStateBuilderTest.java Thu Jul 26 13:16:11 2012 @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.jackrabbit.oak.plugins.memory; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertFalse; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; +import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.fail; + +import org.apache.jackrabbit.oak.api.PropertyState; +import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.apache.jackrabbit.oak.spi.state.NodeStateBuilder; +import org.junit.Test; + +import com.google.common.collect.ImmutableMap; + +public class MemoryNodeStateBuilderTest { + + private static final NodeState BASE = new MemoryNodeState( + ImmutableMap.of( + "a", SinglePropertyState.create("a", 1), + "b", SinglePropertyState.create("b", 2), + "c", SinglePropertyState.create("c", 3)), + ImmutableMap.of( + "x", MemoryNodeState.EMPTY_NODE, + "y", MemoryNodeState.EMPTY_NODE, + "z", MemoryNodeState.EMPTY_NODE)); + + @Test + public void testConnectOnAddProperty() { + NodeStateBuilder root = new MemoryNodeStateBuilder(BASE); + NodeStateBuilder childA = root.getChildBuilder("x"); + NodeStateBuilder childB = root.getChildBuilder("x"); + + assertNull(childA.getProperty("test")); + childB.setProperty("test", new StringValue("foo")); + assertNotNull(childA.getProperty("test")); + } + + @Test + public void testConnectOnUpdateProperty() { + NodeStateBuilder root = new MemoryNodeStateBuilder(BASE); + NodeStateBuilder childA = root.getChildBuilder("x"); + NodeStateBuilder childB = root.getChildBuilder("x"); + + childB.setProperty("test", new StringValue("foo")); + childA.setProperty("test", new StringValue("bar")); + assertEquals( + "bar", + childB.getProperty("test").getValue().getString()); + } + + @Test + public void testConnectOnRemoveProperty() { + NodeStateBuilder root = new MemoryNodeStateBuilder(BASE); + NodeStateBuilder childA = root.getChildBuilder("x"); + NodeStateBuilder childB = root.getChildBuilder("x"); + + childB.setProperty("test", new StringValue("foo")); + childA.removeProperty("test"); + assertNull(childB.getProperty("test")); + } + + @Test + public void testConnectOnAddNode() { + NodeStateBuilder root = new MemoryNodeStateBuilder(BASE); + NodeStateBuilder childA = root.getChildBuilder("x"); + NodeStateBuilder childB = root.getChildBuilder("x"); + + assertFalse(childA.hasChildNode("test")); + childB.setNode("test", MemoryNodeState.EMPTY_NODE); + assertTrue(childA.hasChildNode("test")); + } + + @Test(expected = IllegalStateException.class) + public void testConnectOnRemoveNode() { + NodeStateBuilder root = new MemoryNodeStateBuilder(BASE); + NodeStateBuilder child = root.getChildBuilder("x"); + + root.removeNode("x"); + child.getChildNodeCount(); // should throw ISE + fail(); + } + +} Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeStateBuilderTest.java ------------------------------------------------------------------------------ svn:eol-style = native