From 69d093c6ef847a72636874a6aedf1c72bfbdbc25 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <greg@webtide.com>
Date: Mon, 21 Dec 2009 23:18:42 +0000
Subject: [PATCH] 298145 Reorganized test harness to separate the HTTP PUT and
 HTTP GET test URLs

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1162 7e9141cc-0065-0410-87d8-b60c137991c4
---
 VERSION.txt                                   |  1 +
 .../jetty/client/ContentExchangeTest.java     | 49 +++++++++++++------
 2 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index bca619f1052..8963d437fab 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -5,6 +5,7 @@ jetty-7.0.2-SNAPSHOT
  + 297421 Hide server/system classes from WebAppClassLoader.getResources
  + 297783 Handle HEAD reponses in HttpClient
  + 298144 Unit test for jetty-client connecting to a server that uses Basic Auth
+ + 298145 Reorganized test harness to separate the HTTP PUT and HTTP GET test URLs
  + JETTY-910 Allow request listeners to access session
  + JETTY-1156 SSL blocking close with JVM Bug busy key fix
  + JETTY-1157 Don't hold array passed in write(byte[])
diff --git a/jetty-client/src/test/java/org/eclipse/jetty/client/ContentExchangeTest.java b/jetty-client/src/test/java/org/eclipse/jetty/client/ContentExchangeTest.java
index 80fd1a18215..9c91625a527 100644
--- a/jetty-client/src/test/java/org/eclipse/jetty/client/ContentExchangeTest.java
+++ b/jetty-client/src/test/java/org/eclipse/jetty/client/ContentExchangeTest.java
@@ -34,12 +34,10 @@ import org.eclipse.jetty.http.HttpMethods;
 import org.eclipse.jetty.http.HttpStatus;
 import org.eclipse.jetty.io.ByteArrayBuffer;
 import org.eclipse.jetty.io.EofException;
-import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.handler.HandlerCollection;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.servlet.DefaultServlet;
@@ -50,9 +48,6 @@ import org.eclipse.jetty.util.IO;
 public class ContentExchangeTest
     extends TestCase
 {
-    private static String _content0 =
-        "Hello World";
-    
     private static String _content =
         "Lorem ipsum dolor sit amet, consectetur adipiscing elit. In quis felis nunc. "+
         "Quisque suscipit mauris et ante auctor ornare rhoncus lacus aliquet. Pellentesque "+
@@ -72,7 +67,7 @@ public class ContentExchangeTest
     private HttpClient _client;
     private Realm _realm;
     private String _protocol;
-    private String _requestUrl;
+    private String _baseUrl;
 
     public void setUp()
         throws Exception
@@ -81,9 +76,9 @@ public class ContentExchangeTest
         _docRoot.mkdirs();
         _docRoot.deleteOnExit();
         
-        File content = new File(_docRoot,"content.txt");
+        File content = new File(_docRoot,"input.txt");
         FileOutputStream out = new FileOutputStream(content);
-        out.write(_content0.getBytes("utf-8"));
+        out.write(_content.getBytes("utf-8"));
         out.close();
         
         _server = new Server();
@@ -91,7 +86,7 @@ public class ContentExchangeTest
         _server.start();
 
         int port = _server.getConnectors()[0].getLocalPort();
-        _requestUrl = _protocol+"://localhost:"+port+ "/content.txt";
+        _baseUrl = _protocol+"://localhost:"+port+ "/";
     }
     
     public void tearDown()
@@ -106,10 +101,12 @@ public class ContentExchangeTest
     
     public void testPut() throws Exception
     {
+        System.err.println(getName());
+        
         startClient(_realm);
     
         ContentExchange putExchange = new ContentExchange();
-        putExchange.setURL(_requestUrl);
+        putExchange.setURL(getBaseUrl() + "output.txt");
         putExchange.setMethod(HttpMethods.PUT);
         putExchange.setRequestContent(new ByteArrayBuffer(_content.getBytes()));
     
@@ -123,16 +120,18 @@ public class ContentExchangeTest
         boolean statusOk = (responseStatus == 200 || responseStatus == 201);
         assertTrue(statusOk);
         
-        String content = IO.toString(new FileInputStream(new File(_docRoot,"content.txt")));
+        String content = IO.toString(new FileInputStream(new File(_docRoot,"output.txt")));
         assertEquals(_content,content);
     }
     
     public void testGet() throws Exception
     {
+        System.err.println(getName());
+        
         startClient(_realm);
     
         ContentExchange getExchange = new ContentExchange();
-        getExchange.setURL(_requestUrl);
+        getExchange.setURL(getBaseUrl() + "input.txt");
         getExchange.setMethod(HttpMethods.GET);
     
         _client.send(getExchange);
@@ -148,15 +147,17 @@ public class ContentExchangeTest
         stopClient();
     
         assertEquals(HttpStatus.OK_200,responseStatus);
-        assertEquals(_content0,content);
+        assertEquals(_content,content);
     }
     
     public void testHead() throws Exception
     {
+        System.err.println(getName());
+        
         startClient(_realm);
     
         ContentExchange getExchange = new ContentExchange();
-        getExchange.setURL(_requestUrl);
+        getExchange.setURL(getBaseUrl() + "input.txt");
         getExchange.setMethod(HttpMethods.HEAD);
     
         _client.send(getExchange);
@@ -217,6 +218,26 @@ public class ContentExchangeTest
         return _docRoot.getAbsolutePath();
     }
     
+    protected String getBaseUrl()
+    {
+        return _baseUrl;
+    }
+    
+    protected HttpClient getClient()
+    {
+        return _client;
+    }
+    
+    protected Realm getRealm()
+    {
+        return _realm;
+    }
+    
+    protected String getContent()
+    {
+        return _content;
+    }
+    
     protected void setProtocol(String protocol)
     {
         _protocol = protocol;