diff options
author | Marco Miller <marco.mmiller@gmail.com> | 2020-09-25 19:36:29 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-25 19:36:29 +0000 |
commit | 9d0b601407722b8064407e515b3b69e9b904f829 (patch) | |
tree | 02207219a9c4a42b0f0af2c44bfa7acb5e98fad8 | |
parent | c0278bb1f9660f05630e5d0f1939e445ab5f361e (diff) | |
parent | 1aa49e0fb1afca43593102ff21c62db5cf4e4480 (diff) |
Merge "e2e-tests: Rename 'default' to projectName for explicitness" into stable-3.0
9 files changed, 29 insertions, 29 deletions
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckNewProjectReplica1.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckNewProjectReplica1.scala index 60b5a243da..ae4fa801c4 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckNewProjectReplica1.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckNewProjectReplica1.scala @@ -22,7 +22,7 @@ import scala.concurrent.duration._ class CheckNewProjectReplica1 extends GitSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - private val default = className + private val projectName = className private lazy val replicationDuration = replicationDelay + SecondsPerWeightUnit @@ -30,7 +30,7 @@ class CheckNewProjectReplica1 extends GitSimulation { override def replaceOverride(in: String): String = { var next = replaceProperty("http_port1", 8081, in) - next = replaceKeyWith("_project", default, next) + next = replaceKeyWith("_project", projectName, next) super.replaceOverride(next) } @@ -38,8 +38,8 @@ class CheckNewProjectReplica1 extends GitSimulation { .feed(data) .exec(gitRequest) - private val createProject = new CreateProject(default) - private val deleteProject = new DeleteProject(default) + private val createProject = new CreateProject(projectName) + private val deleteProject = new DeleteProject(projectName) setUp( createProject.test.inject( diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala index e07a9e611e..08966a89d3 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala @@ -22,19 +22,19 @@ import scala.concurrent.duration._ class CloneUsingBothProtocols extends GitSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - private val default = className + private val projectName = className private val duration = 2 override def replaceOverride(in: String): String = { - replaceKeyWith("_project", default, in) + replaceKeyWith("_project", projectName, in) } private val test: ScenarioBuilder = scenario(uniqueName) .feed(data) .exec(gitRequest) - private val createProject = new CreateProject(default) - private val deleteProject = new DeleteProject(default) + private val createProject = new CreateProject(projectName) + private val deleteProject = new DeleteProject(projectName) setUp( createProject.test.inject( diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala index 48bc04b790..f3692a96d9 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateChange.scala @@ -28,9 +28,9 @@ class CreateChange extends ProjectSimulation { override def relativeRuntimeWeight = 2 - def this(default: String) { + def this(projectName: String) { this() - this.default = default + this.projectName = projectName } val test: ScenarioBuilder = scenario(uniqueName) @@ -43,8 +43,8 @@ class CreateChange extends ProjectSimulation { session }) - private val createProject = new CreateProject(default) - private val deleteProject = new DeleteProject(default) + private val createProject = new CreateProject(projectName) + private val deleteProject = new DeleteProject(projectName) private val deleteChange = new DeleteChange(this) setUp( diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala index 515a39ff2b..25e50b3f03 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CreateProject.scala @@ -21,9 +21,9 @@ import io.gatling.core.structure.ScenarioBuilder class CreateProject 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/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala index 39a74dd674..17526348bc 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/DeleteProject.scala @@ -21,9 +21,9 @@ import io.gatling.core.structure.ScenarioBuilder class DeleteProject 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/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala index 60145e54de..9fef2cfbc9 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala @@ -22,7 +22,7 @@ import scala.concurrent.duration._ class FlushProjectsCache extends CacheFlushSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - private val default = className + private val projectName = className override def relativeRuntimeWeight = 2 @@ -30,10 +30,10 @@ class FlushProjectsCache extends CacheFlushSimulation { .feed(data) .exec(httpRequest) - private val createProject = new CreateProject(default) + private val createProject = new CreateProject(projectName) private val getCacheEntriesAfterProject = new GetProjectsCacheEntries(this) private val checkCacheEntriesAfterFlush = new CheckProjectsCacheFlushEntries(this) - private val deleteProject = new DeleteProject(default) + private val deleteProject = new DeleteProject(projectName) setUp( createProject.test.inject( diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala index 141c3cf8b8..d6cb937814 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala @@ -15,9 +15,9 @@ package com.google.gerrit.scenarios class ProjectSimulation extends GerritSimulation { - protected var default: String = "project" + protected var projectName: String = "defaultTestProject" override def replaceOverride(in: String): String = { - replaceProperty("project", default, in) + replaceProperty("project", projectName, in) } } diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala index 613a73af2d..0bd9e4a510 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala @@ -22,12 +22,12 @@ import scala.concurrent.duration._ class ReplayRecordsFromFeeder extends GitSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).circular - private val default = className + private val projectName = className override def relativeRuntimeWeight = 30 override def replaceOverride(in: String): String = { - replaceKeyWith("_project", default, in) + replaceKeyWith("_project", projectName, in) } private val test: ScenarioBuilder = scenario(uniqueName) @@ -36,8 +36,8 @@ class ReplayRecordsFromFeeder extends GitSimulation { .exec(gitRequest) } - private val createProject = new CreateProject(default) - private val deleteProject = new DeleteProject(default) + private val createProject = new CreateProject(projectName) + private val deleteProject = new DeleteProject(projectName) private val maxBeforeDelete: Int = maxExecutionTime - deleteProject.maxExecutionTime setUp( diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala index 2d7a08e775..067496ac5e 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala @@ -23,8 +23,8 @@ import scala.concurrent.duration._ class SubmitChange extends GerritSimulation { private val data: FeederBuilder = jsonFile(resource).convert(keys).queue - private val default = className - private var createChange = new CreateChange(default) + private val projectName = className + private var createChange = new CreateChange(projectName) override def relativeRuntimeWeight = 10 @@ -40,9 +40,9 @@ class SubmitChange extends GerritSimulation { }) .exec(http(uniqueName).post("${url}${number}/submit")) - private val createProject = new CreateProject(default) + private val createProject = new CreateProject(projectName) private val approveChange = new ApproveChange(createChange) - private val deleteProject = new DeleteProject(default) + private val deleteProject = new DeleteProject(projectName) setUp( createProject.test.inject( |