Merge pull request #62 from camunda-community-hub/zell-eze-close-client

Close client in test and extension
camunda-community-hub · Nov 19, 2021 · 76d6667 · 76d6667
2 parents 946900f + 38ef902
commit 76d6667
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 21 deletions.
diff --git a/eze/src/test/kotlin/org/camunda/community/eze/EngineClientTest.kt b/eze/src/test/kotlin/org/camunda/community/eze/EngineClientTest.kt
@@ -36,6 +36,7 @@ import java.time.Duration
 class EngineClientTest {
 
     private lateinit var zeebeEngine: ZeebeEngine
+    private lateinit var zeebeClient: ZeebeClient
 
     @BeforeEach
     fun `setup grpc server`() {
@@ -48,12 +49,13 @@ class EngineClientTest {
     @AfterEach
     fun `tear down`() {
         zeebeEngine.stop()
+        zeebeClient.close()
     }
 
     @Test
     fun `should request topology`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         // when
         val topology = zeebeClient
@@ -84,7 +86,7 @@ class EngineClientTest {
     @Test
     fun `should use built in client`() {
         // given
-        val zeebeClient = zeebeEngine.createClient()
+        zeebeClient = zeebeEngine.createClient()
 
         // when
         val topology = zeebeClient
@@ -99,7 +101,7 @@ class EngineClientTest {
     @Test
     fun `should use gateway address to build client`() {
         // given
-        val zeebeClient = ZeebeClient
+        zeebeClient = ZeebeClient
             .newClientBuilder()
             .usePlaintext()
             .gatewayAddress(zeebeEngine.getGatewayAddress())
@@ -119,7 +121,7 @@ class EngineClientTest {
     @Test
     fun `should publish message`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         zeebeClient.newDeployCommand()
             .addProcessModel(Bpmn.createExecutableProcess("process")
@@ -155,7 +157,7 @@ class EngineClientTest {
     @Test
     fun `should deploy process`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         // when
         val deployment = zeebeClient
@@ -185,7 +187,7 @@ class EngineClientTest {
     @Test
     fun `should create instance without variables`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         val deployment = zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -214,7 +216,7 @@ class EngineClientTest {
     @Test
     fun `should reject command`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         // when
         val future = zeebeClient.newCreateInstanceCommand()
@@ -231,7 +233,7 @@ class EngineClientTest {
     @Test
     fun `should create process instance`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         val deployment = zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -261,7 +263,7 @@ class EngineClientTest {
     @Test
     fun `should cancel process instance`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -301,7 +303,7 @@ class EngineClientTest {
     @Test
     fun `should update variables on process instance`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -337,7 +339,7 @@ class EngineClientTest {
     @Test
     fun `should create process instance with result`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         val deployment = zeebeClient
             .newDeployCommand()
@@ -371,7 +373,7 @@ class EngineClientTest {
     @Test
     fun `should activate job`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         val deployment = zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -419,7 +421,7 @@ class EngineClientTest {
     @Test
     fun `should complete job`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         zeebeClient
             .newDeployCommand()
@@ -458,7 +460,7 @@ class EngineClientTest {
     @Test
     fun `should fail job`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -515,7 +517,7 @@ class EngineClientTest {
     @Test
     fun `should throw error on job`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -575,7 +577,7 @@ class EngineClientTest {
     @Test
     fun `should update retries on job`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
         zeebeClient
             .newDeployCommand()
             .addProcessModel(
@@ -631,7 +633,7 @@ class EngineClientTest {
     @Test
     fun `should read process instance records`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         zeebeClient
             .newDeployCommand()
@@ -682,7 +684,7 @@ class EngineClientTest {
     @Test
     fun `should print records`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         zeebeClient
             .newDeployCommand()
@@ -720,7 +722,7 @@ class EngineClientTest {
     @Test
     fun `should increase the time`() {
         // given
-        val zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
+        zeebeClient = ZeebeClient.newClientBuilder().usePlaintext().build()
 
         zeebeClient
             .newDeployCommand()

diff --git a/junit-extension/src/main/kotlin/org/camunda/community/eze/EzeExtension.kt b/junit-extension/src/main/kotlin/org/camunda/community/eze/EzeExtension.kt
@@ -39,7 +39,7 @@ class EzeExtension : BeforeEachCallback, TestWatcher {
     private fun injectFields(context: ExtensionContext, testInstance: Any, testClass: Class<*>) {
         mapOf(
             ZeebeEngine::class to EzeExtensionState::zeebe,
-            ZeebeClient::class to { it.zeebe.createClient() },
+            ZeebeClient::class to { it.zeebeClient },
             ZeebeEngineClock::class to { it.zeebe.clock() },
             RecordStreamSource::class to EzeExtensionState::zeebe
         ).forEach { (fieldType, fieldValue) ->
@@ -85,13 +85,15 @@ class EzeExtension : BeforeEachCallback, TestWatcher {
     }
 
     class EzeExtensionState(val zeebe: ZeebeEngine) : CloseableResource {
+        internal var zeebeClient: ZeebeClient;
         init {
             zeebe.start()
+            zeebeClient = zeebe.createClient()
         }
 
         override fun close() {
+            zeebeClient.close()
             zeebe.stop()
         }
     }
-
 }
diff --git a/pom.xml b/pom.xml
@@ -296,6 +296,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>${plugin.version.surefire}</version>
+        <configuration>
+          <redirectTestOutputToFile>true</redirectTestOutputToFile>
+        </configuration>
       </plugin>
 
       <!-- flaky test extractor plugin -->