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:49:02 UTC
svn commit: r1186807 - in /maven/sandbox/trunk/wagon/wagon-benchmarks: ./
wagon-benchmarks-ahc/src/test/java/org/apache/maven/wagon/benchmarks/
wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/
wagon-benchmarks-http-lightweight/src/...
Author: olamy
Date: Thu Oct 20 13:49:01 2011
New Revision: 1186807
URL: http://svn.apache.org/viewvc?rev=1186807&view=rev
Log:
refactor a bit to be able to run all wagon tests in on module
Modified:
maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpAhcTest.java
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonClientTest.java
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientLigthTest.java
maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientTest.java
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml?rev=1186807&r1=1186806&r2=1186807&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/pom.xml Thu Oct 20 13:49:01 2011
@@ -16,8 +16,7 @@ software distributed under the License i
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -50,6 +49,7 @@ under the License.
<module>wagon-benchmarks-http-lightweight</module>
<module>wagon-benchmarks-http</module>
<module>wagon-benchmarks-ahc</module>
+ <module>wagon-benchmarks-run</module>
</modules>
<dependencyManagement>
@@ -175,4 +175,4 @@ under the License.
</repositories>
-</project>
+</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpAhcTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpAhcTest.java?rev=1186807&r1=1186806&r2=1186807&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpAhcTest.java (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-ahc/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpAhcTest.java Thu Oct 20 13:49:01 2011
@@ -27,17 +27,10 @@ import org.apache.maven.wagon.Wagon;
public class WagonHttpAhcTest
extends AbstractWagonHttpClientTest
{
- @Override
- StreamingWagon getHttpWagon()
- throws Exception
+ public WagonHttpAhcTest() throws Exception
{
- return (StreamingWagon) lookup( Wagon.class, "http" );
- }
-
- @Override
- StreamingWagon getHttpsWagon()
- throws Exception
- {
- return (StreamingWagon) lookup( Wagon.class, "https" );
+ super();
+ this.httpWagon = (StreamingWagon) lookup( Wagon.class, "http" );
+ this.httpsWagon = (StreamingWagon) lookup( Wagon.class, "https" );
}
}
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonClientTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonClientTest.java?rev=1186807&r1=1186806&r2=1186807&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonClientTest.java (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonClientTest.java Thu Oct 20 13:49:01 2011
@@ -35,9 +35,4 @@ public abstract class AbstractWagonClien
{
final protected Logger log = LoggerFactory.getLogger( getClass() );
- abstract StreamingWagon getHttpWagon()
- throws Exception;
-
- abstract StreamingWagon getHttpsWagon()
- throws Exception;
}
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=1186807&r1=1186806&r2=1186807&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:49:01 2011
@@ -27,6 +27,7 @@ import com.carrotsearch.junitbenchmarks.
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.SystemUtils;
import org.apache.maven.wagon.StreamingWagon;
+import org.apache.maven.wagon.Wagon;
import org.apache.maven.wagon.repository.Repository;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -52,7 +53,7 @@ import java.util.concurrent.TimeUnit;
@BenchmarkMethodChart( filePrefix = "../benchmark-result" )
@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 5 )
@BenchmarkOptions( benchmarkRounds = 2, warmupRounds = 1, concurrency = 2 )
-public abstract class AbstractWagonHttpClientTest
+public class AbstractWagonHttpClientTest
extends AbstractWagonClientTest
{
@@ -66,6 +67,13 @@ public abstract class AbstractWagonHttpC
static FileWriter resultWriter = null;
+ protected StreamingWagon httpWagon, httpsWagon;
+
+ public AbstractWagonHttpClientTest()
+ {
+ //
+ }
+
@BeforeClass
public static void createResultFile()
@@ -263,7 +271,7 @@ public abstract class AbstractWagonHttpC
for ( int i = 0; i < requestNumber; i++ )
{
- final StreamingWagon wagon = ssl ? getHttpsWagon() : getHttpWagon();
+ final StreamingWagon wagon = ssl ? this.httpsWagon : this.httpWagon;
wagon.setTimeout( 10000 );
callables.add( new Callable<Void>()
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientLigthTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientLigthTest.java?rev=1186807&r1=1186806&r2=1186807&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientLigthTest.java (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http-lightweight/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientLigthTest.java Thu Oct 20 13:49:01 2011
@@ -27,17 +27,10 @@ import org.apache.maven.wagon.Wagon;
public class WagonHttpClientLigthTest
extends AbstractWagonHttpClientTest
{
- @Override
- StreamingWagon getHttpWagon()
- throws Exception
+ public WagonHttpClientLigthTest() throws Exception
{
- return (StreamingWagon) lookup( Wagon.class, "http" );
- }
-
- @Override
- StreamingWagon getHttpsWagon()
- throws Exception
- {
- return (StreamingWagon) lookup( Wagon.class, "https" );
+ super();
+ this.httpWagon = (StreamingWagon) lookup( Wagon.class, "http" );
+ this.httpsWagon = (StreamingWagon) lookup( Wagon.class, "https" );
}
}
Modified: maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientTest.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientTest.java?rev=1186807&r1=1186806&r2=1186807&view=diff
==============================================================================
--- maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientTest.java (original)
+++ maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-http/src/test/java/org/apache/maven/wagon/benchmarks/WagonHttpClientTest.java Thu Oct 20 13:49:01 2011
@@ -27,17 +27,13 @@ import org.apache.maven.wagon.Wagon;
public class WagonHttpClientTest
extends AbstractWagonHttpClientTest
{
- @Override
- StreamingWagon getHttpWagon()
- throws Exception
- {
- return (StreamingWagon) lookup( Wagon.class, "http" );
- }
- @Override
- StreamingWagon getHttpsWagon()
- throws Exception
+ public WagonHttpClientTest() throws Exception
{
- return (StreamingWagon) lookup( Wagon.class, "https" );
+ super();
+ this.httpWagon = (StreamingWagon) lookup( Wagon.class, "http" );
+ this.httpsWagon = (StreamingWagon) lookup( Wagon.class, "https" );
}
+
+
}