Take query params into account in expectation

Author: ruhan1

core/src/main/java/org/commonjava/test/http/expect/ExpectationServlet.java

@@ -97,20 +97,17 @@ public String getAccessKey( final String method, final String path )
         return method.toUpperCase() + " " + path;
     }
 
-    private String getPath( final String path )
+    private String getPath( final String testUrl )
     {
-        String realPath = path;
         try
         {
-            final URL u = new URL( path );
-            realPath = u.getPath();
+            return new URL( testUrl ).getFile(); // path plus query parameters
         }
         catch ( final MalformedURLException e )
         {
-            //Do nothing
+            e.printStackTrace();
         }
-
-        return realPath;
+        return testUrl;
     }
 
     public void expect( final String method, final String testUrl, final int responseCode, final String body )
@@ -144,22 +141,7 @@ public void expect( String method, String testUrl, ExpectationHandler handler )
     protected void service( final HttpServletRequest req, final HttpServletResponse resp )
             throws ServletException, IOException
     {
-        String wholePath;
-        try
-        {
-            wholePath = new URI( req.getRequestURI() ).getPath();
-        }
-        catch ( final URISyntaxException e )
-        {
-            throw new ServletException( "Cannot parse request URI", e );
-        }
-
-        String path = wholePath;
-        if ( path.length() > 1 )
-        {
-            path = path.substring( 1 );
-        }
-
+        String wholePath = getWholePath( req );
         final String key = getAccessKey( req.getMethod(), wholePath );
 
         logger.info( "Looking up expectation for: {}", key );
@@ -232,6 +214,21 @@ else if ( expectation.bodyStream() != null )
         resp.setStatus( 404 );
     }
 
+    private String getWholePath( HttpServletRequest request )
+    {
+        String requestURI = request.getRequestURI();
+        String queryString = request.getQueryString();
+
+        if ( queryString == null )
+        {
+            return requestURI;
+        }
+        else
+        {
+            return requestURI + "?" + queryString;
+        }
+    }
+
     public String getAccessKey( final CommonMethod method, final String path )
     {
         return getAccessKey( method.name(), path );

junit4/src/test/java/org/commonjava/test/http/junt4/TestHttpServerTest.java

@@ -27,6 +27,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -50,45 +51,54 @@ public void simpleDownload()
         final String path = server.formatPath( subPath );
         server.expect( url, 200, content );
 
+        String result = getHttpContent( url );
+        assertThat(result, equalTo(content));
+
+        final String key = server.getAccessKey( CommonMethod.GET.name(), path );
+        System.out.println( "Getting accesses for: '" + key + "'" );
+        assertThat( server.getAccessesByPathKey().get( key ), equalTo( 1 ) );
+    }
+
+    @Test
+    public void downloadWithQueryParams()
+            throws Exception
+    {
+        final ExpectationServer server = serverRule.getServer();
+
+        final String subPath = "/path/to/something";
+        final String path1 = subPath + "?version=1.0";
+        final String path2 = subPath + "?version=2.0";
+
+        final String url1 = server.formatUrl(path1);
+        final String url2 = server.formatUrl(path2);
+
+        final String content1 = "this is a test version 1";
+        final String content2 = "this is a test version 2";
+
+        server.expect(url1, 200, content1);
+        server.expect(url2, 200, content2);
+
+        String result = getHttpContent(url1);
+        assertThat(result, equalTo(content1));
+
+        result = getHttpContent(url2);
+        assertThat(result, equalTo(content2));
+
+    }
+
+    private String getHttpContent(String url) throws IOException
+    {
         final HttpGet request = new HttpGet( url );
         final CloseableHttpClient client = HttpClients.createDefault();
-        CloseableHttpResponse response = null;
 
-        InputStream stream = null;
-        try
+        try(CloseableHttpResponse response = client.execute( request ))
         {
-            response = client.execute( request );
-            stream = response.getEntity().getContent();
-            final String result = IOUtils.toString( stream );
-
-            assertThat( result, notNullValue() );
-            assertThat( result, equalTo( content ) );
+            InputStream stream = response.getEntity().getContent();
+            return IOUtils.toString( stream );
         }
         finally
         {
-            IOUtils.closeQuietly( stream );
-            if ( response != null && response.getEntity() != null )
-            {
-                EntityUtils.consumeQuietly( response.getEntity() );
-                IOUtils.closeQuietly( response );
-            }
-
-            if ( request != null )
-            {
-                request.reset();
-            }
-
-            if ( client != null )
-            {
-                IOUtils.closeQuietly( client );
-            }
+            IOUtils.closeQuietly( client );
         }
-
-        System.out.println( server.getAccessesByPathKey() );
-
-        final String key = server.getAccessKey( CommonMethod.GET.name(), path );
-        System.out.println( "Getting accesses for: '" + key + "'" );
-        assertThat( server.getAccessesByPathKey().get( key ), equalTo( 1 ) );
     }
-
 }