This is an automated email from the ASF dual-hosted git repository. tibordigana pushed a commit to branch base64 in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/base64 by this push: new d980e61 unit test for mapRunModes() d980e61 is described below commit d980e6143012850f53841dc99f497964584d5f7e Author: tibordigana <tibordig...@apache.org> AuthorDate: Thu Sep 17 14:29:30 2020 +0200 unit test for mapRunModes() --- .../surefire/extensions/EventConsumerThread.java | 2 +- .../extensions/EventConsumerThreadTest.java | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java index 2d3e539..3ed122f 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThread.java @@ -676,7 +676,7 @@ public class EventConsumerThread extends CloseableDaemonThread return map; } - private static Map<Segment, RunMode> mapRunModes() + static Map<Segment, RunMode> mapRunModes() { Map<Segment, RunMode> map = new HashMap<>(); for ( RunMode e : RunMode.values() ) diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThreadTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThreadTest.java index aea0f9b..bfc41e8 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThreadTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/extensions/EventConsumerThreadTest.java @@ -42,8 +42,6 @@ import java.nio.ByteBuffer; import java.nio.CharBuffer; import java.nio.channels.ReadableByteChannel; import java.nio.charset.CharsetDecoder; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; @@ -61,6 +59,7 @@ import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.Se import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.SegmentType.RUN_MODE; import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.SegmentType.STRING_ENCODING; import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.mapEventTypes; +import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.mapRunModes; import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.nextSegmentType; import static org.apache.maven.plugin.surefire.extensions.EventConsumerThread.toEvent; import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING; @@ -430,6 +429,25 @@ public class EventConsumerThreadTest } @Test + public void shouldMapSegmentToEventType() + { + Map<Segment, RunMode> map = mapRunModes(); + + assertThat( map ) + .hasSize( 2 ); + + byte[] stream = "normal-run".getBytes( US_ASCII ); + Segment segment = new Segment( stream, 0, stream.length ); + assertThat( map.get( segment ) ) + .isEqualTo( NORMAL_RUN ); + + stream = "rerun-test-after-failure".getBytes( US_ASCII ); + segment = new Segment( stream, 0, stream.length ); + assertThat( map.get( segment ) ) + .isEqualTo( RERUN_TEST_AFTER_FAILURE ); + } + + @Test public void shouldReadEmptyString() throws Exception { byte[] stream = "\u0000\u0000\u0000\u0000::".getBytes( UTF_8 );