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 19A22DBBD for ; Wed, 14 Nov 2012 15:42:30 +0000 (UTC) Received: (qmail 2407 invoked by uid 500); 14 Nov 2012 15:42:30 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 2376 invoked by uid 500); 14 Nov 2012 15:42:29 -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 2366 invoked by uid 99); 14 Nov 2012 15:42:29 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Nov 2012 15:42:29 +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, 14 Nov 2012 15:42:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 30F9C23888E4; Wed, 14 Nov 2012 15:42:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1409233 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java Date: Wed, 14 Nov 2012 15:42:06 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121114154206.30F9C23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Wed Nov 14 15:42:05 2012 New Revision: 1409233 URL: http://svn.apache.org/viewvc?rev=1409233&view=rev Log: OAK-447: Adding a node with the name of a removed node can lead to an inconsistent hierarchy of node builders Test case demonstrating the issue Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java?rev=1409233&r1=1409232&r2=1409233&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java Wed Nov 14 15:42:05 2012 @@ -16,10 +16,13 @@ */ package org.apache.jackrabbit.oak.plugins.memory; +import java.util.Collections; + import com.google.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.PropertyState; import org.apache.jackrabbit.oak.spi.state.NodeBuilder; import org.apache.jackrabbit.oak.spi.state.NodeState; +import org.junit.Ignore; import org.junit.Test; import static junit.framework.Assert.assertEquals; @@ -38,7 +41,9 @@ public class MemoryNodeBuilderTest { "b", LongPropertyState.createLongProperty("b", 2L), "c", LongPropertyState.createLongProperty("c", 3L)), ImmutableMap.of( - "x", MemoryNodeState.EMPTY_NODE, + "x", new MemoryNodeState( + Collections.emptyMap(), + Collections.singletonMap("q", MemoryNodeState.EMPTY_NODE)), "y", MemoryNodeState.EMPTY_NODE, "z", MemoryNodeState.EMPTY_NODE)); @@ -115,6 +120,18 @@ public class MemoryNodeBuilderTest { } @Test + @Ignore("OAK-447") // FIXME OAK-447 + public void testAddRemovedNodeAgain() { + NodeBuilder root = new MemoryNodeBuilder(BASE); + + root.removeNode("x"); + NodeBuilder x = root.child("x"); + + x.child("q"); + assertTrue(x.hasChildNode("q")); + } + + @Test public void testReset() { NodeBuilder root = new MemoryNodeBuilder(BASE); NodeBuilder child = root.child("x");