From 366d38d44c43db1c7902b7eea9e9149e801c3246 Mon Sep 17 00:00:00 2001
From: Chris Kilding <themasterchef@users.noreply.github.com>
Date: Fri, 8 Jun 2018 21:12:16 +0100
Subject: [PATCH] Use loadtest4j 0.10.0 (#22)

---
 pom.xml                                         |  2 +-
 .../Gatling.scala                               |  2 ++
 .../drivers/gatling/DriverRequests.scala        |  9 +++++++--
 .../drivers/gatling/GatlingTest.scala           | 17 +++++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index b794413..073845b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.github.loadtest4j</groupId>
             <artifactId>loadtest4j</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.0</version>
         </dependency>
         <dependency>
             <groupId>io.gatling</groupId>
diff --git a/src/main/scala/com.github.loadtest4j.drivers.gatling/Gatling.scala b/src/main/scala/com.github.loadtest4j.drivers.gatling/Gatling.scala
index 98a46a2..a1bb63e 100644
--- a/src/main/scala/com.github.loadtest4j.drivers.gatling/Gatling.scala
+++ b/src/main/scala/com.github.loadtest4j.drivers.gatling/Gatling.scala
@@ -42,11 +42,13 @@ package com.github.loadtest4j.drivers.gatling {
       val headers = scalaMap(request.getHeaders)
       val method = request.getMethod
       val path = request.getPath
+      val queryParams = scalaMap(request.getQueryParams)
 
       http("loadtest4j request")
         .httpRequest(method, path)
         .headers(headers)
         .body(stringBody(request.getBody))
+        .queryParamMap(queryParams)
     }
 
     private def stringBody(str: String): Body = {
diff --git a/src/test/scala/com/github/loadtest4j/drivers/gatling/DriverRequests.scala b/src/test/scala/com/github/loadtest4j/drivers/gatling/DriverRequests.scala
index 3a89080..fe8caf0 100644
--- a/src/test/scala/com/github/loadtest4j/drivers/gatling/DriverRequests.scala
+++ b/src/test/scala/com/github/loadtest4j/drivers/gatling/DriverRequests.scala
@@ -7,11 +7,16 @@ import scala.collection.JavaConverters
 
 object DriverRequests {
     def get(path: String): DriverRequest = {
-        new DriverRequest("", Collections.emptyMap(), "GET", path)
+        new DriverRequest("", Collections.emptyMap(), "GET", path, Collections.emptyMap())
     }
 
+  def getWithQueryParams(path: String, queryParams: Map[String, String]): DriverRequest = {
+    val javaQueryParams = JavaConverters.mapAsJavaMap(queryParams)
+    new DriverRequest("", Collections.emptyMap(), "GET", path, javaQueryParams)
+  }
+
     def post(path: String, body: String, headers: Map[String, String]): DriverRequest = {
         val javaHeaders = JavaConverters.mapAsJavaMap(headers)
-        new DriverRequest(body, javaHeaders, "POST", path)
+        new DriverRequest(body, javaHeaders, "POST", path, Collections.emptyMap())
     }
 }
diff --git a/src/test/scala/com/github/loadtest4j/drivers/gatling/GatlingTest.scala b/src/test/scala/com/github/loadtest4j/drivers/gatling/GatlingTest.scala
index 239f729..1d39dac 100644
--- a/src/test/scala/com/github/loadtest4j/drivers/gatling/GatlingTest.scala
+++ b/src/test/scala/com/github/loadtest4j/drivers/gatling/GatlingTest.scala
@@ -57,6 +57,23 @@ class GatlingTest {
     verifyHttp(httpServer).atLeast(1, method(Method.GET), uri("/"))
   }
 
+  @Test
+  def testRunWithQueryString(): Unit = {
+    // Given
+    val driver = sut()
+    // And
+    whenHttp(httpServer).`match`(get("/")).`then`(status(HttpStatus.NOT_FOUND_404))
+    // And
+    whenHttp(httpServer).`match`(get("/"), parameter("foo", "bar")).`then`(status(HttpStatus.OK_200))
+
+    // When
+    val result = driver.run(Collections.singletonList(DriverRequests.getWithQueryParams("/", Map("foo" -> "bar"))))
+
+    // Then
+    assertEquals(0, result.getKo)
+    assertGreaterThanOrEqualTo(1, result.getOk)
+  }
+
   @Test
   def testRunWithElaborateRequest(): Unit = {
     // Given