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 0c5eb25 saved network traffic
0c5eb25 is described below
commit 0c5eb254cc1016e989f40b9062ea4c501d6273cc
Author: tibordigana <[email protected]>
AuthorDate: Thu Apr 4 01:16:29 2019 +0200
saved network traffic
---
.../surefire/junitplatform/RunListenerAdapter.java | 9 ++++++++
.../junitplatform/RunListenerAdapterTest.java | 27 ++++++++++++----------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java
index 3b0f363..29f3eeb 100644
---
a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java
+++
b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java
@@ -23,6 +23,7 @@ import static java.util.Collections.emptyMap;
import static org.apache.maven.surefire.util.internal.ObjectUtils.systemProps;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -161,8 +162,16 @@ final class RunListenerAdapter
String[] classMethodName = toClassMethodName( testIdentifier );
String className = classMethodName[0];
String classText = classMethodName[1];
+ if ( Objects.equals( className, classText ) )
+ {
+ classText = null;
+ }
String methodName = testIdentifier.isTest() ? classMethodName[2] :
null;
String methodText = testIdentifier.isTest() ? classMethodName[3] :
null;
+ if ( Objects.equals( methodName, methodText ) )
+ {
+ methodText = null;
+ }
StackTraceWriter stw =
testExecutionResult == null ? null : toStackTraceWriter(
className, methodName, testExecutionResult );
return new SimpleReportEntry( className, classText, methodName,
methodText,
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 3058f02..e9c53ba 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
@@ -125,7 +125,7 @@ public class RunListenerAdapterTest
assertEquals( MY_TEST_METHOD_NAME, entry.getName() );
assertEquals( MY_TEST_METHOD_NAME + "(String)", entry.getNameText() );
assertEquals( MyTestClass.class.getName(), entry.getSourceName() );
- assertEquals( MyTestClass.class.getName(), entry.getSourceText() );
+ assertNull( entry.getSourceText() );
assertNull( entry.getStackTraceWriter() );
}
@@ -146,13 +146,12 @@ public class RunListenerAdapterTest
adapter.executionStarted( TestIdentifier.from( engine ) );
adapter.executionStarted( TestIdentifier.from( parent ) );
verify( listener )
- .testSetStarting( new SimpleReportEntry( className, className,
null, null ) );
+ .testSetStarting( new SimpleReportEntry( className, null,
null, null ) );
verifyNoMoreInteractions( listener );
adapter.executionStarted( TestIdentifier.from( child ) );
verify( listener )
- .testStarting(
- new SimpleReportEntry( className, className,
MY_TEST_METHOD_NAME, MY_TEST_METHOD_NAME ) );
+ .testStarting( new SimpleReportEntry( className, null,
MY_TEST_METHOD_NAME, null ) );
verifyNoMoreInteractions( listener );
adapter.executionFinished( TestIdentifier.from( child ), successful()
);
@@ -160,8 +159,12 @@ public class RunListenerAdapterTest
verify( listener ).testSucceeded( report.capture() );
assertThat( report.getValue().getSourceName() )
.isEqualTo( className );
+ assertThat( report.getValue().getSourceText() )
+ .isNull();
assertThat( report.getValue().getName() )
.isEqualTo( MY_TEST_METHOD_NAME );
+ assertThat( report.getValue().getNameText() )
+ .isNull();
assertThat( report.getValue().getElapsed() )
.isNotNull();
assertThat( report.getValue().getSystemProperties() )
@@ -318,7 +321,7 @@ public class RunListenerAdapterTest
adapter.executionStarted( TestIdentifier.from( engine ) );
verify( listener )
- .testStarting( new SimpleReportEntry( "engine", "engine",
"engine", "engine" ) );
+ .testStarting( new SimpleReportEntry( "engine", null,
"engine", null ) );
verifyNoMoreInteractions( listener );
adapter.executionFinished( TestIdentifier.from( engine ), successful()
);
@@ -327,12 +330,12 @@ public class RunListenerAdapterTest
assertThat( report.getValue().getSourceName() )
.isEqualTo( "engine" );
assertThat( report.getValue().getSourceText() )
- .isEqualTo( "engine" );
+ .isNull();
assertThat( report.getValue().getName() )
.isEqualTo( "engine" );
assertThat( report.getValue().getNameText() )
- .isEqualTo( "engine" );
- assertThat( report.getValue().getElapsed() )
+ .isNull();
+ assertThat(report.getValue().getElapsed())
.isNotNull();
assertThat( report.getValue().getStackTraceWriter() )
.isNull();
@@ -469,7 +472,7 @@ public class RunListenerAdapterTest
String className = MyTestClass.class.getName();
verify( listener )
- .testSetStarting( new SimpleReportEntry( className, className,
null, null ) );
+ .testSetStarting( new SimpleReportEntry( className, null,
null, null ) );
ArgumentCaptor<SimpleReportEntry> report = ArgumentCaptor.forClass(
SimpleReportEntry.class );
verify( listener )
@@ -478,7 +481,7 @@ public class RunListenerAdapterTest
assertThat( report.getValue().getSourceName() )
.isEqualTo( className );
assertThat( report.getValue().getSourceText() )
- .isEqualTo( className );
+ .isNull();
assertThat( report.getValue().getName() )
.isNull();
assertThat( report.getValue().getNameText() )
@@ -513,7 +516,7 @@ public class RunListenerAdapterTest
ArgumentCaptor<ReportEntry> entryCaptor = ArgumentCaptor.forClass(
ReportEntry.class );
verify( listener ).testStarting( entryCaptor.capture() );
assertEquals( parentDisplay, entryCaptor.getValue().getSourceName() );
- assertEquals( parentDisplay, entryCaptor.getValue().getSourceText() );
+ assertNull(entryCaptor.getValue().getSourceText());
assertNull( entryCaptor.getValue().getName() );
assertNull( entryCaptor.getValue().getNameText() );
}
@@ -574,7 +577,7 @@ public class RunListenerAdapterTest
ReportEntry value = entryCaptor.getValue();
assertEquals( MyTestClass.class.getName(), value.getSourceName() );
- assertEquals( MyTestClass.class.getName(), value.getSourceText() );
+ assertNull(value.getSourceText());
assertEquals( "myNamedTestMethod", value.getName() );
assertEquals( "some display name", value.getNameText() );
}
