Changeset 1567 for trunk/autoquest-httpmonitor-test/src/test/java

Timestamp:

06/13/14 16:57:43 (11 years ago)

Author:

pharms

Message:

• next solved issue with reused buffers

Location:

trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor

Files:

• AbstractTC.java (modified) (3 diffs)
• DummyServlet.java (modified) (5 diffs)

trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java

@@ -83 +83 @@
     /** */
     private static Tomcat tomcat = new Tomcat();
+    
+    /**
+     * 
+     */
+    static String readStreamContentToString(InputStream stream) throws IOException {
+        return readToString(new BufferedReader(new InputStreamReader(stream)));
+    }
+    
+    /**
+     * 
+     */
+    static String readToString(BufferedReader reader) throws IOException {
+        StringBuffer message = new StringBuffer();
+        
+        String line = reader.readLine();
+        while (line != null) {
+            System.err.println(line);
+            if (message.length() > 0) {
+                message.append('\n');
+            }
+            message.append(line);
+            line = reader.readLine();
+        }
+        
+        return message.toString();
+    }
 
     /**
@@ -182 +208 @@
         try {
             HttpResponse response = httpclient.execute(httpRequest);
+            
+            assertEquals(message, dummyServlet.getRequest());
             System.err.println(response.getStatusLine());
             String responseStr = readStreamContentToString(response.getEntity().getContent());
@@ -190 +218 @@
             httpRequest.releaseConnection();
         }
-    }
-    
-    /**
-     * 
-     */
-    protected String readStreamContentToString(InputStream stream) throws IOException {
-        return readToString(new BufferedReader(new InputStreamReader(stream)));
-    }
-    
-    /**
-     * 
-     */
-    protected String readToString(BufferedReader reader) throws IOException {
-        StringBuffer message = new StringBuffer();
-        
-        String line = reader.readLine();
-        while (line != null) {
-            System.err.println(line);
-            if (message.length() > 0) {
-                message.append('\n');
-            }
-            message.append(line);
-            line = reader.readLine();
-        }
-        
-        return message.toString();
     }
     

trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/DummyServlet.java

@@ -31 +31 @@
     
     /** */
+    private String requestMessage;
+    
+    /** */
     private String responseMessage;
 
@@ -40 +43 @@
         throws ServletException, IOException
     {
+        requestMessage = AbstractTC.readStreamContentToString(request.getInputStream());
+        
         System.err.println("responding on get with:   " + responseMessage);
         response.getOutputStream().write(responseMessage.getBytes());
@@ -51 +56 @@
         throws ServletException, IOException
     {
+        requestMessage = AbstractTC.readStreamContentToString(request.getInputStream());
+        
         System.err.println("responding on post with:  " + responseMessage);
         response.getOutputStream().write(responseMessage.getBytes());
@@ -59 +66 @@
      */
     @Override
-    protected void doTrace(HttpServletRequest req, HttpServletResponse response)
+    protected void doTrace(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException
     {
+        requestMessage = AbstractTC.readStreamContentToString(request.getInputStream());
+        
         System.err.println("responding on trace with: " + responseMessage);
         response.getOutputStream().write(responseMessage.getBytes());
@@ -72 +81 @@
         this.responseMessage = responseMessage;
     }
+
+    /**
+     * 
+     */
+    String getRequest() {
+        return this.requestMessage;
+    }
 }