Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 25131 invoked from network); 3 Aug 2010 14:15:53 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 3 Aug 2010 14:15:53 -0000 Received: (qmail 29478 invoked by uid 500); 3 Aug 2010 14:15:53 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 29418 invoked by uid 500); 3 Aug 2010 14:15:52 -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 29411 invoked by uid 99); 3 Aug 2010 14:15:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Aug 2010 14:15:52 +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; Tue, 03 Aug 2010 14:15:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B7BB523889ED; Tue, 3 Aug 2010 14:14:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r981895 - in /jackrabbit/trunk/jackrabbit-core/src/test/performance: base/ base/src/main/java/org/apache/jackrabbit/performance/ jackrabbit10/src/test/java/org/apache/jackrabbit/performance/ Date: Tue, 03 Aug 2010 14:14:31 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100803141431.B7BB523889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue Aug 3 14:14:31 2010 New Revision: 981895 URL: http://svn.apache.org/viewvc?rev=981895&view=rev Log: JCR-2695: Jackrabbit performance test suite Use the benchmarks from jackrabbit-jcr-benchmark Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/base/pom.xml jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit10/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/base/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/base/pom.xml?rev=981895&r1=981894&r2=981895&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/performance/base/pom.xml (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/performance/base/pom.xml Tue Aug 3 14:14:31 2010 @@ -42,8 +42,13 @@ org.apache.jackrabbit + jackrabbit-jcr-benchmark + 1.0-SNAPSHOT + + + org.apache.jackrabbit jackrabbit-core - 1.4 + 1.6.2 provided @@ -52,6 +57,11 @@ 1.4 + org.slf4j + slf4j-nop + 1.5.8 + + org.testng testng jdk15 Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java?rev=981895&r1=981894&r2=981895&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java Tue Aug 3 14:14:31 2010 @@ -35,15 +35,17 @@ import javax.jcr.version.VersionHistory; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.apache.jackrabbit.api.JackrabbitNodeTypeManager; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.config.RepositoryConfig; +import org.apache.jackrabbit.benchmark.PerformanceTestSuite; +import org.apache.jackrabbit.benchmark.LoginTest; +import org.apache.jackrabbit.benchmark.LoginLogoutTest; public abstract class AbstractPerformanceTest { - protected void createRepositories(String name) throws Exception { + protected void testPerformance(String name) throws Exception { // Create a repository using the Jackrabbit default configuration - createRepository( + testPerformance( name, RepositoryImpl.class.getResourceAsStream("repository.xml")); @@ -55,7 +57,7 @@ public abstract class AbstractPerformanc for (File file : files) { String xml = file.getName(); if (file.isFile() && xml.endsWith(".xml")) { - createRepository( + testPerformance( name + "-" + xml.substring(0, xml.length() - 4), FileUtils.openInputStream(file)); } @@ -63,6 +65,20 @@ public abstract class AbstractPerformanc } } + protected void testPerformance(String name, InputStream xml) + throws Exception { + RepositoryImpl repository = createRepository(name, xml); + try { + PerformanceTestSuite suite = new PerformanceTestSuite( + repository, + new SimpleCredentials("admin", "admin".toCharArray())); + suite.runTest(new LoginTest()); + suite.runTest(new LoginLogoutTest()); + } finally { + repository.shutdown(); + } + } + /** * Creates a named test repository with the given configuration file. * @@ -70,7 +86,7 @@ public abstract class AbstractPerformanc * @param xml input stream for reading the repository configuration * @throws Exception if the repository could not be created */ - protected void createRepository(String name, InputStream xml) + private RepositoryImpl createRepository(String name, InputStream xml) throws Exception { File directory = new File(new File("target", "repository"), name); File configuration = new File(directory, "repository.xml"); @@ -88,25 +104,8 @@ public abstract class AbstractPerformanc } // Create the repository - try { - RepositoryConfig config = RepositoryConfig.create( - configuration.getPath(), directory.getPath()); - RepositoryImpl repository = RepositoryImpl.create(config); - try { - Session session = repository.login( - new SimpleCredentials("admin", "admin".toCharArray())); - try { - // createTestData(session); - } finally { - session.logout(); - } - } finally { - repository.shutdown(); - } - } catch (RepositoryException e) { - e.printStackTrace(); - fail("Create repository " + name); - } + return RepositoryImpl.create(RepositoryConfig.create( + configuration.getPath(), directory.getPath())); } } Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit10/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit10/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=981895&r1=981894&r2=981895&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit10/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit10/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Tue Aug 3 14:14:31 2010 @@ -16,6 +16,13 @@ */ package org.apache.jackrabbit.performance; +import org.testng.annotations.Test; + public class PerformanceTest extends AbstractPerformanceTest { + @Test + public void testPerformance() throws Exception { + testPerformance("jackrabbit10"); + } + }