svn commit: r985895 - /jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/

[ju...@apache.org]

Author: jukka
Date: Mon Aug 16 12:04:37 2010
New Revision: 985895

URL: http://svn.apache.org/viewvc?rev=985895&view=rev
Log:
JCR-2708: Merge jcr-benchmark into the performance test suite

Rename PerformanceTest to AbstractTest to avoid conflict with the PerformanceTest classes in per-version test runs

Added:
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java
      - copied, changed from r985842, jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTest.java
Removed:
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTest.java
Modified:
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ConcurrentReadTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTestSuite.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SimpleSearchTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/TransientManyChildNodesTest.java
    jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/UpdateManyChildNodesTest.java

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java Mon Aug 16 12:04:37 2010
@@ -101,7 +101,7 @@ public abstract class AbstractPerformanc
     }
 
     private void runTest(
-            PerformanceTestSuite suite, PerformanceTest test,
+            PerformanceTestSuite suite, AbstractTest test,
             PrintWriter writer, String name) throws Exception {
         DescriptiveStatistics statistics = suite.runTest(test);
         writer.format(

Copied: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java (from r985842, jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java?p2=jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java&p1=jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTest.java&r1=985842&r2=985895&rev=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractTest.java Mon Aug 16 12:04:37 2010
@@ -19,7 +19,10 @@ package org.apache.jackrabbit.performanc
 import javax.jcr.Credentials;
 import javax.jcr.Repository;
 
-public abstract class PerformanceTest {
+/**
+ * Abstract base class for individual performance benchmarks.
+ */
+public abstract class AbstractTest {
 
     private Repository repository;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java Mon Aug 16 12:04:37 2010
@@ -26,7 +26,7 @@ import javax.jcr.Session;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.NullOutputStream;
 
-public class BigFileReadTest extends PerformanceTest {
+public class BigFileReadTest extends AbstractTest {
 
     private static final int FILE_COUNT = 10;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java Mon Aug 16 12:04:37 2010
@@ -22,7 +22,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-public class BigFileWriteTest extends PerformanceTest {
+public class BigFileWriteTest extends AbstractTest {
 
     private static final int FILE_SIZE = 100;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ConcurrentReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ConcurrentReadTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ConcurrentReadTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ConcurrentReadTest.java Mon Aug 16 12:04:37 2010
@@ -32,7 +32,7 @@ import javax.jcr.Session;
  * not the performance of individual readers nor the overall fairness of
  * the scheduling.
  */
-public class ConcurrentReadTest extends PerformanceTest {
+public class ConcurrentReadTest extends AbstractTest {
 
     private static final int NODE_COUNT = 100;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java Mon Aug 16 12:04:37 2010
@@ -24,7 +24,7 @@ import javax.jcr.Session;
  * Test for measuring the performance of creating a node with
  * {@value #CHILD_COUNT} child nodes.
  */
-public class CreateManyChildNodesTest extends PerformanceTest {
+public class CreateManyChildNodesTest extends AbstractTest {
 
     private static final int CHILD_COUNT = 10 * 1000;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java Mon Aug 16 12:04:37 2010
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.performanc
 
 import javax.jcr.RepositoryException;
 
-public class LoginLogoutTest extends PerformanceTest {
+public class LoginLogoutTest extends AbstractTest {
 
     public void runTest() throws RepositoryException {
         for (int i = 0; i < 1000; i++) {

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java Mon Aug 16 12:04:37 2010
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.performanc
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-public class LoginTest extends PerformanceTest {
+public class LoginTest extends AbstractTest {
 
     private final Session[] sessions = new Session[1000];
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTestSuite.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTestSuite.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTestSuite.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PerformanceTestSuite.java Mon Aug 16 12:04:37 2010
@@ -43,7 +43,7 @@ public class PerformanceTestSuite {
         this.credentials = credentials;
     }
 
-    public DescriptiveStatistics runTest(PerformanceTest test) throws Exception {
+    public DescriptiveStatistics runTest(AbstractTest test) throws Exception {
         DescriptiveStatistics statistics = new DescriptiveStatistics();
 
         test.setRepository(repository);
@@ -74,7 +74,7 @@ public class PerformanceTestSuite {
         return statistics;
     }
 
-    public void run(PerformanceTest test) throws Exception {
+    public void run(AbstractTest test) throws Exception {
         DescriptiveStatistics statistics = runTest(test);
         System.out.format(
                 "%-36.36s  %6.0f  %6.0f  %6.0f  %6.0f  %6d%n",

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java Mon Aug 16 12:04:37 2010
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.performanc
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-public class RefreshTest extends PerformanceTest {
+public class RefreshTest extends AbstractTest {
 
     private Session session;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SimpleSearchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SimpleSearchTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SimpleSearchTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SimpleSearchTest.java Mon Aug 16 12:04:37 2010
@@ -23,7 +23,7 @@ import javax.jcr.Session;
 import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
-public class SimpleSearchTest extends PerformanceTest {
+public class SimpleSearchTest extends AbstractTest {
 
     private static final int NODE_COUNT = 100;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java Mon Aug 16 12:04:37 2010
@@ -26,7 +26,7 @@ import javax.jcr.Session;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.output.NullOutputStream;
 
-public class SmallFileReadTest extends PerformanceTest {
+public class SmallFileReadTest extends AbstractTest {
 
     private static final int FILE_COUNT = 1000;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java Mon Aug 16 12:04:37 2010
@@ -22,7 +22,7 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-public class SmallFileWriteTest extends PerformanceTest {
+public class SmallFileWriteTest extends AbstractTest {
 
     private static final int FILE_COUNT = 100;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/TransientManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/TransientManyChildNodesTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/TransientManyChildNodesTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/TransientManyChildNodesTest.java Mon Aug 16 12:04:37 2010
@@ -25,7 +25,7 @@ import javax.jcr.Session;
  * transiently adding and removing a child node to a node that already has
  * {@value #CHILD_COUNT} existing child nodes.
  */
-public class TransientManyChildNodesTest extends PerformanceTest {
+public class TransientManyChildNodesTest extends AbstractTest {
 
     private static final int CHILD_COUNT = 10 * 1000;
 

Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/UpdateManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/UpdateManyChildNodesTest.java?rev=985895&r1=985894&r2=985895&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/UpdateManyChildNodesTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/UpdateManyChildNodesTest.java Mon Aug 16 12:04:37 2010
@@ -24,7 +24,7 @@ import javax.jcr.Session;
  * Test for measuring the performance of adding one extra child node to 
  * node with {@value #CHILD_COUNT} existing child nodes.
  */
-public class UpdateManyChildNodesTest extends PerformanceTest {
+public class UpdateManyChildNodesTest extends AbstractTest {
 
     private static final int CHILD_COUNT = 10 * 1000;