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

Timestamp:

07/15/14 13:45:31 (10 years ago)

Author:

pharms

Message:

• bugfix and test for correct query handling

File:

• trunk/autoquest-httpmonitor-test/src/test/java/de/ugoe/cs/autoquest/httpmonitor/AbstractTC.java (modified) (6 diffs)

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

@@ -18 +18 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.BufferedReader;
@@ -188 +189 @@
      *
      */
-    protected String sendDummyMessage(String type, String message, String respMsg)
+    protected String sendDummyMessage(String type, String query, String message, String respMsg)
         throws Exception
     {
@@ -197 +198 @@
         HttpRequestBase httpRequest = null;
         
+        String uri = "http://localhost:" + PROXY_PORT + "/dummyServlet";
+        
+        if (query != null) {
+            uri += "?" + query;
+        }
+        
         if ("POST".equals(type)) {
-            httpRequest = new HttpPost("http://localhost:" + PROXY_PORT + "/dummyServlet");
+            httpRequest = new HttpPost(uri);
             HttpEntity entity = new StringEntity(message, ContentType.TEXT_PLAIN);
             ((HttpPost) httpRequest).setEntity(entity);
         }
         else if ("GET".equals(type)) {
-            httpRequest = new HttpGet("http://localhost:" + PROXY_PORT + "/dummyServlet");
+            httpRequest = new HttpGet(uri);
         }
         
@@ -210 +217 @@
             
             assertEquals(message, dummyServlet.getRequest());
+            assertEquals(query, dummyServlet.getQuery());
             System.err.println(response.getStatusLine());
             String responseStr = readStreamContentToString(response.getEntity().getContent());
@@ -223 +231 @@
      *
      */
-    protected void assertEvent(Event event, String method, String message, String response) {
+    protected void assertEvent(Event  event,
+                               String method,
+                               String query,
+                               String message,
+                               String response)
+    {
         assertNotNull(event);
         assertNotNull(event.getType());
@@ -231 +244 @@
         assertTrue(event.getTarget() instanceof HTTPTarget);
         
-        HttpExchange exchange = ((HTTPEventType) event.getType()).getExchange();
-        
+        assertExchange(((HTTPEventType) event.getType()).getExchange(),
+                       method, query, message, response);
+    }
+    
+    /**
+     *
+     */
+    protected void assertExchange(HttpExchange exchange,
+                                  String       method,
+                                  String       query,
+                                  String       message,
+                                  String       response)
+    {
         assertEquals(Method.fromValue(method), exchange.getRequest().getMethod());
+        
+        if (query != null) {
+            assertEquals(query, exchange.getRequest().getQuery());
+        }
+        else if (exchange.getRequest().getQuery() != null) {
+            System.err.println(exchange.getRequest().getQuery());
+            fail("unexpected query");
+        }
         
         if (message != null) {