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/04/03 22:37:10 UTC
[maven-surefire] branch 1546-1222 updated: covered
ForkedChannelDecoder and ForkedChannelEncoder
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch 1546-1222
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/1546-1222 by this push:
new f2fcae5 covered ForkedChannelDecoder and ForkedChannelEncoder
f2fcae5 is described below
commit f2fcae598437cd03d9252df2fd4581b4e0dd1b0e
Author: tibordigana <ti...@apache.org>
AuthorDate: Thu Apr 4 00:36:43 2019 +0200
covered ForkedChannelDecoder and ForkedChannelEncoder
---
.../surefire/booterclient/output/ForkClient.java | 3 +-
.../booterclient/output/ForkedChannelDecoder.java | 17 ++--
.../booterclient/output/ForkClientTest.java | 100 ++++++++++++++++++-
.../output/ForkedChannelDecoderTest.java | 55 +++++++----
.../surefire/booter/ForkedChannelEncoder.java | 4 +
.../surefire/report/CategorizedReportEntry.java | 17 ++--
.../surefire/booter/ForkedChannelEncoderTest.java | 108 +++++++++++++++------
.../junitplatform/RunListenerAdapterTest.java | 1 -
8 files changed, 234 insertions(+), 71 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index 7e7ab78..f2a934f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -159,7 +159,8 @@ public class ForkClient
public void handle( RunMode runMode, TestSetReportEntry reportEntry )
{
testsInProgress.clear();
- TestSetReportEntry entry = reportEntry( reportEntry.getSourceName(), reportEntry.getName(),
+ TestSetReportEntry entry = reportEntry( reportEntry.getSourceName(), reportEntry.getSourceText(),
+ reportEntry.getName(), reportEntry.getNameText(),
reportEntry.getGroup(), reportEntry.getStackTraceWriter(), reportEntry.getElapsed(),
reportEntry.getMessage(), getTestVmSystemProperties() );
getTestSetReporter().testSetCompleted( entry );
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
index 60ed138..b7950d0 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
@@ -261,16 +261,18 @@ public final class ForkedChannelDecoder
if ( listener != null && encoding != null && mode != null )
{
String sourceName = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
+ String sourceText = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String name = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
+ String nameText = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String group = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String message = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String elapsed = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String traceMessage = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String smartTrimmedStackTrace = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
String stackTrace = tokenizer.hasMoreTokens() ? tokenizer.nextToken() : null;
-
- listener.handle( mode, toReportEntry( encoding, sourceName, name, group, message, elapsed,
- traceMessage, smartTrimmedStackTrace, stackTrace ) );
+ ReportEntry reportEntry = toReportEntry( encoding, sourceName, sourceText, name, nameText,
+ group, message, elapsed, traceMessage, smartTrimmedStackTrace, stackTrace );
+ listener.handle( mode, reportEntry );
}
}
else if ( event.isJvmExitError() )
@@ -294,7 +296,8 @@ public final class ForkedChannelDecoder
static ReportEntry toReportEntry( Charset encoding,
// ReportEntry:
- String encSource, String encName, String encGroup, String encMessage, String encTimeElapsed,
+ String encSource, String encSourceText, String encName, String encNameText,
+ String encGroup, String encMessage, String encTimeElapsed,
// StackTraceWriter:
String encTraceMessage, String encSmartTrimmedStackTrace, String encStackTrace )
throws NumberFormatException
@@ -306,14 +309,16 @@ public final class ForkedChannelDecoder
}
String source = decode( encSource, encoding );
+ String sourceText = decode( encSourceText, encoding );
String name = decode( encName, encoding );
+ String nameText = decode( encNameText, encoding );
String group = decode( encGroup, encoding );
StackTraceWriter stackTraceWriter =
decodeTrace( encoding, encTraceMessage, encSmartTrimmedStackTrace, encStackTrace );
Integer elapsed = decodeToInteger( encTimeElapsed );
String message = decode( encMessage, encoding );
- return reportEntry( source, name, group, stackTraceWriter, elapsed, message,
- Collections.<String, String>emptyMap() );
+ return reportEntry( source, sourceText, name, nameText,
+ group, stackTraceWriter, elapsed, message, Collections.<String, String>emptyMap() );
}
static String decode( String line, Charset encoding )
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
index e4107da..a2405c5 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClientTest.java
@@ -907,8 +907,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:testset-starting:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -939,8 +943,12 @@ public class ForkClientTest
.hasSize( 1 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getMessage() )
@@ -1017,12 +1025,16 @@ public class ForkClientTest
when( reportEntry.getGroup() ).thenReturn( "this group" );
when( reportEntry.getMessage() ).thenReturn( "some test" );
when( reportEntry.getName() ).thenReturn( "my test" );
+ when( reportEntry.getNameText() ).thenReturn( "dn2" );
when( reportEntry.getNameWithGroup() ).thenReturn( "name with group" );
when( reportEntry.getSourceName() ).thenReturn( "pkg.MyTest" );
+ when( reportEntry.getSourceText() ).thenReturn( "dn1" );
when( reportEntry.getStackTraceWriter() ).thenReturn( stackTraceWriter );
String encodedSourceName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceName() ) ) );
+ String encodedSourceText = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceText() ) ) );
String encodedName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getName() ) ) );
+ String encodedNameText = encodeBase64String( toArray( UTF_8.encode( reportEntry.getNameText() ) ) );
String encodedGroup = encodeBase64String( toArray( UTF_8.encode( reportEntry.getGroup() ) ) );
String encodedMessage = encodeBase64String( toArray( UTF_8.encode( reportEntry.getMessage() ) ) );
@@ -1030,8 +1042,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:testset-starting:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + encodedSourceText
+ + ":"
+ encodedName
+ ":"
+ + encodedNameText
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1060,8 +1076,12 @@ public class ForkClientTest
.hasSize( 1 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isEqualTo( "dn1" );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isEqualTo( "dn2" );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getMessage() )
@@ -1153,8 +1173,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:testset-completed:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1181,8 +1205,12 @@ public class ForkClientTest
.hasSize( 1 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getMessage() )
@@ -1274,8 +1302,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1307,8 +1339,12 @@ public class ForkClientTest
.hasSize( 1 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getMessage() )
@@ -1396,7 +1432,7 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
- + ":-:-:-:-:-:-:-" );
+ + ":-:-:-:-:-:-:-:-:-" );
assertThat( client.testsInProgress() )
.hasSize( 1 )
@@ -1405,8 +1441,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-succeeded:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1433,8 +1473,12 @@ public class ForkClientTest
.hasSize( 2 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isNull();
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getName() )
@@ -1530,7 +1574,7 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
- + ":-:-:-:-:-:-:-" );
+ + ":-:-:-:-:-:-:-:-:-" );
assertThat( client.testsInProgress() )
.hasSize( 1 )
@@ -1539,8 +1583,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-failed:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1567,12 +1615,20 @@ public class ForkClientTest
.hasSize( 2 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isNull();
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getMessage() )
@@ -1664,7 +1720,7 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
- + ":-:-:-:-:-:-:-" );
+ + ":-:-:-:-:-:-:-:-:-" );
assertThat( client.testsInProgress() )
.hasSize( 1 )
@@ -1673,8 +1729,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-skipped:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1701,12 +1761,20 @@ public class ForkClientTest
.hasSize( 2 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isNull();
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getNameText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getMessage() )
@@ -1787,9 +1855,11 @@ public class ForkClientTest
when( reportEntry.getName() ).thenReturn( "my test" );
when( reportEntry.getNameWithGroup() ).thenReturn( "name with group" );
when( reportEntry.getSourceName() ).thenReturn( "pkg.MyTest" );
+ when( reportEntry.getSourceText() ).thenReturn( "display name" );
when( reportEntry.getStackTraceWriter() ).thenReturn( stackTraceWriter );
String encodedSourceName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceName() ) ) );
+ String encodedSourceText = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceText() ) ) );
String encodedName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getName() ) ) );
String encodedGroup = encodeBase64String( toArray( UTF_8.encode( reportEntry.getGroup() ) ) );
String encodedMessage = encodeBase64String( toArray( UTF_8.encode( reportEntry.getMessage() ) ) );
@@ -1798,7 +1868,9 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
- + ":-:-:-:-:-:-:-" );
+ + ":"
+ + encodedSourceText
+ + ":-:':-:-:-:-:-:-" );
assertThat( client.testsInProgress() )
.hasSize( 1 )
@@ -1807,8 +1879,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-error:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + encodedSourceText
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1835,10 +1911,14 @@ public class ForkClientTest
.hasSize( 2 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isEqualTo( "display name" );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceText() )
+ .isEqualTo( "display name" );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getName() )
.isEqualTo( "my test" );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getElapsed() )
@@ -1919,12 +1999,14 @@ public class ForkClientTest
when( reportEntry.getGroup() ).thenReturn( "this group" );
when( reportEntry.getMessage() ).thenReturn( "some test" );
when( reportEntry.getName() ).thenReturn( "my test" );
+ when( reportEntry.getNameText() ).thenReturn("display name");
when( reportEntry.getNameWithGroup() ).thenReturn( "name with group" );
when( reportEntry.getSourceName() ).thenReturn( "pkg.MyTest" );
when( reportEntry.getStackTraceWriter() ).thenReturn( stackTraceWriter );
String encodedSourceName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceName() ) ) );
String encodedName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getName() ) ) );
+ String encodedText = encodeBase64String( toArray( UTF_8.encode( reportEntry.getNameText() ) ) );
String encodedGroup = encodeBase64String( toArray( UTF_8.encode( reportEntry.getGroup() ) ) );
String encodedMessage = encodeBase64String( toArray( UTF_8.encode( reportEntry.getMessage() ) ) );
@@ -1932,7 +2014,7 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
- + ":-:-:-:-:-:-:-" );
+ + ":-:-:-:-:-:-:-:-:-" );
assertThat( client.testsInProgress() )
.hasSize( 1 )
@@ -1941,8 +2023,12 @@ public class ForkClientTest
client.consumeMultiLineContent( ":maven:surefire:std:out:test-assumption-failure:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + encodedText
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -1969,12 +2055,16 @@ public class ForkClientTest
.hasSize( 2 );
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getSourceText() )
+ .isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 0 ) ).getName() )
.isNull();
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getSourceName() )
.isEqualTo( "pkg.MyTest" );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getName() )
.isEqualTo( "my test" );
+ assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getNameText() )
+ .isEqualTo( "display name" );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getElapsed() )
.isEqualTo( 102 );
assertThat( ( (ReportEntry) receiver.getData().get( 1 ) ).getMessage() )
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoderTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoderTest.java
index 894ec2d..53c3562 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoderTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoderTest.java
@@ -107,22 +107,24 @@ public class ForkedChannelDecoderTest
@Test
public void shouldRecognizeEmptyStream4ReportEntry()
{
- ReportEntry reportEntry = toReportEntry( null, null, "", null, null, "",
+ ReportEntry reportEntry = toReportEntry( null, null, null, "", "", null, null, "",
"", "", null );
assertThat( reportEntry ).isNull();
- reportEntry = toReportEntry( UTF_8, "", "", "", "", "-", "", "", "" );
+ reportEntry = toReportEntry( UTF_8, "", "", "", "", "", "", "-", "", "", "" );
assertThat( reportEntry ).isNotNull();
assertThat( reportEntry.getStackTraceWriter() ).isNull();
assertThat( reportEntry.getSourceName() ).isEmpty();
+ assertThat( reportEntry.getSourceText() ).isEmpty();
assertThat( reportEntry.getName() ).isEmpty();
+ assertThat( reportEntry.getNameText() ).isEmpty();
assertThat( reportEntry.getGroup() ).isEmpty();
assertThat( reportEntry.getNameWithGroup() ).isEmpty();
assertThat( reportEntry.getMessage() ).isEmpty();
assertThat( reportEntry.getElapsed() ).isNull();
rule.expect( NumberFormatException.class );
- toReportEntry( UTF_8, "", "", "", "", "", "", "", "" );
+ toReportEntry( UTF_8, "", "", "", "", "", "", "", "", "", "" );
fail();
}
@@ -153,58 +155,66 @@ public class ForkedChannelDecoderTest
when( reportEntry.getGroup() ).thenReturn( "this group" );
when( reportEntry.getMessage() ).thenReturn( "skipped test" );
when( reportEntry.getName() ).thenReturn( "my test" );
+ when( reportEntry.getNameText() ).thenReturn( "my display name" );
when( reportEntry.getNameWithGroup() ).thenReturn( "name with group" );
when( reportEntry.getSourceName() ).thenReturn( "pkg.MyTest" );
+ when( reportEntry.getSourceText() ).thenReturn( "test class display name" );
when( reportEntry.getStackTraceWriter() ).thenReturn( stackTraceWriter );
String encodedSourceName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceName() ) ) );
+ String encodedSourceText = encodeBase64String( toArray( UTF_8.encode( reportEntry.getSourceText() ) ) );
String encodedName = encodeBase64String( toArray( UTF_8.encode( reportEntry.getName() ) ) );
+ String encodedText = encodeBase64String( toArray( UTF_8.encode( reportEntry.getNameText() ) ) );
String encodedGroup = encodeBase64String( toArray( UTF_8.encode( reportEntry.getGroup() ) ) );
String encodedMessage = encodeBase64String( toArray( UTF_8.encode( reportEntry.getMessage() ) ) );
- ReportEntry decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedName, encodedGroup,
- encodedMessage, "-", null, null, null
- );
+ ReportEntry decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedSourceText,
+ encodedName, encodedText, encodedGroup, encodedMessage, "-", null, null, null );
assertThat( decodedReportEntry ).isNotNull();
assertThat( decodedReportEntry.getSourceName() ).isEqualTo( reportEntry.getSourceName() );
+ assertThat( decodedReportEntry.getSourceText() ).isEqualTo( reportEntry.getSourceText() );
assertThat( decodedReportEntry.getName() ).isEqualTo( reportEntry.getName() );
+ assertThat( decodedReportEntry.getNameText() ).isEqualTo(reportEntry.getNameText());
assertThat( decodedReportEntry.getGroup() ).isEqualTo( reportEntry.getGroup() );
assertThat( decodedReportEntry.getMessage() ).isEqualTo( reportEntry.getMessage() );
assertThat( decodedReportEntry.getStackTraceWriter() ).isNull();
- decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedName, encodedGroup, encodedMessage,
- "-", encodedExceptionMsg, encodedSmartStackTrace, null
- );
+ decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedSourceText, encodedName, encodedText,
+ encodedGroup, encodedMessage, "-", encodedExceptionMsg, encodedSmartStackTrace, null );
assertThat( decodedReportEntry ).isNotNull();
assertThat( decodedReportEntry.getSourceName() ).isEqualTo( reportEntry.getSourceName() );
+ assertThat( decodedReportEntry.getSourceText() ).isEqualTo( reportEntry.getSourceText() );
assertThat( decodedReportEntry.getName() ).isEqualTo( reportEntry.getName() );
+ assertThat( decodedReportEntry.getNameText() ).isEqualTo(reportEntry.getNameText());
assertThat( decodedReportEntry.getGroup() ).isEqualTo( reportEntry.getGroup() );
assertThat( decodedReportEntry.getMessage() ).isEqualTo( reportEntry.getMessage() );
assertThat( decodedReportEntry.getElapsed() ).isNull();
assertThat( decodedReportEntry.getStackTraceWriter() ).isNull();
- decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedName, encodedGroup, encodedMessage,
- "1003", encodedExceptionMsg, encodedSmartStackTrace, null
- );
+ decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedSourceText, encodedName, encodedText,
+ encodedGroup, encodedMessage, "1003", encodedExceptionMsg, encodedSmartStackTrace, null );
assertThat( decodedReportEntry ).isNotNull();
assertThat( decodedReportEntry.getSourceName() ).isEqualTo( reportEntry.getSourceName() );
+ assertThat( decodedReportEntry.getSourceText() ).isEqualTo( reportEntry.getSourceText() );
assertThat( decodedReportEntry.getName() ).isEqualTo( reportEntry.getName() );
+ assertThat( decodedReportEntry.getNameText() ).isEqualTo(reportEntry.getNameText());
assertThat( decodedReportEntry.getGroup() ).isEqualTo( reportEntry.getGroup() );
assertThat( decodedReportEntry.getMessage() ).isEqualTo( reportEntry.getMessage() );
assertThat( decodedReportEntry.getElapsed() ).isEqualTo( 1003 );
assertThat( decodedReportEntry.getStackTraceWriter() ).isNull();
- decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedName, encodedGroup, encodedMessage,
- "1003", encodedExceptionMsg, encodedSmartStackTrace,
- encodedStackTrace
- );
+ decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedSourceText, encodedName, encodedText,
+ encodedGroup, encodedMessage, "1003", encodedExceptionMsg, encodedSmartStackTrace,
+ encodedStackTrace );
assertThat( decodedReportEntry ).isNotNull();
assertThat( decodedReportEntry.getSourceName() ).isEqualTo( reportEntry.getSourceName() );
+ assertThat( decodedReportEntry.getSourceText() ).isEqualTo( reportEntry.getSourceText() );
assertThat( decodedReportEntry.getName() ).isEqualTo( reportEntry.getName() );
+ assertThat( decodedReportEntry.getNameText() ).isEqualTo(reportEntry.getNameText());
assertThat( decodedReportEntry.getGroup() ).isEqualTo( reportEntry.getGroup() );
assertThat( decodedReportEntry.getMessage() ).isEqualTo( reportEntry.getMessage() );
assertThat( decodedReportEntry.getElapsed() ).isEqualTo( 1003 );
@@ -217,14 +227,15 @@ public class ForkedChannelDecoderTest
assertThat( decodedReportEntry.getStackTraceWriter().writeTraceToString() ).isEqualTo( stackTrace );
assertThat( decodedReportEntry.getStackTraceWriter().writeTrimmedTraceToString() ).isEqualTo( stackTrace );
- decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedName, encodedGroup, encodedMessage,
- "1003", encodedExceptionMsg, encodedSmartStackTrace,
- encodedTrimmedStackTrace
- );
+ decodedReportEntry = toReportEntry( UTF_8, encodedSourceName, encodedSourceText, encodedName, encodedText,
+ encodedGroup, encodedMessage, "1003", encodedExceptionMsg, encodedSmartStackTrace,
+ encodedTrimmedStackTrace );
assertThat( decodedReportEntry ).isNotNull();
assertThat( decodedReportEntry.getSourceName() ).isEqualTo( reportEntry.getSourceName() );
+ assertThat( decodedReportEntry.getSourceText() ).isEqualTo( reportEntry.getSourceText() );
assertThat( decodedReportEntry.getName() ).isEqualTo( reportEntry.getName() );
+ assertThat( decodedReportEntry.getNameText() ).isEqualTo(reportEntry.getNameText());
assertThat( decodedReportEntry.getGroup() ).isEqualTo( reportEntry.getGroup() );
assertThat( decodedReportEntry.getMessage() ).isEqualTo( reportEntry.getMessage() );
assertThat( decodedReportEntry.getElapsed() ).isEqualTo( 1003 );
@@ -643,8 +654,10 @@ public class ForkedChannelDecoderTest
when( reportEntry.getGroup() ).thenReturn( "this group" );
when( reportEntry.getMessage() ).thenReturn( reportedMessage );
when( reportEntry.getName() ).thenReturn( "my test" );
+ when( reportEntry.getName() ).thenReturn( "display name of test" );
when( reportEntry.getNameWithGroup() ).thenReturn( "name with group" );
when( reportEntry.getSourceName() ).thenReturn( "pkg.MyTest" );
+ when( reportEntry.getSourceText() ).thenReturn("test class display name");
when( reportEntry.getStackTraceWriter() ).thenReturn( stackTraceWriter );
Stream out = Stream.newStream();
@@ -777,7 +790,9 @@ public class ForkedChannelDecoderTest
public void handle( RunMode runMode, ReportEntry reportEntry )
{
assertThat( reportEntry.getSourceName() ).isEqualTo( this.reportEntry.getSourceName() );
+ assertThat( reportEntry.getSourceText() ).isEqualTo( this.reportEntry.getSourceText() );
assertThat( reportEntry.getName() ).isEqualTo( this.reportEntry.getName() );
+ assertThat( reportEntry.getNameText() ).isEqualTo( this.reportEntry.getNameText() );
assertThat( reportEntry.getGroup() ).isEqualTo( this.reportEntry.getGroup() );
assertThat( reportEntry.getMessage() ).isEqualTo( this.reportEntry.getMessage() );
assertThat( reportEntry.getElapsed() ).isEqualTo( this.reportEntry.getElapsed() );
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkedChannelEncoder.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkedChannelEncoder.java
index 9a46fca..f66e137 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkedChannelEncoder.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkedChannelEncoder.java
@@ -328,8 +328,12 @@ public final class ForkedChannelEncoder
.append( ':' )
.append( toBase64( reportEntry.getSourceName() ) )
.append( ':' )
+ .append( toBase64( reportEntry.getSourceText() ) )
+ .append( ':' )
.append( toBase64( reportEntry.getName() ) )
.append( ':' )
+ .append( toBase64( reportEntry.getNameText() ) )
+ .append( ':' )
.append( toBase64( reportEntry.getGroup() ) )
.append( ':' )
.append( toBase64( reportEntry.getMessage() ) )
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java b/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
index 258b15f..b05c386 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/report/CategorizedReportEntry.java
@@ -49,23 +49,28 @@ public class CategorizedReportEntry
public CategorizedReportEntry( String source, String name, String group, StackTraceWriter stackTraceWriter,
Integer elapsed, String message )
{
- this( source, name, group, stackTraceWriter, elapsed, message, Collections.<String, String>emptyMap() );
+ this( source, null, name, null,
+ group, stackTraceWriter, elapsed, message, Collections.<String, String>emptyMap() );
}
- public CategorizedReportEntry( String source, String name, String group, StackTraceWriter stackTraceWriter,
+ public CategorizedReportEntry( String source, String sourceText, String name, String nameText,
+ String group, StackTraceWriter stackTraceWriter,
Integer elapsed, String message, Map<String, String> systemProperties )
{
- super( source, null, name, null, stackTraceWriter, elapsed, message, systemProperties );
+ super( source, sourceText, name, nameText, stackTraceWriter, elapsed, message, systemProperties );
this.group = group;
}
- public static TestSetReportEntry reportEntry( String source, String name, String group,
+ public static TestSetReportEntry reportEntry( String source, String sourceText, String name, String nameText,
+ String group,
StackTraceWriter stackTraceWriter, Integer elapsed, String message,
Map<String, String> systemProperties )
{
return group != null
- ? new CategorizedReportEntry( source, name, group, stackTraceWriter, elapsed, message, systemProperties )
- : new SimpleReportEntry( source, null, name, null, stackTraceWriter, elapsed, message, systemProperties );
+ ? new CategorizedReportEntry( source, sourceText, name, nameText,
+ group, stackTraceWriter, elapsed, message, systemProperties )
+ : new SimpleReportEntry( source, sourceText, name, nameText,
+ stackTraceWriter, elapsed, message, systemProperties );
}
@Override
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkedChannelEncoderTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkedChannelEncoderTest.java
index b9708b0..4429f79 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkedChannelEncoderTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/booter/ForkedChannelEncoderTest.java
@@ -179,43 +179,51 @@ public class ForkedChannelEncoderTest
StringBuilder encode = encode( "X", "normal-run", reportEntry, false );
assertThat( encode.toString() )
.isEqualTo( ":maven:surefire:std:out:X:normal-run:UTF-8:"
- + encodedSourceName
- + ":"
- + encodedName
- + ":"
- + encodedGroup
- + ":"
- + encodedMessage
- + ":"
- + 102
- + ":"
-
- + encodedExceptionMsg
- + ":"
- + encodedSmartStackTrace
- + ":"
- + encodedStackTrace
+ + encodedSourceName
+ + ":"
+ + "-"
+ + ":"
+ + encodedName
+ + ":"
+ + "-"
+ + ":"
+ + encodedGroup
+ + ":"
+ + encodedMessage
+ + ":"
+ + 102
+ + ":"
+
+ + encodedExceptionMsg
+ + ":"
+ + encodedSmartStackTrace
+ + ":"
+ + encodedStackTrace
);
encode = encode( "X", "normal-run", reportEntry, true );
assertThat( encode.toString() )
.isEqualTo( ":maven:surefire:std:out:X:normal-run:UTF-8:"
- + encodedSourceName
- + ":"
- + encodedName
- + ":"
- + encodedGroup
- + ":"
- + encodedMessage
- + ":"
- + 102
- + ":"
-
- + encodedExceptionMsg
- + ":"
- + encodedSmartStackTrace
- + ":"
- + encodedTrimmedStackTrace
+ + encodedSourceName
+ + ":"
+ + "-"
+ + ":"
+ + encodedName
+ + ":"
+ + "-"
+ + ":"
+ + encodedGroup
+ + ":"
+ + encodedMessage
+ + ":"
+ + 102
+ + ":"
+
+ + encodedExceptionMsg
+ + ":"
+ + encodedSmartStackTrace
+ + ":"
+ + encodedTrimmedStackTrace
);
Stream out = Stream.newStream();
@@ -227,8 +235,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:testset-starting:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -253,8 +265,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:testset-starting:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -316,8 +332,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:testset-completed:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -379,8 +399,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:test-starting:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -442,8 +466,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:test-succeeded:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -505,8 +533,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:test-failed:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -567,8 +599,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:test-skipped:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -628,8 +664,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:test-error:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
@@ -687,8 +727,12 @@ public class ForkedChannelEncoderTest
.isEqualTo( ":maven:surefire:std:out:test-assumption-failure:normal-run:UTF-8:"
+ encodedSourceName
+ ":"
+ + "-"
+ + ":"
+ encodedName
+ ":"
+ + "-"
+ + ":"
+ encodedGroup
+ ":"
+ encodedMessage
diff --git a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
index 5af1830..3058f02 100644
--- a/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
+++ b/surefire-providers/surefire-junit-platform/src/test/java/org/apache/maven/surefire/junitplatform/RunListenerAdapterTest.java
@@ -52,7 +52,6 @@ import org.junit.jupiter.engine.descriptor.ClassTestDescriptor;
import org.junit.jupiter.engine.descriptor.TestMethodTestDescriptor;
import org.junit.platform.engine.ConfigurationParameters;
import org.junit.platform.engine.TestDescriptor;
-import org.junit.platform.engine.TestDescriptor.Type;
import org.junit.platform.engine.TestSource;
import org.junit.platform.engine.UniqueId;
import org.junit.platform.engine.support.descriptor.AbstractTestDescriptor;