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/03 17:22:11 UTC

svn commit: r981924 - in /jackrabbit/trunk/jackrabbit-core/src/test/performance: base/src/main/java/org/apache/jackrabbit/performance/ jackrabbit20/ jackrabbit20/src/test/java/org/apache/jackrabbit/performance/

Author: jukka
Date: Tue Aug  3 15:22:09 2010
New Revision: 981924

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

Add performance tests for Jackrabbit 2.0. Improved test output.

Added:
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/
      - copied from r981904, jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit16/
Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/pom.xml
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.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=981924&r1=981923&r2=981924&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 15:22:09 2010
@@ -73,6 +73,13 @@ public abstract class AbstractPerformanc
             throws Exception {
         RepositoryImpl repository = createRepository(name, xml);
         try {
+            System.out.format(
+                    "%-36.36s     avg     std     min     max       n",
+                    name);
+            System.out.println(
+                    "--------------------------------------"
+                    + "--------------------------------------");
+
             PerformanceTestSuite suite = new PerformanceTestSuite(
                     repository,
                     new SimpleCredentials("admin", "admin".toCharArray()));
@@ -82,6 +89,10 @@ public abstract class AbstractPerformanc
             suite.runTest(new SmallFileWriteTest());
             suite.runTest(new BigFileReadTest());
             suite.runTest(new BigFileWriteTest());
+
+            System.out.println(
+                    "--------------------------------------"
+                    + "--------------------------------------");
         } finally {
             repository.shutdown();
         }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/pom.xml?rev=981924&r1=981904&r2=981924&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/pom.xml Tue Aug  3 15:22:09 2010
@@ -30,8 +30,8 @@
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>jackrabbit-perf-jackrabbit16</artifactId>
-  <name>Jackrabbit 1.6 Performance Test</name>
+  <artifactId>jackrabbit-perf-jackrabbit20</artifactId>
+  <name>Jackrabbit 2.0 Performance Test</name>
 
   <dependencies>
     <dependency>
@@ -41,9 +41,15 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <version>2.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-core</artifactId>
-      <version>1.6.0</version>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=981924&r1=981904&r2=981924&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Tue Aug  3 15:22:09 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit16");
+        testPerformance("jackrabbit20");
     }
 
 }