Use loadtest4j 0.8.0 (#13)

pom.xml

@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.github.loadtest4j</groupId>
             <artifactId>loadtest4j</artifactId>
-            <version>0.7.0</version>
+            <version>0.8.0</version>
         </dependency>
         <dependency>
             <groupId>io.gatling</groupId>

src/main/scala/com.github.loadtest4j.drivers.gatling/GatlingResult.scala

@@ -0,0 +1,13 @@
+package com.github.loadtest4j.drivers.gatling
+
+import java.util.Optional
+
+import com.github.loadtest4j.loadtest4j.DriverResult
+
+class GatlingResult(ok: Long, ko: Long, reportUrl: String) extends DriverResult {
+  override def getKo: Long = ko
+
+  override def getOk: Long = ok
+
+  override def getReportUrl: Optional[String] = Optional.of(reportUrl)
+}

src/main/scala/io/gatling/RunResultProcessorFacade.scala

@@ -1,14 +1,16 @@
 package io.gatling
 
+import com.github.loadtest4j.drivers.gatling.GatlingResult
 import com.github.loadtest4j.loadtest4j.DriverResult
 import io.gatling.app.RunResult
 import io.gatling.charts.stats.LogFileReader
 import io.gatling.commons.stats.{GeneralStats, KO, OK}
 import io.gatling.core.config.GatlingConfiguration
+import io.gatling.core.config.GatlingFiles.simulationLogDirectory
 
 class RunResultProcessorFacade(implicit configuration: GatlingConfiguration) {
   def processRunResult(runResult: RunResult): DriverResult = {
-    val logFileReader = initLogFileReader(runResult)
+    val logFileReader = new LogFileReader(runResult.runId)
 
     // We don't use these result filters in loadtest4j
     val requestName = None
@@ -36,11 +38,8 @@ class RunResultProcessorFacade(implicit configuration: GatlingConfiguration) {
       case (rangeName, count) => GroupedCount(rangeName, count, total.count)
     }
 
-    toDriverResult(numberOfRequestsStatistics)
-  }
-
-  private def initLogFileReader(runResult: RunResult) = {
-    new LogFileReader(runResult.runId)
+    val reportUrl = simulationLogDirectory(runResult.runId, create = false).toUri.toString
+    toDriverResult(numberOfRequestsStatistics, reportUrl)
   }
 
   private case class Statistics[T: Numeric](total: T, success: T, failure: T) {
@@ -54,9 +53,10 @@ class RunResultProcessorFacade(implicit configuration: GatlingConfiguration) {
     val percentage: Int = if (total == 0) 0 else (count.toDouble / total * 100).round.toInt
   }
 
-  private def toDriverResult(numberOfRequestsStatistics: Statistics[Long]) = {
+  private def toDriverResult(numberOfRequestsStatistics: Statistics[Long], reportUrl: String) = {
     val ok = numberOfRequestsStatistics.success
     val ko = numberOfRequestsStatistics.failure
-    new DriverResult(ok, ko)
+
+    new GatlingResult(ok, ko, reportUrl)
   }
 }

src/test/scala/com/github/loadtest4j/drivers/gatling/GatlingTest.scala

@@ -50,6 +50,7 @@ class GatlingTest {
     // Then
     assertEquals(0, result.getKo)
     assertGreaterThanOrEqualTo(1, result.getOk)
+    assertStartsWith("file://", result.getReportUrl.get())
     // And
     verifyHttp(httpServer).atLeast(1, method(Method.GET), uri("/"))
   }
@@ -108,6 +109,11 @@ class GatlingTest {
     }
   }
 
+  private def assertStartsWith(prefix: String, actual: String): Unit = {
+    val msg = "'%s' did not start with the substring '%s'.".format(actual, prefix)
+    assertTrue(msg, actual.startsWith(prefix))
+  }
+
   private def assertGreaterThanOrEqualTo(expected: Long, actual: Long): Unit  ={
     val msg = "Expected %d to be >= %d, but it was not.".format(actual, expected)
     assertTrue(msg, actual >= expected)