fixup! Introduce Kotlin integration tests

Signed-off-by: Sergey Karpov <[email protected]>

Author: skarpovdev

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils/Retry.kt

@@ -5,6 +5,7 @@ import org.junit.jupiter.api.extension.ExtensionContext
 import org.junit.jupiter.api.extension.InvocationInterceptor
 import org.junit.jupiter.api.extension.InvocationInterceptor.Invocation
 import org.junit.jupiter.api.extension.ReflectiveInvocationContext
+import org.opentest4j.TestAbortedException
 import java.lang.annotation.Inherited
 import java.lang.reflect.AnnotatedElement
 import java.lang.reflect.Method
@@ -46,39 +47,42 @@ class RetryExtension : InvocationInterceptor {
             return
         }
 
-        var attempt = 1
-        var lastError: Throwable? = null
         val maxAttempts = retry.times
         val delay = retry.delayMs
+        var lastError: Throwable? = null
 
-        while (attempt <= maxAttempts) {
-            try {
-                if (attempt > 1) {
-                    println("[Retry] Attempt $attempt/$maxAttempts for ${describeTest(extensionContext)}")
+        for (attempt in 1..maxAttempts) {
+            if (attempt > 1 && delay > 0) {
+                try {
+                    Thread.sleep(delay)
+                } catch (_: InterruptedException) {
+                    Thread.currentThread().interrupt()
+                    break
                 }
-                invocation.proceed()
-                if (attempt > 1) {
-                    println("[Retry] Succeeded on attempt $attempt for ${describeTest(extensionContext)}")
+            }
+
+            try {
+                if (attempt == 1) {
+                    invocation.proceed()
+                } else {
+                    val instance = extensionContext.requiredTestInstance
+                    val testMethod = extensionContext.requiredTestMethod
+                    testMethod.isAccessible = true
+                    testMethod.invoke(instance)
                 }
                 return
             } catch (t: Throwable) {
-                lastError = t
-                if (attempt >= maxAttempts) {
-                    println("[Retry] Giving up after $attempt attempts for ${describeTest(extensionContext)}: ${t.message}")
-                    throw t
-                } else {
-                    println("[Retry] Failure on attempt $attempt for ${describeTest(extensionContext)}: ${t.message}")
-                    if (delay > 0) {
-                        try {
-                            Thread.sleep(delay)
-                        } catch (_: InterruptedException) {
-                        }
-                    }
+                if (t is TestAbortedException) throw t
+                lastError = if (t is java.lang.reflect.InvocationTargetException) t.targetException ?: t else t
+                if (attempt == maxAttempts) {
+                    println("[Retry] Giving up after $attempt attempts for ${describeTest(extensionContext)}: ${lastError.message}")
+                    throw lastError
                 }
+                println("[Retry] Failure on attempt $attempt/${maxAttempts} for ${describeTest(extensionContext)}: ${lastError.message}")
             }
-            attempt++
         }
-        lastError?.let { throw it }
+
+        throw lastError ?: IllegalStateException("Unexpected state in retry logic")
     }
 
     private fun describeTest(ctx: ExtensionContext): String {