e2e-tests: Move core json files into scala package

Make the core resources data file structure consistent with the one used
to add non-core scenario files in.

Modify the documentation accordingly.

Change-Id: Ic352488a81cc43211fa38f0f2454b4fa944e9da6

11 files changed, 13 insertions, 14 deletions

diff --git a/Documentation/dev-e2e-tests.txt b/Documentation/dev-e2e-tests.txt
index e6f041e615..321238705d 100644
--- a/Documentation/dev-e2e-tests.txt
+++ b/Documentation/dev-e2e-tests.txt
@@ -85,10 +85,11 @@ ssh-keyscan -t rsa -p 29418 localhost > ~/.ssh/known_hosts
 === Input file
 
 The `CloneUsingBothProtocols` scenario is fed with the data coming from the
-`src/test/resources/data/CloneUsingBothProtocols.json` file. Such a file contains the commands and
-repository used during the load test. That file currently looks like below. This scenario serves
-as a simple example with no actual load in it. It can be used to test or validate the local setup.
-More complex scenarios can be further developed, under the `com.google.gerrit.scenarios` package.
+`src/test/resources/data/com/google/gerrit/scenarios/CloneUsingBothProtocols.json` file. Such a
+file contains the commands and repository used during the load test. That file currently looks like
+below. This scenario serves as a simple example with no actual load in it. It can be used to test
+or validate the local setup. More complex scenarios can be further developed, under the
+`com.google.gerrit.scenarios` package.
 
 ----
 [
diff --git a/e2e-tests/src/test/resources/data/.gitignore b/e2e-tests/src/test/resources/data/.gitignore
index a90811b777..735445973f 100644
--- a/e2e-tests/src/test/resources/data/.gitignore
+++ b/e2e-tests/src/test/resources/data/.gitignore
@@ -1,3 +1,4 @@
-/*
-!/*.json
+*
+!*/
+!/com/google/gerrit/scenarios/*
 !/.gitignore
diff --git a/e2e-tests/src/test/resources/data/CloneUsingBothProtocols.json b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CloneUsingBothProtocols.json
index 0335b2f0f1..0335b2f0f1 100644
--- a/e2e-tests/src/test/resources/data/CloneUsingBothProtocols.json
+++ b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CloneUsingBothProtocols.json
diff --git a/e2e-tests/src/test/resources/data/CreateProject.json b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json
index 2e54de55c2..2e54de55c2 100644
--- a/e2e-tests/src/test/resources/data/CreateProject.json
+++ b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/CreateProject.json
diff --git a/e2e-tests/src/test/resources/data/DeleteProject.json b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/DeleteProject.json
index 9312fb47a0..9312fb47a0 100644
--- a/e2e-tests/src/test/resources/data/DeleteProject.json
+++ b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/DeleteProject.json
diff --git a/e2e-tests/src/test/resources/data/ReplayRecordsFromFeeder.json b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.json
index 86f9bf135b..86f9bf135b 100644
--- a/e2e-tests/src/test/resources/data/ReplayRecordsFromFeeder.json
+++ b/e2e-tests/src/test/resources/data/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.json
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 a5ec0e1fac..09b36c6bcd 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
@@ -21,7 +21,7 @@ import io.gatling.core.structure.ScenarioBuilder
 import scala.concurrent.duration._
 
 class CloneUsingBothProtocols extends GitSimulation {
-  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(core).queue
+  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(added).queue
 
   private val test: ScenarioBuilder = scenario(name)
       .feed(data)
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 6a5b4130aa..f4e3ff9786 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
@@ -19,7 +19,7 @@ import io.gatling.core.feeder.FileBasedFeederBuilder
 import io.gatling.core.structure.ScenarioBuilder
 
 class CreateProject extends GerritSimulation {
-  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(core).queue
+  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(added).queue
 
   val test: ScenarioBuilder = scenario(name)
       .feed(data)
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 4c44257d8a..ed899cf7e3 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
@@ -19,7 +19,7 @@ import io.gatling.core.feeder.FileBasedFeederBuilder
 import io.gatling.core.structure.ScenarioBuilder
 
 class DeleteProject extends GerritSimulation {
-  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(core).queue
+  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(added).queue
 
   val test: ScenarioBuilder = scenario(name)
       .feed(data)
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 d36ef73b8e..2f78a83b71 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
@@ -23,12 +23,9 @@ import io.gatling.http.request.builder.HttpRequestBuilder
 class GerritSimulation extends Simulation {
   implicit val conf: GatlingGitConfiguration = GatlingGitConfiguration()
 
-  private val root: String = "data"
   private val path: String = this.getClass.getPackage.getName.replaceAllLiterally(".", "/")
-
   protected val name: String = this.getClass.getSimpleName
-  protected val core: String = s"$root/$name.json"
-  protected val added: String = s"$root/$path/$name.json"
+  protected val added: String = s"data/$path/$name.json"
 
   protected val httpRequest: HttpRequestBuilder = http(name).post("${url}")
   protected val httpProtocol: HttpProtocolBuilder = http.basicAuth(
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 e97b1b9fef..7a272b72a8 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
@@ -21,7 +21,7 @@ import io.gatling.core.structure.ScenarioBuilder
 import scala.concurrent.duration._
 
 class ReplayRecordsFromFeeder extends GitSimulation {
-  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(core).circular
+  private val data: FileBasedFeederBuilder[Any]#F = jsonFile(added).circular
 
   private val test: ScenarioBuilder = scenario(name)
       .repeat(10000) {