[SUREFIRE-2101] JUnit5 console reporting: Fall back to class name

If phrased console reporting is active, but no @DisplayName annotation
is set, fall back to using the class name in console output

Author: andpab

maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java

@@ -297,7 +297,7 @@ public Collection<WrappedReportEntry> getReportEntries()
      */
     static String concatenateWithTestGroup( MessageBuilder builder, ReportEntry report, boolean phrasedClassName )
     {
-        if ( phrasedClassName )
+        if ( phrasedClassName && report.getReportNameWithGroup() != null )
         {
             return builder.strong( report.getReportNameWithGroup() )
                     .toString();

maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java

@@ -28,6 +28,7 @@
 
 import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -62,10 +63,27 @@ public void shouldConcatenateWithJUnit5TestGroup()
         when( reportEntry.getReportNameWithGroup() )
                 .thenReturn( "pkg.MyTest (my group)" );
         String actual = TestSetStats.concatenateWithTestGroup( buffer(), reportEntry, true );
-        verify( reportEntry, times( 1 ) ).getReportNameWithGroup();
+        verify( reportEntry, atLeastOnce() ).getReportNameWithGroup();
         verifyNoMoreInteractions( reportEntry );
         String expected = buffer().strong( "pkg.MyTest (my group)" ).toString();
         assertThat( actual )
                 .isEqualTo( expected );
     }
+
+    @Test
+    public void shouldFallBackToTestGroupIfJUnit5TestGroupIsNull()
+    {
+        when( reportEntry.getReportNameWithGroup() )
+            .thenReturn( null );
+        when( reportEntry.getNameWithGroup() )
+            .thenReturn( "pkg.MyTest (my group)" );
+        String actual = TestSetStats.concatenateWithTestGroup( buffer(), reportEntry, true );
+        verify( reportEntry, atLeastOnce() ).getReportNameWithGroup();
+        verify( reportEntry, atLeastOnce() ).getNameWithGroup();
+        verifyNoMoreInteractions( reportEntry );
+        String expected = buffer().a( "pkg." ).strong( "MyTest (my group)" ).toString();
+        assertThat( actual )
+            .isEqualTo( expected );
+    }
+
 }

surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java

@@ -39,6 +39,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.Matchers.matchesRegex;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assume.assumeThat;
 
@@ -366,7 +367,7 @@ public void testJupiterEngineWithExceptionMessage()
     }
 
     @Test
-    public void testJupiterEngineWithDisplayNames()
+    public void testJupiterEngineWithDisplayNames() throws VerificationException
     {
         OutputValidator validator = unpack( "junit-platform-engine-jupiter", "-" + jupiter )
                 .sysProp( "junit5.version", jupiter )
@@ -410,6 +411,12 @@ public void testJupiterEngineWithDisplayNames()
                         + "classname=\"junitplatformenginejupiter.BasicJupiterTest\"" )
                 .assertContainsText( "<testcase name=\"add(int, int, int) 1 + 100 = 101\" "
                         + "classname=\"junitplatformenginejupiter.BasicJupiterTest\"" );
+
+        validator
+            .assertThatLogLine( matchesRegex( ".*Running junitplatformenginejupiter.BasicJupiterTest$" ), is( 1 ) )
+            .assertThatLogLine( matchesRegex( ".*Tests run.* junitplatformenginejupiter.BasicJupiterTest$" ), is( 1 ) )
+            .assertThatLogLine( matchesRegex( ".*Running << . >>$" ), is( 1 ) )
+            .assertThatLogLine( matchesRegex( ".*Tests run.* << . >>$" ), is( 1 ) );
     }
 
     @Test