You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/08/09 16:52:41 UTC

svn commit: r983663 - /jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java

Author: jukka
Date: Mon Aug  9 14:52:41 2010
New Revision: 983663

URL: http://svn.apache.org/viewvc?rev=983663&view=rev
Log:
JCR-2695: Jackrabbit performance test suite

Add a simple search performance test

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java

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=983663&r1=983662&r2=983663&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 Mon Aug  9 14:52:41 2010
@@ -36,7 +36,7 @@ import javax.jcr.version.VersionHistory;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.math.stat.descriptive.SummaryStatistics;
+import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.jackrabbit.benchmark.PerformanceTest;
@@ -48,6 +48,8 @@ import org.apache.jackrabbit.benchmark.S
 import org.apache.jackrabbit.benchmark.BigFileReadTest;
 import org.apache.jackrabbit.benchmark.BigFileWriteTest;
 import org.apache.jackrabbit.benchmark.ConcurrentReadTest;
+import org.apache.jackrabbit.benchmark.ConcurrentReadWriteTest;
+import org.apache.jackrabbit.benchmark.SimpleSearchTest;
 
 public abstract class AbstractPerformanceTest {
 
@@ -105,6 +107,8 @@ public abstract class AbstractPerformanc
             runTest(suite, new BigFileReadTest(), writer, name);
             runTest(suite, new BigFileWriteTest(), writer, name);
             runTest(suite, new ConcurrentReadTest(), writer, name);
+            runTest(suite, new ConcurrentReadWriteTest(), writer, name);
+            runTest(suite, new SimpleSearchTest(), writer, name);
 
             writer.println(
                     "--------------------------------------"
@@ -117,7 +121,7 @@ public abstract class AbstractPerformanc
     private void runTest(
             PerformanceTestSuite suite, PerformanceTest test,
             PrintWriter writer, String name) throws Exception {
-        SummaryStatistics statistics = suite.runTest(test);
+        DescriptiveStatistics statistics = suite.runTest(test);
         writer.format(
                 "%-36.36s  %6.0f  %6.0f  %6.0f  %6.0f  %6d%n",
                 name + " \""+ test + "\"",