e2e-tests: Rename 'default' after GerritSimulation core change Id33ada17 Change-Id: I9c19f00a56d94bb331c922fceb8e821c84cd0ecf
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 4b4b217..4fa0ca5 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
@@ -23,24 +23,24 @@ class CloneUsingHAGerrit2 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_port2", 8082, in) - replaceKeyWith("_project", default, next) + replaceKeyWith("_project", projectName, next) } val test: ScenarioBuilder = scenario(uniqueName) .feed(data) .exec(gitRequest) - private val createProject = new CreateProjectUsingHAGerrit1(default) - private val deleteProject = new DeleteProjectUsingHAGerrit(default) + private val createProject = new CreateProjectUsingHAGerrit1(projectName) + private val deleteProject = new DeleteProjectUsingHAGerrit(projectName) setUp( createProject.test.inject(
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 350e29e..26732b6 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
@@ -24,7 +24,7 @@ class CreateChangeUsingHAGerrit1 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 @@ -43,8 +43,8 @@ session }) - private val createProject = new CreateProjectUsingHAGerrit1(default) - private val deleteProject = new DeleteProjectUsingHAGerrit(default) + private val createProject = new CreateProjectUsingHAGerrit1(projectName) + private val deleteProject = new DeleteProjectUsingHAGerrit(projectName) private val deleteChange = new DeleteChangeUsingHAGerrit2 setUp(
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 7f8b1e2..5773bcf 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
@@ -22,9 +22,9 @@ class CreateProjectUsingHAGerrit1 extends ProjectSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - def this(default: String) { + def this(projectName: String) { this() - this.default = default + this.projectName = projectName } override def replaceOverride(in: String): String = {
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala index abfda0c..fd83e7a 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CreateProjectUsingHAGerritTwice.scala
@@ -20,13 +20,13 @@ import scala.concurrent.duration._ class CreateProjectUsingHAGerritTwice extends GitSimulation { - private val default = className + private val projectName = className - private val createProject = new CreateProjectUsingHAGerrit1(default) - private val deleteProject = new DeleteProjectUsingHAGerrit(default) - private val createItAgain = new CreateProjectUsingHAGerrit1(default) - private val verifyProject = new CloneUsingHAGerrit2(default) - private val deleteItAfter = new DeleteProjectUsingHAGerrit(default) + private val createProject = new CreateProjectUsingHAGerrit1(projectName) + private val deleteProject = new DeleteProjectUsingHAGerrit(projectName) + private val createItAgain = new CreateProjectUsingHAGerrit1(projectName) + private val verifyProject = new CloneUsingHAGerrit2(projectName) + private val deleteItAfter = new DeleteProjectUsingHAGerrit(projectName) setUp( createProject.test.inject(
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 c4f7c1d..cdc6e9e 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
@@ -22,9 +22,9 @@ class DeleteProjectUsingHAGerrit extends ProjectSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - 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/ericsson/gerrit/plugins/highavailability/scenarios/FlushProjectsCacheUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/FlushProjectsCacheUsingHAGerrit2.scala index 6ebb058..4f619b8 100644 --- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/FlushProjectsCacheUsingHAGerrit2.scala +++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/FlushProjectsCacheUsingHAGerrit2.scala
@@ -23,7 +23,7 @@ class FlushProjectsCacheUsingHAGerrit2 extends CacheFlushSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - private val default = className + private val projectName = className override def relativeRuntimeWeight = 2 @@ -35,10 +35,10 @@ .feed(data) .exec(httpRequest) - private val createProject = new CreateProjectUsingHAGerrit1(default) + private val createProject = new CreateProjectUsingHAGerrit1(projectName) private val getCacheEntriesAfterProject = new GetProjectsCacheEntries(this) private val checkCacheEntriesAfterFlush = new CheckProjectsCacheFlushEntriesUsingHAGerrit1(this) - private val deleteProject = new DeleteProjectUsingHAGerrit(default) + private val deleteProject = new DeleteProjectUsingHAGerrit(projectName) setUp( createProject.test.inject(