You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2020/02/15 17:22:13 UTC

[maven-surefire] branch maven2surefire-jvm-communication updated: try with resources in ForkChannelTest

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch maven2surefire-jvm-communication
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/maven2surefire-jvm-communication by this push:
     new 1041a47  try with resources in ForkChannelTest
1041a47 is described below

commit 1041a474183fdcd78a6e354a6e8a66f057c873bb
Author: tibordigana <ti...@apache.org>
AuthorDate: Sat Feb 15 18:22:05 2020 +0100

    try with resources in ForkChannelTest
---
 .../maven/surefire/extensions/ForkChannelTest.java | 63 +++++++++++-----------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
index db68417..4f35684 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
@@ -49,51 +49,54 @@ public class ForkChannelTest
     public void shouldRequestReplyMessagesViaTCP() throws Exception
     {
         ForkNodeFactory factory = new SurefireForkNodeFactory();
-        ForkChannel channel = factory.createForkChannel( 1 );
+        try ( ForkChannel channel = factory.createForkChannel( 1 ) )
+        {
+            assertThat( channel.getForkChannelId() )
+                .isEqualTo( 1 );
 
-        assertThat( channel.getForkChannelId() )
-            .isEqualTo( 1 );
+            assertThat( channel.useStdIn() )
+                .isFalse();
 
-        assertThat( channel.useStdIn() )
-            .isFalse();
+            assertThat( channel.useStdOut() )
+                .isFalse();
 
-        assertThat( channel.useStdOut() )
-            .isFalse();
+            assertThat( channel.getForkNodeConnectionString() )
+                .startsWith( "tcp://127.0.0.1:" )
+                .isNotEqualTo( "tcp://127.0.0.1:" );
 
-        assertThat( channel.getForkNodeConnectionString() )
-            .startsWith( "tcp://127.0.0.1:" )
-            .isNotEqualTo( "tcp://127.0.0.1:" );
+            URI uri = new URI( channel.getForkNodeConnectionString() );
 
-        URI uri = new URI( channel.getForkNodeConnectionString() );
+            assertThat( uri.getPort() )
+                .isPositive();
 
-        assertThat( uri.getPort() )
-            .isPositive();
+            Consumer consumer = new Consumer();
 
-        Consumer consumer = new Consumer();
+            Client client = new Client( uri.getPort() );
+            client.start();
 
-        Client client = new Client( uri.getPort() );
-        client.start();
+            channel.connectToClient();
+            SECONDS.sleep( 3L );
 
-        channel.connectToClient();
-        SECONDS.sleep( 3L );
+            TestLessInputStreamBuilder builder = new TestLessInputStreamBuilder();
+            TestLessInputStream commandReader = builder.build();
+            channel.bindCommandReader( commandReader ).start();
+            channel.bindEventHandler( consumer ).start();
 
-        TestLessInputStreamBuilder builder = new TestLessInputStreamBuilder();
-        TestLessInputStream commandReader = builder.build();
-        channel.bindCommandReader( commandReader ).start();
-        channel.bindEventHandler( consumer ).start();
+            SECONDS.sleep( 3L );
 
-        SECONDS.sleep( 3L );
+            commandReader.noop();
 
-        commandReader.noop();
+            SECONDS.sleep( 3L );
 
-        client.join( TESTCASE_TIMEOUT );
+            client.join( TESTCASE_TIMEOUT );
 
-        assertThat( hasError.get() )
-            .isFalse();
+            assertThat( hasError.get() )
+                .isFalse();
 
-        assertThat( consumer.lines )
-            .hasSize( 1 )
-            .containsOnly( "Hi There!" );
+            assertThat( consumer.lines )
+                .hasSize( 1 )
+                .containsOnly( "Hi There!" );
+        }
     }
 
     private static class Consumer implements StreamConsumer