diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/CompositeStrategyTest.kt b/theodolite-quarkus/src/test/kotlin/theodolite/CompositeStrategyTest.kt index 31eaa40fbe5424cf4df00860623e91fa5f1a9408..f269768cbcebfb778ee41f367ee5cc9b6fee1f19 100644 --- a/theodolite-quarkus/src/test/kotlin/theodolite/CompositeStrategyTest.kt +++ b/theodolite-quarkus/src/test/kotlin/theodolite/CompositeStrategyTest.kt @@ -3,6 +3,7 @@ package theodolite import io.quarkus.test.junit.QuarkusTest import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test +import theodolite.benchmark.BenchmarkExecution import theodolite.strategies.restriction.LowerBoundRestriction import theodolite.strategies.searchstrategy.BinarySearch import theodolite.strategies.searchstrategy.CompositeStrategy @@ -29,7 +30,8 @@ class CompositeStrategyTest { val mockResources: List<Resource> = (0..6).map { number -> Resource(number, "Instances") } val results = Results() val benchmark = TestBenchmark() - val benchmarkExecutor = TestBenchmarkExecutorImpl(mockResults, benchmark, results) + val sloChecker: BenchmarkExecution.Slo = BenchmarkExecution.Slo() + val benchmarkExecutor = TestBenchmarkExecutorImpl(mockResults, benchmark, results, sloChecker) val linearSearch = LinearSearch(benchmarkExecutor) val lowerBoundRestriction = LowerBoundRestriction(results) val strategy = @@ -61,8 +63,9 @@ class CompositeStrategyTest { val mockResources: List<Resource> = (0..6).map { number -> Resource(number, "Instances") } val results = Results() val benchmark = TestBenchmark() + val sloChecker: BenchmarkExecution.Slo = BenchmarkExecution.Slo() val benchmarkExecutorImpl = - TestBenchmarkExecutorImpl(mockResults, benchmark, results) + TestBenchmarkExecutorImpl(mockResults, benchmark, results, sloChecker) val binarySearch = BinarySearch(benchmarkExecutorImpl) val lowerBoundRestriction = LowerBoundRestriction(results) val strategy = @@ -94,7 +97,8 @@ class CompositeStrategyTest { val mockResources: List<Resource> = (0..7).map { number -> Resource(number, "Instances") } val results = Results() val benchmark = TestBenchmark() - val benchmarkExecutor = TestBenchmarkExecutorImpl(mockResults, benchmark, results) + val sloChecker: BenchmarkExecution.Slo = BenchmarkExecution.Slo() + val benchmarkExecutor = TestBenchmarkExecutorImpl(mockResults, benchmark, results, sloChecker) val binarySearch = BinarySearch(benchmarkExecutor) val lowerBoundRestriction = LowerBoundRestriction(results) val strategy = diff --git a/theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmarkExecutorImpl.kt b/theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmarkExecutorImpl.kt index bab20b7b56a6b95efd7e616338419b632a8f42d7..2de07d48dbe59313506745e6c97b2ae9a5ed114e 100644 --- a/theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmarkExecutorImpl.kt +++ b/theodolite-quarkus/src/test/kotlin/theodolite/TestBenchmarkExecutorImpl.kt @@ -1,6 +1,7 @@ package theodolite import theodolite.benchmark.Benchmark +import theodolite.benchmark.BenchmarkExecution import theodolite.execution.BenchmarkExecutor import theodolite.util.LoadDimension import theodolite.util.Resource @@ -10,16 +11,19 @@ import java.time.Duration class TestBenchmarkExecutorImpl( private val mockResults: Array<Array<Boolean>>, benchmark: Benchmark, - results: Results + results: Results, + slo: BenchmarkExecution.Slo ) : BenchmarkExecutor( - benchmark, results, executionDuration = Duration.ofSeconds(1), - configurationOverrides = emptyList() + benchmark, + results, + executionDuration = Duration.ofSeconds(1), + configurationOverrides = emptyList(), + slo = slo ) { override fun runExperiment(load: LoadDimension, res: Resource): Boolean { val result = this.mockResults[load.get()][res.get()] - this.results.setResult(Pair(load, res), result) return result }