Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: e2e-tests: Replace FileBasedFeederBuilder with FeederBuilder declaration Change-Id: I71ab830bdc96e6b822b71fba67c51939c347961f
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala index 9769b6a..13a741a 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CloneUsingHAGerrit2.scala
@@ -16,13 +16,13 @@ import com.google.gerrit.scenarios.GitSimulation import io.gatling.core.Predef.{atOnceUsers, _} -import io.gatling.core.feeder.FileBasedFeederBuilder +import io.gatling.core.feeder.FeederBuilder import io.gatling.core.structure.ScenarioBuilder import scala.concurrent.duration._ class CloneUsingHAGerrit2 extends GitSimulation { - private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue + private val data: FeederBuilder = jsonFile(resource).convert(keys).queue private var default: String = name def this(default: String) {
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala index c9e2dd2..d43c81a 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateChangeUsingHAGerrit1.scala
@@ -16,14 +16,14 @@ import com.google.gerrit.scenarios.GerritSimulation import io.gatling.core.Predef.{atOnceUsers, _} -import io.gatling.core.feeder.FileBasedFeederBuilder +import io.gatling.core.feeder.FeederBuilder import io.gatling.core.structure.ScenarioBuilder import io.gatling.http.Predef._ import scala.concurrent.duration._ class CreateChangeUsingHAGerrit1 extends GerritSimulation { - private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue + private val data: FeederBuilder = jsonFile(resource).convert(keys).queue private val default: String = name private val numberKey = "_number"
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerrit1.scala index 679c055..964aadb 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerrit1.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerrit1.scala
@@ -16,11 +16,11 @@ import com.google.gerrit.scenarios.ProjectSimulation import io.gatling.core.Predef._ -import io.gatling.core.feeder.FileBasedFeederBuilder +import io.gatling.core.feeder.FeederBuilder import io.gatling.core.structure.ScenarioBuilder class CreateProjectUsingHAGerrit1 extends ProjectSimulation { - private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue + private val data: FeederBuilder = jsonFile(resource).convert(keys).queue def this(default: String) { this()
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala index ba11ee7..28511c7 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
@@ -16,12 +16,12 @@ import com.google.gerrit.scenarios.GerritSimulation import io.gatling.core.Predef.{atOnceUsers, _} -import io.gatling.core.feeder.FileBasedFeederBuilder +import io.gatling.core.feeder.FeederBuilder import io.gatling.core.structure.ScenarioBuilder import io.gatling.http.Predef.http class DeleteChangeUsingHAGerrit2 extends GerritSimulation { - private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue + private val data: FeederBuilder = jsonFile(resource).convert(keys).queue var number: Option[Int] = None override def relativeRuntimeWeight = 10
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteProjectUsingHAGerrit.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteProjectUsingHAGerrit.scala index d329573..428085d 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteProjectUsingHAGerrit.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteProjectUsingHAGerrit.scala
@@ -16,11 +16,11 @@ import com.google.gerrit.scenarios.ProjectSimulation import io.gatling.core.Predef._ -import io.gatling.core.feeder.FileBasedFeederBuilder +import io.gatling.core.feeder.FeederBuilder import io.gatling.core.structure.ScenarioBuilder class DeleteProjectUsingHAGerrit extends ProjectSimulation { - private val data: FileBasedFeederBuilder[Any]#F#F = jsonFile(resource).convert(keys).queue + private val data: FeederBuilder = jsonFile(resource).convert(keys).queue def this(default: String) { this()