Fix failing tests

Signed-off-by: Paolo Di Tommaso <[email protected]>
seqeralabs · Apr 23, 2024 · 0a5d08e · 0a5d08e
1 parent 93e119e
commit 0a5d08e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/main/groovy/io/seqera/wave/service/builder/BuildCacheStore.groovy b/src/main/groovy/io/seqera/wave/service/builder/BuildCacheStore.groovy
@@ -30,7 +30,6 @@ import io.seqera.wave.encoder.MoshiEncodeStrategy
 import io.seqera.wave.exception.BuildTimeoutException
 import io.seqera.wave.service.cache.AbstractCacheStore
 import io.seqera.wave.service.cache.impl.CacheProvider
-import jakarta.inject.Inject
 import jakarta.inject.Named
 import jakarta.inject.Singleton
 /**
@@ -45,13 +44,12 @@ class BuildCacheStore extends AbstractCacheStore<BuildResult> implements BuildSt
 
     private BuildConfig buildConfig
 
-    @Inject
-    @Named(TaskExecutors.IO)
-    ExecutorService ioExecutor
+    private ExecutorService ioExecutor
 
-    BuildCacheStore(CacheProvider<String, String> provider, BuildConfig buildConfig ) {
+    BuildCacheStore(CacheProvider<String, String> provider, BuildConfig buildConfig, @Named(TaskExecutors.IO) ExecutorService ioExecutor) {
         super(provider, new MoshiEncodeStrategy<BuildResult>() {})
         this.buildConfig = buildConfig
+        this.ioExecutor = ioExecutor
     }
 
     @Override

diff --git a/src/test/groovy/io/seqera/wave/service/builder/BuildCacheStoreLocalTest.groovy b/src/test/groovy/io/seqera/wave/service/builder/BuildCacheStoreLocalTest.groovy
@@ -22,11 +22,14 @@ import spock.lang.Specification
 
 import java.time.Duration
 import java.time.Instant
+import java.util.concurrent.ExecutorService
 
+import io.micronaut.scheduling.TaskExecutors
 import io.micronaut.test.extensions.spock.annotation.MicronautTest
 import io.seqera.wave.configuration.BuildConfig
 import io.seqera.wave.service.cache.impl.LocalCacheProvider
 import jakarta.inject.Inject
+import jakarta.inject.Named
 
 /**
  *
@@ -38,6 +41,10 @@ class BuildCacheStoreLocalTest extends Specification {
     @Inject
     private BuildConfig buildConfig
 
+    @Inject
+    @Named(TaskExecutors.IO)
+    ExecutorService ioExecutor
+
     BuildResult zero = BuildResult.create('0')
     BuildResult one = BuildResult.completed('1', 0, 'done', Instant.now(), 'abc')
     BuildResult two = BuildResult.completed('2', 0, 'done', Instant.now(), 'abc')
@@ -46,7 +53,7 @@ class BuildCacheStoreLocalTest extends Specification {
     def 'should get and put key values' () {
         given:
         def provider = new LocalCacheProvider()
-        def cache = new BuildCacheStore(provider, buildConfig)
+        def cache = new BuildCacheStore(provider, buildConfig, ioExecutor)
 
         expect:
         cache.getBuild('foo') == null
@@ -61,7 +68,7 @@ class BuildCacheStoreLocalTest extends Specification {
         given:
         def DURATION = Duration.ofSeconds(2)
         def provider = new LocalCacheProvider()
-        def cache = Spy(new BuildCacheStore(provider, buildConfig)) { getDuration() >> DURATION }
+        def cache = Spy(new BuildCacheStore(provider, buildConfig, ioExecutor)) { getDuration() >> DURATION }
 
         expect:
         cache.getBuild('foo') == null
@@ -90,7 +97,7 @@ class BuildCacheStoreLocalTest extends Specification {
     def 'should store if absent' () {
         given:
         def provider = new LocalCacheProvider()
-        def cache = new BuildCacheStore(provider, buildConfig)
+        def cache = new BuildCacheStore(provider, buildConfig, ioExecutor)
 
         expect:
         cache.storeIfAbsent('foo', zero)
@@ -108,7 +115,7 @@ class BuildCacheStoreLocalTest extends Specification {
     def 'should remove a build entry' () {
         given:
         def provider = new LocalCacheProvider()
-        def cache = new BuildCacheStore(provider, buildConfig)
+        def cache = new BuildCacheStore(provider, buildConfig, ioExecutor)
 
         when:
         cache.storeBuild('foo', zero)
@@ -125,7 +132,7 @@ class BuildCacheStoreLocalTest extends Specification {
     def 'should await for a value' () {
         given:
         def provider = new LocalCacheProvider()
-        def cache = new BuildCacheStore(provider, buildConfig)
+        def cache = new BuildCacheStore(provider, buildConfig, ioExecutor)
 
         expect:
         cache.awaitBuild('foo') == null