From d528d2b7e10a74ba6844a0dc1ecfafebe59ec919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Mon, 21 Nov 2022 10:04:45 +0100
Subject: [PATCH] Minor code style fixes
---
.../test/kotlin/rocks/theodolite/core/ResultsTest.kt | 12 ++++++------
.../restrictionstrategy/LowerBoundRestrictionTest.kt | 10 +++++-----
.../searchstrategy/InitialGuessSearchStrategyTest.kt | 10 +++++-----
.../searchstrategy/RestrictionSearchTest.kt | 8 ++++----
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/theodolite/src/test/kotlin/rocks/theodolite/core/ResultsTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/core/ResultsTest.kt
index 42bc5883f..b0e9ca9e5 100644
--- a/theodolite/src/test/kotlin/rocks/theodolite/core/ResultsTest.kt
+++ b/theodolite/src/test/kotlin/rocks/theodolite/core/ResultsTest.kt
@@ -11,7 +11,7 @@ internal class ResultsTest {
@Test
fun testMinRequiredInstancesWhenSuccessfulDemand() {
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(Pair(10000, 1), true)
results.setResult(Pair(10000, 2), true)
results.setResult(Pair(20000, 1), false)
@@ -25,7 +25,7 @@ internal class ResultsTest {
@Test
fun testGetMaxBenchmarkedLoadWhenAllSuccessfulDemand() {
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(Pair(10000, 1), true)
results.setResult(Pair(10000, 2), true)
@@ -37,7 +37,7 @@ internal class ResultsTest {
@Test
fun testGetMaxBenchmarkedLoadWhenLargestNotSuccessfulDemand() {
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(Pair(10000, 1), true)
results.setResult(Pair(10000, 2), true)
results.setResult(Pair(20000, 1), false)
@@ -50,7 +50,7 @@ internal class ResultsTest {
@Test
fun testMaxRequiredInstancesWhenSuccessfulCapacity() {
- val results = Results(Metric.from("capacity"))
+ val results = Results(Metric.CAPACITY)
results.setResult(Pair(10000, 1), true)
results.setResult(Pair(20000, 1), false)
results.setResult(Pair(10000, 2), true)
@@ -64,7 +64,7 @@ internal class ResultsTest {
@Test
fun testGetMaxBenchmarkedLoadWhenAllSuccessfulCapacity() {
- val results = Results(Metric.from("capacity"))
+ val results = Results(Metric.CAPACITY)
results.setResult(Pair(10000, 1), true)
results.setResult(Pair(10000, 2), true)
@@ -76,7 +76,7 @@ internal class ResultsTest {
@Test
fun testGetMaxBenchmarkedLoadWhenLargestNotSuccessfulCapacity() {
- val results = Results(Metric.from("capacity"))
+ val results = Results(Metric.CAPACITY)
results.setResult(Pair(10000, 1), true)
results.setResult(Pair(20000, 1), true)
results.setResult(Pair(10000, 2), false)
diff --git a/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/restrictionstrategy/LowerBoundRestrictionTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/restrictionstrategy/LowerBoundRestrictionTest.kt
index 79fadb486..1e847bee7 100644
--- a/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/restrictionstrategy/LowerBoundRestrictionTest.kt
+++ b/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/restrictionstrategy/LowerBoundRestrictionTest.kt
@@ -12,7 +12,7 @@ internal class LowerBoundRestrictionTest {
@Test
fun testNoPreviousResults() {
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val strategy = LowerBoundRestriction(results)
val load = 10000
val resources = listOf(1, 2, 3)
@@ -24,7 +24,7 @@ internal class LowerBoundRestrictionTest {
@Test
fun testWithSuccessfulPreviousResults() {
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(10000, 1, true)
results.setResult(20000, 1, false)
results.setResult(20000, 2, true)
@@ -41,7 +41,7 @@ internal class LowerBoundRestrictionTest {
@Disabled
fun testWithNoSuccessfulPreviousResults() {
// This test is currently not implemented this way, but might later be the desired behavior.
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(10000, 1, true)
results.setResult(20000, 1, false)
results.setResult(20000, 2, false)
@@ -58,7 +58,7 @@ internal class LowerBoundRestrictionTest {
@Test
fun testNoPreviousResults2() {
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(10000, 1, true)
results.setResult(20000, 2, true)
results.setResult(10000, 1, false)
@@ -74,7 +74,7 @@ internal class LowerBoundRestrictionTest {
@Disabled
fun testMinRequiredInstancesWhenNotSuccessful() {
// This test is currently not implemented this way, but might later be the desired behavior.
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
results.setResult(10000, 1, true)
results.setResult(20000, 2, true)
results.setResult(10000, 1, false)
diff --git a/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/InitialGuessSearchStrategyTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/InitialGuessSearchStrategyTest.kt
index 820dc7564..d98fd4261 100644
--- a/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/InitialGuessSearchStrategyTest.kt
+++ b/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/InitialGuessSearchStrategyTest.kt
@@ -29,7 +29,7 @@ class InitialGuessSearchStrategyTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..6).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val guessStrategy = PrevInstanceOptGuess()
val sloChecker = Slo()
@@ -67,7 +67,7 @@ class InitialGuessSearchStrategyTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..6).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val guessStrategy = PrevInstanceOptGuess()
val sloChecker = Slo()
@@ -105,15 +105,15 @@ class InitialGuessSearchStrategyTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..6).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val guessStrategy = PrevInstanceOptGuess()
val sloChecker = Slo()
val benchmarkExecutor = TestExperimentRunnerImpl(results, mockResults, benchmarkDeploymentBuilder, listOf(sloChecker), 0, 0, 5)
val strategy = InitialGuessSearchStrategy(benchmarkExecutor, guessStrategy, results)
- val actual: ArrayList<Int?> = ArrayList()
- var expected: ArrayList<Int?> = ArrayList(listOf(2, 3, 0, 4, 6))
+ val actual: MutableList<Int?> = mutableListOf()
+ var expected: MutableList<Int?> = ArrayList(listOf(2, 3, 0, 4, 6))
expected.add(null)
expected = ArrayList(listOf(null) + expected)
diff --git a/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/RestrictionSearchTest.kt b/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/RestrictionSearchTest.kt
index bae944801..c82f00939 100644
--- a/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/RestrictionSearchTest.kt
+++ b/theodolite/src/test/kotlin/rocks/theodolite/core/strategies/searchstrategy/RestrictionSearchTest.kt
@@ -27,7 +27,7 @@ class RestrictionSearchTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..6).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val sloChecker = Slo()
val benchmarkExecutor = TestExperimentRunnerImpl(results, mockResults, benchmarkDeploymentBuilder, listOf(sloChecker), 0, 0, 5)
@@ -60,7 +60,7 @@ class RestrictionSearchTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..6).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val sloChecker = Slo()
val benchmarkExecutor = TestExperimentRunnerImpl(results, mockResults, benchmarkDeploymentBuilder, listOf(sloChecker), 0, 0, 5)
@@ -93,7 +93,7 @@ class RestrictionSearchTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..6).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val sloChecker = Slo()
val benchmarkExecutorImpl =
@@ -126,7 +126,7 @@ class RestrictionSearchTest {
)
val mockLoads: List<Int> = (0..6).toList()
val mockResources: List<Int> = (0..7).toList()
- val results = Results(Metric.from("demand"))
+ val results = Results(Metric.DEMAND)
val benchmarkDeploymentBuilder = TestBenchmarkDeploymentBuilder()
val sloChecker = Slo()
val benchmarkExecutor = TestExperimentRunnerImpl(results, mockResults, benchmarkDeploymentBuilder, listOf(sloChecker), 0, 0, 0)
--
GitLab