e2e-tests: Rename 'default' after GerritSimulation core change Id33ada17 Change-Id: I15d129896bb18a66077e95352fa08de0c0632ab7
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 fba9e99..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 = className + 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(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 217cd88..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,7 +24,7 @@ class CreateChangeUsingMultiGerrit extends GerritSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - private val default = className + private val projectName = className private val numberKey = "_number" override def relativeRuntimeWeight = 10 @@ -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 9c0d612..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,9 +24,9 @@ override def relativeRuntimeWeight = 15 - def this(default: String) { + def this(projectName: String) { this() - this.default = default + this.projectName = projectName } val test: ScenarioBuilder = scenario(uniqueName)
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 843bf44..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 = className + 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/DeleteProjectUsingMultiGerrit.scala b/src/test/scala/com/googlesource/gerrit/plugins/multisite/scenarios/DeleteProjectUsingMultiGerrit.scala index 8609afe..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,9 +24,9 @@ override def relativeRuntimeWeight = 10 - def this(default: String) { + def this(projectName: String) { this() - this.default = default + this.projectName = projectName } val test: ScenarioBuilder = scenario(uniqueName)