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 EE297EFFF for ; Thu, 21 Feb 2013 17:34:31 +0000 (UTC) Received: (qmail 96827 invoked by uid 500); 21 Feb 2013 17:34:31 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 96809 invoked by uid 500); 21 Feb 2013 17:34:31 -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 96801 invoked by uid 99); 21 Feb 2013 17:34:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Feb 2013 17:34:31 +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, 21 Feb 2013 17:34:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A5F6E2388993; Thu, 21 Feb 2013 17:34:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1448734 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment: CompareAgainstBaseStateTest.java RecordTest.java SegmentSizeTest.java Date: Thu, 21 Feb 2013 17:34:08 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130221173408.A5F6E2388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Feb 21 17:34:08 2013 New Revision: 1448734 URL: http://svn.apache.org/r1448734 Log: OAK-593: Segment-based MK Fix test cases Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompareAgainstBaseStateTest.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java 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/CompareAgainstBaseStateTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompareAgainstBaseStateTest.java?rev=1448734&r1=1448733&r2=1448734&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompareAgainstBaseStateTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/CompareAgainstBaseStateTest.java Thu Feb 21 17:34:08 2013 @@ -148,9 +148,9 @@ public class CompareAgainstBaseStateTest } private NodeState persist(NodeBuilder builder) { - RecordId id = writer.writeNode(builder.getNodeState()); + NodeState state = writer.writeNode(builder.getNodeState()); writer.flush(); - return new SegmentNodeState(reader, id); + return state; } } Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java?rev=1448734&r1=1448733&r2=1448734&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/RecordTest.java Thu Feb 21 17:34:08 2013 @@ -240,9 +240,8 @@ public class RecordTest { @Test public void testEmptyNode() { NodeState before = MemoryNodeState.EMPTY_NODE; - RecordId id = writer.writeNode(before); + NodeState after = writer.writeNode(before); writer.flush(); - NodeState after = new SegmentNodeState(reader, id); assertEquals(before, after); } @@ -253,9 +252,8 @@ public class RecordTest { .setProperty("bar", 123) .setProperty("baz", Math.PI) .getNodeState(); - RecordId id = writer.writeNode(before); + NodeState after = writer.writeNode(before); writer.flush(); - NodeState after = new SegmentNodeState(reader, id); assertEquals(before, after); } @@ -266,10 +264,9 @@ public class RecordTest { for (int i = 0; i < 1000; i++) { builder = builder.child("test"); } - NodeState before = builder.getNodeState(); - RecordId id = writer.writeNode(before); + NodeState before = builder.getNodeState(); + NodeState after = writer.writeNode(before); writer.flush(); - NodeState after = new SegmentNodeState(reader, id); assertEquals(before, after); } 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=1448734&r1=1448733&r2=1448734&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 Thu Feb 21 17:34:08 2013 @@ -153,23 +153,23 @@ public class SegmentSizeTest { builder.child("child" + i); } - RecordId id = writer.writeNode(builder.getNodeState()); + SegmentNodeState state = writer.writeNode(builder.getNodeState()); writer.flush(); - Segment segment = store.readSegment(id.getSegmentId()); + Segment segment = store.readSegment(state.getRecordId().getSegmentId()); assertEquals(26040, segment.getData().length); - builder = new SegmentNodeState(reader, id).builder(); + builder = state.builder(); builder.child("child1000"); - id = writer.writeNode(builder.getNodeState()); + state = writer.writeNode(builder.getNodeState()); writer.flush(); - segment = store.readSegment(id.getSegmentId()); + segment = store.readSegment(state.getRecordId().getSegmentId()); assertEquals(576, segment.getData().length); } private int getSize(NodeBuilder builder) { SegmentStore store = new MemoryStore(); SegmentWriter writer = new SegmentWriter(store, new SegmentReader(store)); - RecordId id = writer.writeNode(builder.getNodeState()); + RecordId id = writer.writeNode(builder.getNodeState()).getRecordId(); writer.flush(); Segment segment = store.readSegment(id.getSegmentId()); return segment.getData().length; @@ -181,7 +181,7 @@ public class SegmentSizeTest { NodeState state = builder.getNodeState(); writer.writeNode(state); writer.flush(); - RecordId id = writer.writeNode(state); + RecordId id = writer.writeNode(state).getRecordId(); writer.flush(); Segment segment = store.readSegment(id.getSegmentId()); return segment.getData().length;