summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Miller <marco.miller@ericsson.com>2020-09-21 15:43:23 -0400
committerMarco Miller <marco.mmiller@gmail.com>2020-09-22 17:30:45 +0000
commitee28fb0f8109ec2e3be1040be2bcc29ef55c2ca4 (patch)
treeeb8410e7843340b378d253f37ceb9d7a0a6ae90a
parentcdb2927a5339a5bb96d8b2d6104a8c0b43f506e9 (diff)
e2e-tests: Remove unnecessary type specifications
As these do not lend warnings in IntelliJ once removed. Indeed, one "should almost never annotate the type of a private field or a local variable, as their type will usually be immediately evident in their value" [1]. [1] https://docs.scala-lang.org/style/types.html#inference Change-Id: I94c84583bb305c66dee159fc179a49a8b5649378
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/CacheFlushSimulation.scala2
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/CheckNewProjectReplica1.scala2
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala4
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/FlushProjectsCache.scala2
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/GerritSimulation.scala16
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala2
-rw-r--r--e2e-tests/src/test/scala/com/google/gerrit/scenarios/SubmitChange.scala2
7 files changed, 15 insertions, 15 deletions
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CacheFlushSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CacheFlushSimulation.scala
index 98d0190a8a..b98ae21b55 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CacheFlushSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CacheFlushSimulation.scala
@@ -20,7 +20,7 @@ class CacheFlushSimulation extends GerritSimulation {
protected var producer: Option[CacheFlushSimulation] = None
protected var consumer: Option[CacheFlushSimulation] = None
- private var cacheEntriesBeforeFlush: Int = 0
+ private var cacheEntriesBeforeFlush = 0
def entriesBeforeFlush(entries: Int): Unit = {
cacheEntriesBeforeFlush = entries
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 61442fd876..fef53bf707 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: String = name
+ private val default = name
private lazy val replicationDuration = replicationDelay + SecondsPerWeightUnit
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 14ada0dfbc..4016c46708 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,8 +22,8 @@ import scala.concurrent.duration._
class CloneUsingBothProtocols extends GitSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
- private val default: String = name
- private val duration: Int = 2
+ private val default = name
+ private val duration = 2
override def replaceOverride(in: String): String = {
replaceKeyWith("_project", default, in)
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 2e63fd50c3..2094633314 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: String = name
+ private val default = name
override def relativeRuntimeWeight = 2
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 860c7dfeb9..5961dd3d4d 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,20 +23,20 @@ import io.gatling.http.request.builder.HttpRequestBuilder
class GerritSimulation extends Simulation {
implicit val conf: GatlingGitConfiguration = GatlingGitConfiguration()
- private val pack: String = this.getClass.getPackage.getName
- private val path: String = pack.replaceAllLiterally(".", "/")
+ private val pack = this.getClass.getPackage.getName
+ private val path = pack.replaceAllLiterally(".", "/")
protected val name: String = this.getClass.getSimpleName
- private val pathName: String = s"data/$path/$name"
- protected val resource: String = s"$pathName.json"
- protected val body: String = s"$pathName-body.json"
+ private val pathName = s"data/$path/$name"
+ protected val resource = s"$pathName.json"
+ protected val body = s"$pathName-body.json"
protected val unique: String = name + "-" + this.hashCode()
protected val single = 1
val replicationDelay: Int = replaceProperty("replication_delay", 15).toInt
- private val powerFactor: Double = replaceProperty("power_factor", 1.0).toDouble
- protected val SecondsPerWeightUnit: Int = 2
+ private val powerFactor = replaceProperty("power_factor", 1.0).toDouble
+ protected val SecondsPerWeightUnit = 2
val maxExecutionTime: Int = (SecondsPerWeightUnit * relativeRuntimeWeight * powerFactor).toInt
- private var cumulativeWaitTime: Int = 0
+ private var cumulativeWaitTime = 0
/**
* How long a scenario step should wait before starting to execute.
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 d529f48693..63d373ebbb 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,7 +22,7 @@ import scala.concurrent.duration._
class ReplayRecordsFromFeeder extends GitSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).circular
- private val default: String = name
+ private val default = name
override def relativeRuntimeWeight = 30
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 48f9fa88b1..25a1e926c7 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,7 +23,7 @@ import scala.concurrent.duration._
class SubmitChange extends GerritSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
- private val default: String = name
+ private val default = name
private var createChange = new CreateChange(default)
override def relativeRuntimeWeight = 10