Merge branch 'stable-3.2'
* stable-3.2:
e2e-tests: Rename 'default' after GerritSimulation core change Id33ada17
e2e-tests: Rename 'unique' after GerritSimulation core change I229976f5
e2e-tests: Rename 'name' after GerritSimulation core change I3527fb39
e2e-tests: Remove unnecessary type specifications
Change-Id: I55d42a33f25c89b24d9a5234a28ef37435b19b7a
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
index cc80577..e12f1cc 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CloneUsingMultiGerrit1.scala
@@ -23,24 +23,24 @@
class CloneUsingMultiGerrit1 extends GitSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
- private var default: String = name
+ private var projectName = className
- def this(default: String) {
+ def this(projectName: String) {
this()
- this.default = default
+ this.projectName = projectName
}
override def replaceOverride(in: String): String = {
val next = replaceProperty("http_port1", 8081, in)
- replaceKeyWith("_project", default, next)
+ replaceKeyWith("_project", projectName, next)
}
- val test: ScenarioBuilder = scenario(unique)
+ val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(gitRequest)
- private val createProject = new CreateProjectUsingMultiGerrit(default)
- private val deleteProject = new DeleteProjectUsingMultiGerrit(default)
+ private val createProject = new CreateProjectUsingMultiGerrit(projectName)
+ private val deleteProject = new DeleteProjectUsingMultiGerrit(projectName)
setUp(
createProject.test.inject(
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
index 51dd72d..eade1cf 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateChangeUsingMultiGerrit.scala
@@ -24,12 +24,12 @@
class CreateChangeUsingMultiGerrit extends GerritSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
- private val default: String = name
+ private val projectName = className
private val numberKey = "_number"
override def relativeRuntimeWeight = 10
- private val test: ScenarioBuilder = scenario(unique)
+ private val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(httpRequest
.body(ElFileBody(body)).asJson
@@ -39,8 +39,8 @@
session
})
- private val createProject = new CreateProjectUsingMultiGerrit(default)
- private val deleteProject = new DeleteProjectUsingMultiGerrit(default)
+ private val createProject = new CreateProjectUsingMultiGerrit(projectName)
+ private val deleteProject = new DeleteProjectUsingMultiGerrit(projectName)
private val deleteChange = new DeleteChangeUsingMultiGerrit1
setUp(
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
index 520c1a3..529dc17 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerrit.scala
@@ -24,12 +24,12 @@
override def relativeRuntimeWeight = 15
- def this(default: String) {
+ def this(projectName: String) {
this()
- this.default = default
+ this.projectName = projectName
}
- val test: ScenarioBuilder = scenario(unique)
+ val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(httpRequest.body(RawFileBody(body)).asJson)
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
index 5270ce0..e92a422 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/CreateProjectUsingMultiGerritTwice.scala
@@ -20,13 +20,13 @@
import scala.concurrent.duration._
class CreateProjectUsingMultiGerritTwice extends GitSimulation {
- private val default: String = name
+ private val projectName = className
- private val createProject = new CreateProjectUsingMultiGerrit(default)
- private val deleteProject = new DeleteProjectUsingMultiGerrit(default)
- private val createItAgain = new CreateProjectUsingMultiGerrit(default)
- private val verifyProject = new CloneUsingMultiGerrit1(default)
- private val deleteItAfter = new DeleteProjectUsingMultiGerrit(default)
+ private val createProject = new CreateProjectUsingMultiGerrit(projectName)
+ private val deleteProject = new DeleteProjectUsingMultiGerrit(projectName)
+ private val createItAgain = new CreateProjectUsingMultiGerrit(projectName)
+ private val verifyProject = new CloneUsingMultiGerrit1(projectName)
+ private val deleteItAfter = new DeleteProjectUsingMultiGerrit(projectName)
setUp(
createProject.test.inject(
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
index 91ab1a9..457de0d 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteChangeUsingMultiGerrit1.scala
@@ -36,7 +36,7 @@
conf.httpConfiguration.userName,
ConfigFactory.load().getString("http.password_replica"))
- val test: ScenarioBuilder = scenario(unique)
+ val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(session => {
if (number.nonEmpty) {
@@ -45,7 +45,7 @@
session
}
})
- .exec(http(unique).delete("${url}${number}"))
+ .exec(http(uniqueName).delete("${url}${number}"))
setUp(
test.inject(
diff --git a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
index 8bcc648..151d8f8 100644
--- a/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
+++ b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala
@@ -24,12 +24,12 @@
override def relativeRuntimeWeight = 10
- def this(default: String) {
+ def this(projectName: String) {
this()
- this.default = default
+ this.projectName = projectName
}
- val test: ScenarioBuilder = scenario(unique)
+ val test: ScenarioBuilder = scenario(uniqueName)
.feed(data)
.exec(httpRequest)
