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/04 10:56:18 UTC

svn commit: r982164 - in /jackrabbit/trunk/jackrabbit-core/src/test/performance: base/src/main/java/org/apache/jackrabbit/performance/ jackrabbit10/src/test/java/org/apache/jackrabbit/performance/ jackrabbit11/src/test/java/org/apache/jackrabbit/perfor...

Author: jukka
Date: Wed Aug  4 08:56:18 2010
New Revision: 982164

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

Make the performance reports easier to feed into gnuplot

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/jackrabbit10/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit11/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit12/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit13/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit14/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit15/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit16/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit20/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit21/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit22/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=982164&r1=982163&r2=982164&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 Wed Aug  4 08:56:18 2010
@@ -97,12 +97,12 @@ public abstract class AbstractPerformanc
             PerformanceTestSuite suite = new PerformanceTestSuite(
                     repository,
                     new SimpleCredentials("admin", "admin".toCharArray()));
-            runTest(suite, new LoginTest(), writer);
-            runTest(suite, new LoginLogoutTest(), writer);
-            runTest(suite, new SmallFileReadTest(), writer);
-            runTest(suite, new SmallFileWriteTest(), writer);
-            runTest(suite, new BigFileReadTest(), writer);
-            runTest(suite, new BigFileWriteTest(), writer);
+            runTest(suite, new LoginTest(), writer, name);
+            runTest(suite, new LoginLogoutTest(), writer, name);
+            runTest(suite, new SmallFileReadTest(), writer, name);
+            runTest(suite, new SmallFileWriteTest(), writer, name);
+            runTest(suite, new BigFileReadTest(), writer, name);
+            runTest(suite, new BigFileWriteTest(), writer, name);
 
             writer.println(
                     "--------------------------------------"
@@ -114,11 +114,11 @@ public abstract class AbstractPerformanc
 
     private void runTest(
             PerformanceTestSuite suite, PerformanceTest test,
-            PrintWriter writer) throws Exception {
+            PrintWriter writer, String name) throws Exception {
         SummaryStatistics statistics = suite.runTest(test);
         writer.format(
                 "%-36.36s  %6.0f  %6.0f  %6.0f  %6.0f  %6d%n",
-                test,
+                name + " \""+ test + "\"",
                 statistics.getMean(),
                 statistics.getStandardDeviation(),
                 statistics.getMin(),

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=982164&r1=982163&r2=982164&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 Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit10");
+        testPerformance("1.1");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit11/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit11/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit11/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit11/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit11");
+        testPerformance("1.1");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit12/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit12/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit12/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit12/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit12");
+        testPerformance("1.2");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit13/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit13/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit13/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit13/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit13");
+        testPerformance("1.3");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit14/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit14/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit14/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit14/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit14");
+        testPerformance("1.4");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit15/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit15/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit15/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit15/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit15");
+        testPerformance("1.5");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit16/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit16/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit16/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit16/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit16");
+        testPerformance("1.6");
     }
 
 }

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=982164&r1=982163&r2=982164&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 Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit20");
+        testPerformance("2.0");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit21/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit21/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit21/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit21/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit22");
+        testPerformance("2.1");
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit22/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit22/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java?rev=982164&r1=982163&r2=982164&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit22/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/performance/jackrabbit22/src/test/java/org/apache/jackrabbit/performance/PerformanceTest.java Wed Aug  4 08:56:18 2010
@@ -22,7 +22,7 @@ public class PerformanceTest extends Abs
 
     @Test
     public void testPerformance() throws Exception {
-        testPerformance("jackrabbit22");
+        testPerformance("2.2");
     }
 
 }