Coverage

Author: tobi-laa

src/main/kotlin/io/github/tobi/laa/spring/boot/embedded/redis/junit/extension/RedisValidationExtension.kt

@@ -5,12 +5,15 @@ import io.github.tobi.laa.spring.boot.embedded.redis.server.EmbeddedRedisServer
 import io.github.tobi.laa.spring.boot.embedded.redis.shardedcluster.EmbeddedRedisShardedCluster
 import org.junit.jupiter.api.extension.BeforeAllCallback
 import org.junit.jupiter.api.extension.ExtensionContext
+import kotlin.reflect.KClass
 
 /**
  * JUnit 5 extension to validate that the API is used correctly.
  */
 internal class RedisValidationExtension : BeforeAllCallback {
 
+    private val VALID_PORT_RANGE = 0..65535
+
     override fun beforeAll(context: ExtensionContext?) {
         val embeddedRedisServer = annotation(context, EmbeddedRedisServer::class.java)
         val embeddedRedisCluster = annotation(context, EmbeddedRedisCluster::class.java)
@@ -31,21 +34,29 @@ internal class RedisValidationExtension : BeforeAllCallback {
     }
 
     private fun validateServer(config: EmbeddedRedisServer) {
-        validatePort(config.port)
+        require(config.port in VALID_PORT_RANGE) { "Port must be in range $VALID_PORT_RANGE" }
         require(config.configFile.isEmpty() || config.settings.isEmpty()) { "Either 'configFile' or 'settings' can be set, but not both" }
-        require(config.customizer.all { it.constructors.any { it.parameters.isEmpty() } }) { "Customizers must have a no-arg constructor" }
+        validateCustomizers(config.customizer)
     }
 
     private fun validateCluster(config: EmbeddedRedisCluster) {
         TODO()
     }
 
     private fun validateShardedCluster(config: EmbeddedRedisShardedCluster) {
-        TODO()
+        require(config.shards.all { it.replicas > 0 }) { "Replicas for all shards must be greater than 0" }
+        require(config.ports.isEmpty() || config.ports.size == config.shards.sumOf { it.replicas + 1 }) { "If ports are specified, they must match the number of nodes" }
+        require(config.ports.all { it in VALID_PORT_RANGE }) { "All ports must be in range $VALID_PORT_RANGE" }
+        require(config.initializationTimeout > 0) { "Initialization timeout must be greater than 0" }
+        validateCustomizers(config.customizer)
+    }
+
+    private fun <T : Any> validateCustomizers(customizer: Array<KClass<out T>>) {
+        require(customizer.all { haveNoArgConstructor(it) }) { "Customizers must have a no-arg constructor" }
     }
 
-    private fun validatePort(port: Int) {
-        require(port in 0..65535) { "Port must be in range 0..65535" }
+    private fun <T : Any> haveNoArgConstructor(customizer: KClass<out T>): Boolean {
+        return customizer.constructors.any { it.parameters.isEmpty() }
     }
 
     private fun <A : Annotation> annotation(extensionContext: ExtensionContext?, type: Class<A>): A? {

src/main/kotlin/io/github/tobi/laa/spring/boot/embedded/redis/shardedcluster/EmbeddedRedisShardedCluster.kt

@@ -1,7 +1,6 @@
 package io.github.tobi.laa.spring.boot.embedded.redis.shardedcluster
 
-import io.github.tobi.laa.spring.boot.embedded.redis.junit.extension.RedisFlushAllExtension
-import org.junit.jupiter.api.extension.ExtendWith
+import io.github.tobi.laa.spring.boot.embedded.redis.junit.extension.EmbeddedRedisTest
 import org.springframework.test.context.ContextCustomizerFactories
 import kotlin.reflect.KClass
 
@@ -11,7 +10,7 @@ import kotlin.reflect.KClass
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 @MustBeDocumented
-@ExtendWith(RedisFlushAllExtension::class)
+@EmbeddedRedisTest
 @ContextCustomizerFactories(RedisShardedClusterContextCustomizerFactory::class)
 annotation class EmbeddedRedisShardedCluster(
 

src/main/resources/birds.txt

@@ -11191,4 +11191,4 @@ Turquoise Tanager
 White-bellied Tanager
 Paradise Tanager
 Opal-crowned Tanager
-Opal-rumped Tanager
+Opal-rumped Tanager

src/test/kotlin/io/github/tobi/laa/spring/boot/embedded/redis/server/RedisServerContextCustomizerTest.kt

@@ -40,8 +40,8 @@ internal class RedisServerContextCustomizerTest {
     @Test
     @DisplayName("Closing ApplicationContext should stop Redis server and Redis client")
     fun closingApplicationContext_shouldStopRedisServerAndRedisClient() {
-        var server: Redis? = null
-        var client: UnifiedJedis? = null
+        var server: Redis?
+        var client: UnifiedJedis?
         AnnotationConfigApplicationContext().use {
             RedisServerContextCustomizerFactory()
                 .createContextCustomizer(AnnotatedClass::class.java, mutableListOf())

src/test/kotlin/io/github/tobi/laa/spring/boot/embedded/redis/shardedcluster/ParamResolverTest.kt

@@ -0,0 +1,89 @@
+package io.github.tobi.laa.spring.boot.embedded.redis.shardedcluster
+
+import io.github.tobi.laa.spring.boot.embedded.redis.IntegrationTest
+import io.github.tobi.laa.spring.boot.embedded.redis.RedisStore
+import org.assertj.core.api.Assertions
+import org.junit.jupiter.api.*
+import org.springframework.context.ApplicationContext
+import redis.embedded.Redis
+import redis.embedded.RedisShardedCluster
+
+@IntegrationTest
+@EmbeddedRedisShardedCluster
+@TestMethodOrder(MethodOrderer.OrderAnnotation::class)
+@DisplayName("Parameter resolver test for @EmbeddedRedisShardedCluster")
+internal class ParamResolverTest {
+
+    var paramsFromBeforeEach = listOf<Redis>()
+    var paramsFromAfterEach = listOf<Redis>()
+
+    @Test
+    @Order(1)
+    @DisplayName("Should resolve @Test parameters correctly")
+    fun shouldResolveTestParamsCorrectly(redis: Redis, redisCluster: RedisShardedCluster) {
+        thenParamIsCorrectlyResolved(redis)
+        thenParamIsCorrectlyResolved(redisCluster)
+    }
+
+    @BeforeEach
+    fun beforeEach(redis: Redis, redisCluster: RedisShardedCluster) {
+        paramsFromBeforeEach = listOf(redis, redisCluster)
+    }
+
+    @Test
+    @Order(2)
+    @DisplayName("Should resolve @BeforeEach params correctly")
+    fun shouldResolveBeforeEachParamsCorrectly() {
+        paramsFromBeforeEach.forEach { thenParamIsCorrectlyResolved(it) }
+    }
+
+    @Test
+    @Order(3)
+    @DisplayName("Should resolve @BeforeAll params correctly")
+    fun shouldResolveBeforeAllParamsCorrectly() {
+        paramsFromBeforeAll.forEach { thenParamIsCorrectlyResolved(it) }
+    }
+
+    @AfterEach
+    fun afterEach(redis: Redis, redisCluster: RedisShardedCluster) {
+        paramsFromAfterEach = listOf(redis, redisCluster)
+    }
+
+    @Test
+    @Order(4)
+    @DisplayName("Should resolve @AfterEach params correctly")
+    fun shouldResolveAfterEachParamsCorrectly() {
+        paramsFromAfterEach.forEach { thenParamIsCorrectlyResolved(it) }
+    }
+
+    private companion object {
+
+        var paramsFromBeforeAll = listOf<Redis>()
+
+        var context: ApplicationContext? = null
+
+        @JvmStatic
+        @BeforeAll
+        fun injectContext(context: ApplicationContext) {
+            this.context = context
+        }
+
+        @JvmStatic
+        @BeforeAll
+        fun beforeAll(redis: Redis, redisCluster: RedisShardedCluster) {
+            paramsFromBeforeAll = listOf(redis, redisCluster)
+        }
+
+        @JvmStatic
+        @AfterAll
+        fun afterAll(redis: Redis, redisCluster: RedisShardedCluster) {
+            // no @Test methods will be executed after this method, so assertions are put here instead
+            thenParamIsCorrectlyResolved(redis)
+            thenParamIsCorrectlyResolved(redisCluster)
+        }
+
+        private fun thenParamIsCorrectlyResolved(param: Any?) {
+            Assertions.assertThat(param).isNotNull.isEqualTo(RedisStore.server(context!!)!!)
+        }
+    }
+}

src/test/kotlin/io/github/tobi/laa/spring/boot/embedded/redis/shardedcluster/RedisShardedClusterContextCustomizerTest.kt

@@ -41,8 +41,8 @@ internal class RedisShardedClusterContextCustomizerTest {
     @Test
     @DisplayName("Closing ApplicationContext should stop Redis server and Redis client")
     fun closingApplicationContext_shouldStopRedisServerAndRedisClient() {
-        var server: Redis? = null
-        var client: UnifiedJedis? = null
+        var server: Redis?
+        var client: UnifiedJedis?
         AnnotationConfigApplicationContext().use {
             RedisShardedClusterContextCustomizerFactory()
                 .createContextCustomizer(AnnotatedClass::class.java, mutableListOf())