diff options
| author | Marco Miller <marco.mmiller@gmail.com> | 2020-09-24 14:50:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-09-24 14:50:01 +0000 |
| commit | 1cc5bd13d50706045132424a27e1c6071360d6c4 (patch) | |
| tree | 3ab41a2e401c55d60128c6f55666eac8ce8827ee | |
| parent | c104f431de225d119ed6e2768b4f2a7c866b4570 (diff) | |
| parent | 233ebc4f0be9c117134c26d27ca39b95b56066c3 (diff) | |
Merge "GerritSimulation: Fix json keys parsing's alphabetical order" into stable-3.0
| -rw-r--r-- | e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala index cfae0e9f4a..0ee9c303f9 100644 --- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala +++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala @@ -59,12 +59,8 @@ class GerritSimulation extends Simulation { conf.httpConfiguration.password) protected val keys: PartialFunction[(String, Any), Any] = { - case ("url", url) => - var in = replaceOverride(url.toString) - in = replaceProperty("hostname", "localhost", in) - in = replaceProperty("http_port", 8080, in) - in = replaceProperty("http_scheme", "http", in) - replaceProperty("ssh_port", 29418, in) + case ("entries", entries) => + replaceProperty("projects_entries", "1", entries.toString) case ("number", number) => val precedes = replaceKeyWith("_number", 0, number.toString) replaceProperty("number", 1, precedes) @@ -74,8 +70,12 @@ class GerritSimulation extends Simulation { var precedes = replaceKeyWith("_project", name, project.toString) precedes = replaceOverride(precedes) replaceProperty("project", precedes) - case ("entries", entries) => - replaceProperty("projects_entries", "1", entries.toString) + case ("url", url) => + var in = replaceOverride(url.toString) + in = replaceProperty("hostname", "localhost", in) + in = replaceProperty("http_port", 8080, in) + in = replaceProperty("http_scheme", "http", in) + replaceProperty("ssh_port", 29418, in) } private def replaceProperty(term: String, in: String): String = { |