You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by md...@apache.org on 2014/11/10 14:44:02 UTC
svn commit: r1637852 - in /jackrabbit/oak/branches/1.0: ./
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
Author: mduerig
Date: Mon Nov 10 13:44:02 2014
New Revision: 1637852
URL: http://svn.apache.org/r1637852
Log:
OAK-2031: MemoryNodeBuilder#set only works on root builders
- merged r1621123
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1621123
Modified: jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java?rev=1637852&r1=1637851&r2=1637852&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/memory/MemoryNodeBuilderTest.java Mon Nov 10 13:44:02 2014
@@ -26,6 +26,8 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.junit.Before;
+import org.junit.Assume;
+import org.junit.Ignore;
import org.junit.Test;
import static junit.framework.Assert.assertEquals;
@@ -289,6 +291,22 @@ public class MemoryNodeBuilderTest {
assertTrue(c.hasProperty("c2"));
}
+ @Ignore("OAK-2031") // FIXME OAK-2031
+ @Test
+ public void setTest() {
+ Assume.assumeTrue(EMPTY_NODE.builder() instanceof MemoryNodeBuilder);
+ MemoryNodeBuilder rootBuilder = (MemoryNodeBuilder) EMPTY_NODE.builder();
+ assertFalse(base.equals(rootBuilder.getNodeState()));
+ rootBuilder.set(base);
+ assertTrue(base.equals(rootBuilder.getNodeState()));
+
+ MemoryNodeBuilder xBuilder = (MemoryNodeBuilder) rootBuilder.getChildNode("x");
+ NodeState yState = base.getChildNode("y");
+ assertFalse(yState.equals(xBuilder.getNodeState()));
+ xBuilder.set(yState);
+ assertTrue(yState.equals(xBuilder.getNodeState()));
+ }
+
@Test
public void testMove() {
NodeBuilder rootBuilder = base.builder();