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 0D3089A83 for ; Thu, 26 Apr 2012 18:14:00 +0000 (UTC) Received: (qmail 23837 invoked by uid 500); 26 Apr 2012 18:14:00 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 23811 invoked by uid 500); 26 Apr 2012 18:14:00 -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 23801 invoked by uid 99); 26 Apr 2012 18:13:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 18:13: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 Apr 2012 18:13:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 902F22388860; Thu, 26 Apr 2012 18:13:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331005 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java Date: Thu, 26 Apr 2012 18:13:38 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120426181338.902F22388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Apr 26 18:13:38 2012 New Revision: 1331005 URL: http://svn.apache.org/viewvc?rev=1331005&view=rev Log: Session.save and Session.refresh test cases Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1331005&r1=1331004&r2=1331005&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java Thu Apr 26 18:13:38 2012 @@ -1143,18 +1143,52 @@ public class RepositoryTest extends Abst } } - @Test(expected = RepositoryException.class) - @Ignore("WIP") // TODO clarify + @Test + public void sessionIsolation() throws RepositoryException { + Session session1 = getRepository().login(); + Session session2 = getRepository().login(); + try { + session1.getRootNode().addNode("node1"); + session2.getRootNode().addNode("node2"); + assertTrue(session1.getRootNode().hasNode("node1")); + assertTrue(session2.getRootNode().hasNode("node2")); + assertFalse(session1.getRootNode().hasNode("node2")); + assertFalse(session2.getRootNode().hasNode("node1")); + + session1.save(); + session2.save(); + assertTrue(session1.getRootNode().hasNode("node1")); + assertFalse(session1.getRootNode().hasNode("node2")); + assertTrue(session2.getRootNode().hasNode("node1")); + assertTrue(session2.getRootNode().hasNode("node2")); + } + finally { + session1.logout(); + session2.logout(); + } + } + + @Test public void saveRefreshConflict() throws RepositoryException { Session session1 = getRepository().login(); Session session2 = getRepository().login(); try { session1.getRootNode().addNode("node"); session2.getRootNode().addNode("node"); + assertTrue(session1.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().hasNode("node")); session1.save(); + assertTrue(session1.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().hasNode("node")); + session2.refresh(true); + assertTrue(session1.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().hasNode("node")); + session2.save(); + assertTrue(session1.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().hasNode("node")); } finally { session1.logout(); @@ -1162,9 +1196,8 @@ public class RepositoryTest extends Abst } } - @Test(expected = RepositoryException.class) - @Ignore("WIP") // TODO clarify - public void refreshConflict2() throws RepositoryException { + @Test + public void saveConflict() throws RepositoryException { getSession().getRootNode().addNode("node"); getSession().save(); @@ -1173,9 +1206,18 @@ public class RepositoryTest extends Abst try { session1.getNode("/node").remove(); session2.getNode("/node").addNode("2"); + assertFalse(session1.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().getNode("node").hasNode("2")); session1.save(); + assertFalse(session1.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().hasNode("node")); + assertTrue(session2.getRootNode().getNode("node").hasNode("2")); + session2.save(); + assertFalse(session1.getRootNode().hasNode("node")); + assertFalse(session2.getRootNode().hasNode("node")); // TODO: is this correct? } finally { session1.logout();