e2e-tests: Refactor scenarios to use ClusterDefault
Put defaults for http_port1 and http_port2 into ClusterDefault class to
avoid duplications.
Change-Id: Ib247cd3ce2345d6909dc31532e1ff39191ee78a9
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
index 7e63134..09ba6d4 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/CheckProjectsCacheFlushEntriesUsingHAGerrit1.scala
@@ -22,9 +22,10 @@
class CheckProjectsCacheFlushEntriesUsingHAGerrit1 extends CacheFlushSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
+ private val default: ClusterDefault = new ClusterDefault
override def replaceOverride(in: String): String = {
- replaceProperty("http_port1", 8081, in)
+ replaceProperty("http_port1", default.httpPort1, in)
}
def this(producer: CacheFlushSimulation) {
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 4fa0ca5..a03a731 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,6 +23,7 @@
class CloneUsingHAGerrit2 extends GitSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
+ private val default: ClusterDefault = new ClusterDefault
private var projectName = className
def this(projectName: String) {
@@ -31,7 +32,7 @@
}
override def replaceOverride(in: String): String = {
- val next = replaceProperty("http_port2", 8082, in)
+ val next = replaceProperty("http_port2", default.httpPort2, in)
replaceKeyWith("_project", projectName, next)
}
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/ClusterDefault.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/ClusterDefault.scala
index dad2b35..58bbc7e 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/ClusterDefault.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/ClusterDefault.scala
@@ -16,4 +16,6 @@
class ClusterDefault {
val clusterHttpPort: Int = 80
+ val httpPort1: Int = 8081
+ val httpPort2: Int = 8082
}
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 bfd520a..7969af0 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,12 +24,13 @@
class CreateChangeUsingHAGerrit1 extends GerritSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
+ private val default: ClusterDefault = new ClusterDefault
private val projectName = className
override def relativeRuntimeWeight = 10
override def replaceOverride(in: String): String = {
- replaceProperty("http_port1", 8081, in)
+ replaceProperty("http_port1", default.httpPort1, in)
}
private val test: ScenarioBuilder = scenario(uniqueName)
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 5773bcf..72a1068 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
@@ -21,6 +21,7 @@
class CreateProjectUsingHAGerrit1 extends ProjectSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
+ private val default: ClusterDefault = new ClusterDefault
def this(projectName: String) {
this()
@@ -28,7 +29,7 @@
}
override def replaceOverride(in: String): String = {
- val next = replaceProperty("http_port1", 8081, in)
+ val next = replaceProperty("http_port1", default.httpPort1, in)
super.replaceOverride(next)
}
diff --git a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
index 335d587..c8e1c50 100644
--- a/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
+++ b/src/test/scala/com/ericsson/gerrit/plugins/highavailability/scenarios/DeleteChangeUsingHAGerrit2.scala
@@ -22,12 +22,13 @@
class DeleteChangeUsingHAGerrit2 extends GerritSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
+ private val default: ClusterDefault = new ClusterDefault
var number: Option[Int] = None
override def relativeRuntimeWeight = 10
override def replaceOverride(in: String): String = {
- replaceProperty("http_port2", 8082, in)
+ replaceProperty("http_port2", default.httpPort2, in)
}
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 4f619b8..d6eff71 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,12 +23,13 @@
class FlushProjectsCacheUsingHAGerrit2 extends CacheFlushSimulation {
private val data: FeederBuilder = jsonFile(resource).convert(keys).queue
+ private val default: ClusterDefault = new ClusterDefault
private val projectName = className
override def relativeRuntimeWeight = 2
override def replaceOverride(in: String): String = {
- replaceProperty("http_port2", 8082, in)
+ replaceProperty("http_port2", default.httpPort2, in)
}
private val flushCache: ScenarioBuilder = scenario(uniqueName)
