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 2019/07/10 20:25:40 UTC
[maven-surefire] 02/03: fixed unit tests and compilation errors
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
commit 9a52c9375f93b21a392763851a8db89820e72ab8
Author: tibordigana <ti...@apache.org>
AuthorDate: Sun Jul 7 13:24:31 2019 +0200
fixed unit tests and compilation errors
---
.../lazytestprovider/DifferedChannelCommandSender.java | 3 ---
.../lazytestprovider/TestProvidingInputStreamTest.java | 4 ++--
.../maven/surefire/booter/MasterProcessCommand.java | 2 +-
.../booter/spi/DefaultMasterProcessChannelDecoder.java | 17 +++++++++--------
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/DifferedChannelCommandSender.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/DifferedChannelCommandSender.java
index 894c219..4373b9e 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/DifferedChannelCommandSender.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/DifferedChannelCommandSender.java
@@ -35,7 +35,4 @@ public interface DifferedChannelCommandSender
extends NotifiableTestStream, Closeable
{
void setFlushReceiverProvider( FlushReceiverProvider flushReceiverProvider );
-
- @Override
- void close();
}
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStreamTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStreamTest.java
index 30f410c..f7506e4 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStreamTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestProvidingInputStreamTest.java
@@ -20,7 +20,6 @@ package org.apache.maven.plugin.surefire.booterclient.lazytestprovider;
*/
import org.apache.maven.surefire.booter.Command;
-import org.apache.maven.surefire.booter.MasterProcessCommand;
import org.apache.maven.surefire.booter.spi.DefaultMasterProcessChannelDecoder;
import org.apache.maven.surefire.providerapi.MasterProcessChannelDecoder;
import org.junit.Test;
@@ -34,6 +33,7 @@ import java.util.concurrent.FutureTask;
import java.util.concurrent.TimeUnit;
import static org.apache.maven.surefire.booter.MasterProcessCommand.BYE_ACK;
+import static org.apache.maven.surefire.booter.MasterProcessCommand.NOOP;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.*;
@@ -149,7 +149,7 @@ public class TestProvidingInputStreamTest
assertThat( bye.getCommandType(), is( BYE_ACK ) );
Command noop = decoder.decode();
assertThat( noop, is( notNullValue() ) );
- assertThat( noop.getCommandType(), is( MasterProcessCommand.NOOP ) );
+ assertThat( noop.getCommandType(), is( NOOP ) );
}
private static void sleep( long millis )
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
index 61cf05f..d4c24d8 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java
@@ -128,6 +128,6 @@ public enum MasterProcessCommand
.append( MAGIC_NUMBER )
.append( operation );
- return data == null ? s : s.append( ':' ).append( data );
+ return data == null ? s.append( ':' ) : s.append( ':' ).append( data ).append( ':' );
}
}
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/DefaultMasterProcessChannelDecoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/DefaultMasterProcessChannelDecoder.java
index 5c2cbe5..3fdedf2 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/DefaultMasterProcessChannelDecoder.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/spi/DefaultMasterProcessChannelDecoder.java
@@ -83,22 +83,23 @@ public class DefaultMasterProcessChannelDecoder implements MasterProcessChannelD
}
else if ( !frameFinished )
{
- boolean isFinishedFrame = c == ':' && isTokenComplete( tokens ) || c == '\n' || c == '\r';
- if ( isFinishedFrame || c == ':' )
+ boolean isColon = c == ':';
+ if ( isColon || c == '\n' || c == '\r' )
{
tokens.add( frame.toString() );
frame.setLength( 0 );
- if ( isFinishedFrame )
- {
- frameFinished = true;
- frameStarted = false;
- break;
- }
}
else
{
frame.append( c );
}
+ boolean isFinishedFrame = isTokenComplete( tokens );
+ if ( isFinishedFrame )
+ {
+ frameFinished = true;
+ frameStarted = false;
+ break;
+ }
}
boolean removed = removeUnsynchronizedTokens( tokens, logger );