svn commit: r1188550 - /maven/sandbox/trunk/wagon/wagon-benchmarks/wagon-benchmarks-api/src/main/java/org/apache/maven/wagon/benchmarks/AbstractWagonHttpClientTest.java

[olamy]

Author: olamy
Date: Tue Oct 25 07:37:18 2011
New Revision: 1188550

URL: http://svn.apache.org/viewvc?rev=1188550&view=rev
Log:
make code reusable for other tests

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=1188550&r1=1188549&r2=1188550&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
 Tue Oct 25 07:37:18 2011
@@ -24,11 +24,9 @@ import com.carrotsearch.junitbenchmarks.
 import com.carrotsearch.junitbenchmarks.annotation.BenchmarkHistoryChart;
 import com.carrotsearch.junitbenchmarks.annotation.BenchmarkMethodChart;
 import com.carrotsearch.junitbenchmarks.annotation.LabelType;
-import junit.framework.TestSuite;
 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;
@@ -55,7 +53,7 @@ import java.util.concurrent.TimeUnit;
 @RunWith( JUnit4.class )
 @AxisRange( min = 0, max = 1 )
 @BenchmarkMethodChart( filePrefix = "target/benchmark-result" )
-@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 
5,filePrefix = "target/history-result")
+@BenchmarkHistoryChart( labelWith = LabelType.CUSTOM_KEY, maxRuns = 5, 
filePrefix = "target/history-result" )
 @BenchmarkOptions( benchmarkRounds = 2, warmupRounds = 1, concurrency = 1 )
 public abstract class AbstractWagonHttpClientTest
     extends AbstractWagonClientTest
@@ -70,7 +68,7 @@ public abstract class AbstractWagonHttpC
 
     static FileWriter resultWriter = null;
 
-    
+
     public AbstractWagonHttpClientTest()
     {
         //
@@ -160,23 +158,9 @@ public abstract class AbstractWagonHttpC
     private void smallFileGet( boolean compressResponse, boolean ssl )
         throws Exception
     {
-        GetFileServlet.compressResponse = compressResponse;
-
         InputStream is = 
Thread.currentThread().getContextClassLoader().getResourceAsStream( 
"maven-metadata.xml" );
-        GetFileServlet.responseContent = IOUtils.toByteArray( is );
-
-        final TestServer testServer = new TestServer();
-
-        testServer.ssl = ssl;
-
-        testServer.servletsPerPath.put( "/*", GetFileServlet.class );
-
-        testServer.start( parallelRequestNumber );
-
-        call( ssl, testServer.port, true );
-
-        testServer.stop();
-
+        fileGet( compressResponse, ssl, is );
+        IOUtils.closeQuietly( is );
     }
 
     @Test
@@ -240,12 +224,15 @@ public abstract class AbstractWagonHttpC
     private void hugeFileGet( boolean compressResponse, boolean ssl )
         throws Exception
     {
-        GetFileServlet.compressResponse = compressResponse;
+        fileGet( compressResponse, ssl, new FileInputStream( new File( 
"src/test/apache-maven-3.0.3-bin.zip" ) ) );
+    }
 
-        File f = new File( "src/test/apache-maven-3.0.3-bin.zip" );
-        FileInputStream fileInputStream = new FileInputStream( f );
+    private void fileGet( boolean compressResponse, boolean ssl, InputStream 
is )
+        throws Exception
+    {
+        GetFileServlet.compressResponse = compressResponse;
 
-        GetFileServlet.responseContent = IOUtils.toByteArray( fileInputStream 
);
+        GetFileServlet.responseContent = IOUtils.toByteArray( is );
 
         final TestServer testServer = new TestServer();
 
@@ -259,7 +246,6 @@ public abstract class AbstractWagonHttpC
 
         testServer.stop();
 
-        long end = System.currentTimeMillis();
     }
 
 
@@ -288,10 +274,7 @@ public abstract class AbstractWagonHttpC
                         tmpFile.deleteOnExit();
 
                         wagon.get( "foo", tmpFile );
-                        /*if ( testcontent )
-                        {
-                            assertTrue( baos.toString().contains( 
"20110821162420" ) );
-                        }*/
+
                     }
                     catch ( Exception e )
                     {
@@ -311,8 +294,10 @@ public abstract class AbstractWagonHttpC
         executorService.awaitTermination( 10, TimeUnit.SECONDS );
     }
 
-    abstract StreamingWagon getHttpWagon() throws Exception;
+    abstract StreamingWagon getHttpWagon()
+        throws Exception;
 
-    abstract StreamingWagon getHttpsWagon() throws Exception;
+    abstract StreamingWagon getHttpsWagon()
+        throws Exception;
 
 }