Merge pull request #168 from msavy/nd-query

Alter test and echo server to sort query params to avoid non-determin…
apiman · Aug 8, 2015 · a992b8f · a992b8f
2 parents 35ecb4b + f378feb
commit a992b8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/gateway/test/src/test/resources/test-plan-data/simple/simple-echo/echo/004.resttest b/gateway/test/src/test/resources/test-plan-data/simple/simple-echo/echo/004.resttest
@@ -1,4 +1,4 @@
-GET /SimpleEchoTest/echo/1.0.0/path/to/app/resource?param1=value1&param3=hello%20world&param2=value2 admin/admin
+GET /SimpleEchoTest/echo/1.0.0/path/to/app/resource?param1=value1&param2=hello%20world&param3=value2 admin/admin
 X-Custom-Header: MyValue
 X-API-Key: 12345
 
@@ -8,7 +8,7 @@ Content-Type: application/json
 
 {
   "method" : "GET",
-  "resource" : "/path/to/app/resource?param1=value1&param3=hello+world&param2=value2",
+  "resource" : "/path/to/app/resource?param1=value1&param2=hello+world&param3=value2",
   "uri" : "/path/to/app/resource",
   "headers" : {
     "X-Custom-Header" : "MyValue"

diff --git a/test/common/src/main/java/io/apiman/test/common/mock/EchoServlet.java b/test/common/src/main/java/io/apiman/test/common/mock/EchoServlet.java
@@ -15,9 +15,12 @@
  */
 package io.apiman.test.common.mock;
 
+import io.apiman.common.util.SimpleStringUtils;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.MessageDigest;
+import java.util.Arrays;
 import java.util.Enumeration;
 
 import javax.servlet.ServletException;
@@ -55,7 +58,9 @@ public static EchoResponse response(HttpServletRequest request, boolean withBody
         EchoResponse response = new EchoResponse();
         response.setMethod(request.getMethod());
         if (request.getQueryString() != null) {
-            response.setResource(request.getRequestURI() + "?" + request.getQueryString()); //$NON-NLS-1$
+            String[] normalisedQueryString = request.getQueryString().split("&");
+            Arrays.sort(normalisedQueryString);
+            response.setResource(request.getRequestURI() + "?" + SimpleStringUtils.join("&", normalisedQueryString)); //$NON-NLS-1$
         } else {
             response.setResource(request.getRequestURI());
         }