Merge pull request #13 from asarkar/issue-12

Fix issue-12: Parameter injection of Resources does not clean up

Author: asarkar

build.gradle.kts

@@ -138,3 +138,11 @@ nexusPublishing {
         }
     }
 }
+
+tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+        showStandardStreams = true
+    }
+    exclude("**/ignore/**")
+}

gradle.properties

@@ -10,7 +10,7 @@ ktlintVersion=10.2.1
 nexusPluginVersion=1.1.0
 
 projectGroup=com.asarkar.grpc
-projectVersion=1.2.1
+projectVersion=1.2.2
 projectDescription=JUnit5 Extension that can automatically release gRPC resources at the end of the test
 licenseName=Apache-2.0
 licenseUrl=http://www.apache.org/licenses/LICENSE-2.0.txt

src/main/kotlin/com/asarkar/grpc/test/GrpcCleanupExtension.kt

@@ -70,7 +70,11 @@ class GrpcCleanupExtension :
                     parameterCtx.declaringExecutable.isAnnotationPresent(BeforeAll::class.java)
                 )
 
-        return Resources().also { extensionCtx.resources.getOrPut(once, { mutableListOf() }).add(it) }
+        return Resources().also { resources ->
+            extensionCtx.resources = extensionCtx.resources.also {
+                it.getOrPut(once) { mutableListOf() }.add(resources)
+            }
+        }
     }
 
     override fun beforeAll(ctx: ExtensionContext) {

src/test/kotlin/com/asarkar/grpc/test/GrpcCleanupExtensionIntegrationTests.kt

@@ -1,5 +1,15 @@
 package com.asarkar.grpc.test
 
+import com.asarkar.grpc.test.ignore.ExampleTestCase
+import com.asarkar.grpc.test.ignore.ExampleTestCase10
+import com.asarkar.grpc.test.ignore.ExampleTestCase2
+import com.asarkar.grpc.test.ignore.ExampleTestCase3
+import com.asarkar.grpc.test.ignore.ExampleTestCase4
+import com.asarkar.grpc.test.ignore.ExampleTestCase5
+import com.asarkar.grpc.test.ignore.ExampleTestCase6
+import com.asarkar.grpc.test.ignore.ExampleTestCase7
+import com.asarkar.grpc.test.ignore.ExampleTestCase8
+import com.asarkar.grpc.test.ignore.ExampleTestCase9
 import io.grpc.ManagedChannel
 import io.grpc.Server
 import org.assertj.core.api.Assertions.assertThat

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import io.grpc.ManagedChannel
 import io.grpc.Server
 import org.junit.jupiter.api.Test

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase10.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase10.kt

@@ -1,5 +1,8 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
+import com.asarkar.grpc.test.TestUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase2.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase2.kt

@@ -1,5 +1,8 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
+import com.asarkar.grpc.test.TestUtils
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase3.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase3.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.ExtendWith

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase4.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase4.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase5.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase5.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase6.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase6.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase7.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase7.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.extension.ExtendWith

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase8.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase8.kt

@@ -1,5 +1,7 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 

src/test/kotlin/com/asarkar/grpc/test/ExampleTestCase9.kt src/test/kotlin/com/asarkar/grpc/test/ignore/ExampleTestCase9.kt

@@ -1,5 +1,8 @@
-package com.asarkar.grpc.test
+package com.asarkar.grpc.test.ignore
 
+import com.asarkar.grpc.test.GrpcCleanupExtension
+import com.asarkar.grpc.test.Resources
+import com.asarkar.grpc.test.TestUtils
 import io.grpc.ManagedChannel
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.BeforeAll