Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 52249 invoked from network); 26 Mar 2009 13:33:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 26 Mar 2009 13:33:19 -0000 Received: (qmail 14139 invoked by uid 500); 26 Mar 2009 13:33:14 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 14093 invoked by uid 500); 26 Mar 2009 13:33:14 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 14064 invoked by uid 99); 26 Mar 2009 13:33:12 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Mar 2009 13:33:12 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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 Mar 2009 13:33:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B2FB72388962; Thu, 26 Mar 2009 13:32:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758629 - in /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core: NodeImplTest.java XATest.java Date: Thu, 26 Mar 2009 13:32:46 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090326133248.B2FB72388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Thu Mar 26 13:32:40 2009 New Revision: 758629 URL: http://svn.apache.org/viewvc?rev=758629&view=rev Log: tests: missing session.logout Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java?rev=758629&r1=758628&r2=758629&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NodeImplTest.java Thu Mar 26 13:32:40 2009 @@ -79,13 +79,16 @@ private static Principal getReadOnlyPrincipal() throws RepositoryException, NotExecutableException { SessionImpl s = (SessionImpl) helper.getReadOnlySession(); - for (Iterator it = s.getSubject().getPrincipals().iterator(); it.hasNext();) { - Principal p = (Principal) it.next(); - if (!(p instanceof Group)) { - return p; + try { + for (Iterator it = s.getSubject().getPrincipals().iterator(); it.hasNext();) { + Principal p = (Principal) it.next(); + if (!(p instanceof Group)) { + return p; + } } + } finally { + s.logout(); } - s.logout(); throw new NotExecutableException(); } Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java?rev=758629&r1=758628&r2=758629&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/XATest.java Thu Mar 26 13:32:40 2009 @@ -54,28 +54,31 @@ // clean testroot on second workspace Session s2 = helper.getSuperuserSession(workspaceName); - Node root = s2.getRootNode(); - if (root.hasNode(testPath)) { - // clean test root - Node testRootNode = root.getNode(testPath); - for (NodeIterator children = testRootNode.getNodes(); children.hasNext();) { - children.nextNode().remove(); - } - } else { - // create nodes to testPath - StringTokenizer names = new StringTokenizer(testPath, "/"); - Node currentNode = root; - while (names.hasMoreTokens()) { - String name = names.nextToken(); - if (currentNode.hasNode(name)) { - currentNode = currentNode.getNode(name); - } else { - currentNode = currentNode.addNode(name, testNodeType); + try { + Node root = s2.getRootNode(); + if (root.hasNode(testPath)) { + // clean test root + Node testRootNode = root.getNode(testPath); + for (NodeIterator children = testRootNode.getNodes(); children.hasNext();) { + children.nextNode().remove(); + } + } else { + // create nodes to testPath + StringTokenizer names = new StringTokenizer(testPath, "/"); + Node currentNode = root; + while (names.hasMoreTokens()) { + String name = names.nextToken(); + if (currentNode.hasNode(name)) { + currentNode = currentNode.getNode(name); + } else { + currentNode = currentNode.addNode(name, testNodeType); + } } } + root.save(); + } finally { + s2.logout(); } - root.save(); - } /** @@ -1513,24 +1516,27 @@ final String testNodePath = testPath + "/" + Math.random(); Session session = helper.getSuperuserSession(); - - // Add node - doTransactional(new Operation() { - public void invoke(Session session) throws Exception { - session.getRootNode().addNode(testNodePath); - session.save(); - } - }, session); - - for (int i = 1; i <= 3; i++) { - // Set property "name" to value "value" + try { + // Add node doTransactional(new Operation() { public void invoke(Session session) throws Exception { - Node n = (Node) session.getItem("/" + testNodePath); - n.setProperty("name", "value"); + session.getRootNode().addNode(testNodePath); session.save(); } }, session); + + for (int i = 1; i <= 3; i++) { + // Set property "name" to value "value" + doTransactional(new Operation() { + public void invoke(Session session) throws Exception { + Node n = (Node) session.getItem("/" + testNodePath); + n.setProperty("name", "value"); + session.save(); + } + }, session); + } + } finally { + session.logout(); } } @@ -1545,31 +1551,34 @@ final String testNodePath = testPath + "/" + Math.random(); Session session = helper.getSuperuserSession(); - - for (int i = 1; i <= 3; i++) { - // Add parent node - doTransactional(new Operation() { - public void invoke(Session session) throws Exception { - session.getRootNode().addNode(testNodePath); - session.save(); - } - }, session); - - // Add child node - doTransactional(new Operation() { - public void invoke(Session session) throws Exception { - session.getRootNode().addNode(testNodePath + "/subnode"); - session.save(); - } - }, session); - - // Remove parent node - doTransactional(new Operation() { - public void invoke(Session session) throws Exception { - session.getRootNode().getNode(testNodePath).remove(); - session.save(); - } - }, session); + try { + for (int i = 1; i <= 3; i++) { + // Add parent node + doTransactional(new Operation() { + public void invoke(Session session) throws Exception { + session.getRootNode().addNode(testNodePath); + session.save(); + } + }, session); + + // Add child node + doTransactional(new Operation() { + public void invoke(Session session) throws Exception { + session.getRootNode().addNode(testNodePath + "/subnode"); + session.save(); + } + }, session); + + // Remove parent node + doTransactional(new Operation() { + public void invoke(Session session) throws Exception { + session.getRootNode().getNode(testNodePath).remove(); + session.save(); + } + }, session); + } + } finally { + session.logout(); } }