Benchmark tweaks

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@919418 13f79535-47bb-0310-9956-ffa450edef68

httpclient-benchmark/pom.xml

@@ -54,6 +54,11 @@
       <artifactId>httpclient</artifactId>
       <version>${pom.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+      <version>4.1-alpha2-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
@@ -105,6 +110,23 @@
           <showDeprecations>${maven.compile.deprecation}</showDeprecations>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.1.1</version>
+        <executions>
+          <execution>
+            <id>test-run</id>
+            <phase>test</phase>
+            <goals>
+              <goal>java</goal>
+            </goals>
+            <configuration>
+              <mainClass>org.apache.http.client.benchmark.Benchmark</mainClass>        
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

httpclient-benchmark/src/main/java/org/apache/http/client/benchmark/Benchmark.java

@@ -30,7 +30,6 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.net.URI;
-import java.util.Random;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -76,8 +75,10 @@ public class Benchmark {
        };
 
        byte[] content = new byte[contentLen];
-       Random rnd = new Random();
-       rnd.nextBytes(content);
+       int r = Math.abs(content.hashCode());
+       for (int i = 0; i < content.length; i++) {
+           content[i] = (byte) ((r + i) % 96 + 32);
+       }
 
        URI target1 = new URI("http", null, "localhost", port, "/rnd", "c=" + contentLen, null);
        URI target2 = new URI("http", null, "localhost", port, "/echo", null, null);
@@ -174,6 +175,7 @@ public class Benchmark {
            InputStream instream = request.getInputStream();
            if (instream != null) {
                IO.copy(instream, buffer);
+               buffer.flush();
            }
            byte[] content = buffer.getBuf();