You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/10/20 15:53:52 UTC
svn commit: r1186811 - in /maven/sandbox/trunk/wagon/wagon-benchmarks:
wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/
wagon-benchmarks-run/ wagon-benchmarks-run/src/
wagon-benchmarks-run/src/test/ wagon-benchmarks-run/src/test/ja...
Author: olamy
Date: Thu Oct 20 13:53:51 2011
New Revision: 1186811
URL: http://svn.apache.org/viewvc?rev=1186811&view=rev
Log:
use a suite for all tests
Added:
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml (with props)
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/apache-maven-3.0.3-bin.zip
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java (with props)
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/ssl/
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/ssl/keystore
Modified:
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java?rev=1186811&r1=1186810&r2=1186811&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java Thu Oct 20 13:53:51 2011
@@ -49,10 +49,6 @@ import java.util.concurrent.TimeUnit;
/**
* @author Olivier Lamy
*/
-@AxisRange( min = 0, max = 1 )
-@BenchmarkMethodChart( filePrefix = "../benchmark-result" )
-@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 5 )
-@BenchmarkOptions( benchmarkRounds = 2, warmupRounds = 1, concurrency = 2 )
public abstract class AbstractWagonHttpClientTest
extends AbstractWagonClientTest
{
@@ -98,7 +94,6 @@ public abstract class AbstractWagonHttpC
resultWriter.flush();
}
- @BenchmarkOptions( benchmarkRounds = 1, warmupRounds = 1, concurrency = 2 )
@Test
public void getSmallFilesHttpNotCompressed()
throws Exception
Added: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml?rev=1186811&view=auto
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml (added)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml Thu Oct 20 13:53:51 2011
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>wagon-benchmarks</artifactId>
+ <groupId>org.apache.maven.wagon.benchmarks</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>wagon-benchmarks-run</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>wagon-benchmarks-run</name>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.maven.wagon.benchmarks</groupId>
+ <artifactId>wagon-benchmarks-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon.benchmarks</groupId>
+ <artifactId>wagon-benchmarks-http</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon.benchmarks</groupId>
+ <artifactId>wagon-benchmarks-http-lightweight</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon.benchmarks</groupId>
+ <artifactId>wagon-benchmarks-ahc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+
+ <dependency>
+ <groupId>com.ning</groupId>
+ <artifactId>async-http-client</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>${wagonVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefireForkedVmArgs}</argLine>
+ <systemPropertyVariables>
+ <test.keystore.path>${basedir}/src/test/ssl/keystore</test.keystore.path>
+ <wagon.benchmark.rq.number>${wagon.benchmark.rq.number}</wagon.benchmark.rq.number>
+ <wagon.benchmark.rq.parallel>${wagon.benchmark.rq.parallel}</wagon.benchmark.rq.parallel>
+ <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/apache-maven-3.0.3-bin.zip
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/apache-maven-3.0.3-bin.zip?rev=1186811&view=auto
==============================================================================
Files maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/apache-maven-3.0.3-bin.zip (added) and maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/apache-maven-3.0.3-bin.zip Thu Oct 20 13:53:51 2011 differ
Added: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java?rev=1186811&view=auto
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java (added)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java Thu Oct 20 13:53:51 2011
@@ -0,0 +1,41 @@
+package org.apache.maven.wagon.benchmarks;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import com.carrotsearch.junitbenchmarks.BenchmarkOptions;
+import com.carrotsearch.junitbenchmarks.annotation.AxisRange;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
+import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
+import com.carrotsearch.junitbenchmarks.annotation.LabelType;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Olivier Lamy
+ */
+@RunWith( Suite.class )
+@Suite.SuiteClasses( { WagonHttpAhcRunner.class, WagonHttpClientLigthRunner.class, WagonHttpClientRunner.class } )
+@AxisRange( min = 0, max = 1 )
+@BenchmarkMethodChart( filePrefix = "../benchmark-result" )
+@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 5 )
+@BenchmarkOptions( benchmarkRounds = 2, warmupRounds = 1, concurrency = 2 )
+public class BenchmarkSuiteTest
+{
+ // no op
+}
Propchange: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/java/org/apache/maven/wagon/benchmarks/BenchmarkSuiteTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/ssl/keystore
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/ssl/keystore?rev=1186811&view=auto
==============================================================================
Files maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/ssl/keystore (added) and maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-run/src/test/ssl/keystore Thu Oct 20 13:53:51 2011 differ