Add option to show simple names

Author: radarsh

README.md

@@ -59,6 +59,7 @@ testlogger {
     showExceptions true
     slowThreshold 2000
     showSummary true
+    showSimpleNames false
     showPassed true
     showSkipped true
     showFailed true
@@ -164,6 +165,17 @@ testlogger {
 }
 ```
 
+### Show simple names
+
+If you don't like seeing long, fully-qualified class names being used for displaying the test suite names, you can choose to
+show only [simple names](https://docs.oracle.com/javase/8/docs/api/java/lang/Class.html#getSimpleName--) by setting the below flag to true.
+
+```groovy
+testlogger {
+    showSimpleNames true
+}
+```
+
 ### Show standard streams
 
 The display of standard output and error streams alongside the test logs can be controlled using the below configuration.

src/main/groovy/com/adarshr/gradle/testlogger/TestDescriptorWrapper.groovy

@@ -24,12 +24,21 @@ class TestDescriptorWrapper {
 
     @CompileDynamic
     String getClassDisplayName() {
-        escape(testDescriptor.properties.classDisplayName ?: testDescriptor.className)
+        def className = testDescriptor.className
+        def classDisplayName = testDescriptor.properties.classDisplayName as String
+        def useClassDisplayName = classDisplayName && classDisplayName != className && !className.endsWith(classDisplayName)
+
+        if (testLoggerExtension.showSimpleNames) {
+            className = className.substring(className.lastIndexOf('.') + 1)
+            className = className.substring(className.lastIndexOf('$') + 1)
+        }
+
+        escape(useClassDisplayName ? classDisplayName : className)
     }
 
     @CompileDynamic
     String getDisplayName() {
-        escape(testDescriptor.properties.displayName ?: testDescriptor.name)
+        escape(testDescriptor.properties.displayName ?: testDescriptor.name as String)
     }
 
     String getSuiteKey() {

src/main/groovy/com/adarshr/gradle/testlogger/TestLoggerExtension.groovy

@@ -25,6 +25,7 @@ class TestLoggerExtension {
     boolean showPassed = true
     boolean showSkipped = true
     boolean showFailed = true
+    boolean showSimpleNames = false
 
     private final ConsoleOutput consoleType
     private Set<String> configuredProperties = []
@@ -46,6 +47,7 @@ class TestLoggerExtension {
         this.showPassed = source.showPassed
         this.showSkipped = source.showSkipped
         this.showFailed = source.showFailed
+        this.showSimpleNames = source.showSimpleNames
         this.consoleType = source.consoleType
         this.configuredProperties = source.configuredProperties
     }
@@ -118,6 +120,11 @@ class TestLoggerExtension {
         this.configuredProperties << 'showFailed'
     }
 
+    void setShowSimpleNames(boolean showSimpleNames) {
+        this.showSimpleNames = showSimpleNames
+        this.configuredProperties << 'showSimpleNames'
+    }
+
     TestLoggerExtension undecorate() {
         new TestLoggerExtension(this)
     }
@@ -155,6 +162,7 @@ class TestLoggerExtension {
         override(overrides, 'showPassed', Boolean)
         override(overrides, 'showSkipped', Boolean)
         override(overrides, 'showFailed', Boolean)
+        override(overrides, 'showSimpleNames', Boolean)
 
         this
     }

src/test-functional/groovy/com/adarshr/gradle/testlogger/functional/TestLoggerPluginSpec.groovy

@@ -137,7 +137,7 @@ class TestLoggerPluginSpec extends AbstractFunctionalSpec {
         and:
             lines.size() == 10
             lines[0] == render('')
-            lines[1] == render('[erase-ahead,bold]FirstTest[/]')
+            lines[1] == render('[erase-ahead,bold]com.adarshr.test.FirstTest[/]')
             lines[2] == render('')
             lines[3] == render('[erase-ahead,bold]  Test [bold-off]thisTestShouldBeSkipped()[yellow] SKIPPED[/]')
             lines[4] == render('[erase-ahead,bold]  Test [bold-off]this test should fail[red] FAILED[red]')
@@ -162,16 +162,16 @@ class TestLoggerPluginSpec extends AbstractFunctionalSpec {
         and:
             lines.size() == 14
             lines[0] == render('')
-            lines[1] == render('[erase-ahead,bold]NestedTestsetOne[/]')
+            lines[1] == render('[erase-ahead,bold]com.adarshr.test.NestedTest$NestedTestsetThree[/]')
             lines[2] == render('')
-            lines[3] == render('[erase-ahead,bold]  Test [bold-off]secondTestOfNestedTestsetOne()[green] PASSED[/]')
-            lines[4] == render('[erase-ahead,bold]  Test [bold-off]firstTestOfNestedTestsetOne()[green] PASSED[/]')
-            lines[5] == render('')
-            lines[6] == render('[erase-ahead,bold]NestedTestsetThree[/]')
-            lines[7] == render('')
-            lines[8] == render('[erase-ahead,bold]  Test [bold-off]firstTestOfNestedTestsetThree()[green] PASSED[/]')
+            lines[3] == render('[erase-ahead,bold]  Test [bold-off]firstTestOfNestedTestsetThree()[green] PASSED[/]')
+            lines[4] == render('')
+            lines[5] == render('[erase-ahead,bold]com.adarshr.test.NestedTest$NestedTestsetTwo[/]')
+            lines[6] == render('')
+            lines[7] == render('[erase-ahead,bold]  Test [bold-off]secondTestOfNestedTestsetTwo()[green] PASSED[/]')
+            lines[8] == render('[erase-ahead,bold]  Test [bold-off]firstTestOfNestedTestsetTwo()[green] PASSED[/]')
             lines[9] == render('')
-            lines[10] == render('[erase-ahead,bold]NestedTestsetTwo[/]')
+            lines[10] == render('[erase-ahead,bold]com.adarshr.test.NestedTest$NestedTestsetOne[/]')
             lines[11] == render('')
             lines[12] == render('[erase-ahead,bold]  Test [bold-off]secondTestOfNestedTestsetOne()[green] PASSED[/]')
             lines[13] == render('[erase-ahead,bold]  Test [bold-off]firstTestOfNestedTestsetOne()[green] PASSED[/]')
@@ -187,6 +187,29 @@ class TestLoggerPluginSpec extends AbstractFunctionalSpec {
             )
         then:
             def lines = getLoggerOutput(result.output).lines
+        and:
+            lines.size() == 8
+            lines[0] == render('')
+            lines[1] == render('[erase-ahead,bold]com.adarshr.test.DeepNestedTest$NestedTestsetLevelOne[/]')
+            lines[2] == render('')
+            lines[3] == render('[erase-ahead,bold]  Test [bold-off]nestedTestsetLevelOne()[green] PASSED[/]')
+            lines[4] == render('')
+            lines[5] == render('[erase-ahead,bold]Nested test set level two[/]')
+            lines[6] == render('')
+            lines[7] == render('[erase-ahead,bold]  Test [bold-off]nestedTestsetLevelTwo()[green] PASSED[/]')
+        and:
+            result.task(":test").outcome == SUCCESS
+    }
+
+    def "log junit5 jupiter engine deep-nested tests when showSimpleNames is true"() {
+        when:
+            def result = run(
+                'sample-junit5-jupiter-deep-nested-tests',
+                'testlogger { showSimpleNames true }',
+                'clean test'
+            )
+        then:
+            def lines = getLoggerOutput(result.output).lines
         and:
             lines.size() == 8
             lines[0] == render('')
@@ -226,6 +249,29 @@ class TestLoggerPluginSpec extends AbstractFunctionalSpec {
             result.task(":test").outcome == FAILED
     }
 
+    def "log spock tests when showSimpleNames is true"() {
+        when:
+            def result = run(
+                'single-spock-test',
+                '''
+                    testlogger { 
+                        theme 'plain' 
+                        showSimpleNames true 
+                    }
+                ''',
+                'clean test'
+            )
+            def lines = getLoggerOutput(result.output).lines
+        then:
+            lines.size() == 4
+            lines[0] == render('')
+            lines[1] == render('SingleSpec')
+            lines[2] == render('')
+            lines[3] == render('  Test this is a single test PASSED')
+        and:
+            result.task(':test').outcome == SUCCESS
+    }
+
     def "do not print empty suites when filtering tests"() {
         when:
             def result = run(

src/test/groovy/com/adarshr/gradle/testlogger/TestDescriptorWrapperSpec.groovy

@@ -2,6 +2,7 @@ package com.adarshr.gradle.testlogger
 
 import org.gradle.api.tasks.testing.TestDescriptor
 import spock.lang.Specification
+import spock.lang.Unroll
 
 
 class TestDescriptorWrapperSpec extends Specification {
@@ -25,6 +26,31 @@ class TestDescriptorWrapperSpec extends Specification {
             wrapper.classDisplayName == 'class display name \\[escaped\\]'
     }
 
+    @Unroll
+    def "classDisplayName is #expected when classDisplayName property = #classDisplayName, className = #className and showSimpleNames = #showSimpleNames"() {
+        given:
+            testDescriptorMock.properties >> [classDisplayName: classDisplayName]
+            testDescriptorMock.className >> className
+        and:
+            testLoggerExtensionMock.showSimpleNames >> showSimpleNames
+        expect:
+            wrapper.classDisplayName == expected
+        where:
+            classDisplayName   | className                  | showSimpleNames | expected
+            'Test'             | 'com.adarshr.Test'         | false           | 'com.adarshr.Test'
+            'A test'           | 'com.adarshr.Test'         | false           | 'A test'
+            ''                 | 'com.adarshr.Test'         | false           | 'com.adarshr.Test'
+            null               | 'com.adarshr.Test'         | false           | 'com.adarshr.Test'
+            'Two'              | 'com.adarshr.Test$One$Two' | false           | 'com.adarshr.Test$One$Two'
+            'com.adarshr.Test' | 'com.adarshr.Test'         | false           | 'com.adarshr.Test'
+            'Test'             | 'com.adarshr.Test'         | true            | 'Test'
+            'A test'           | 'com.adarshr.Test'         | true            | 'A test'
+            ''                 | 'com.adarshr.Test'         | true            | 'Test'
+            null               | 'com.adarshr.Test'         | true            | 'Test'
+            'Two'              | 'com.adarshr.Test$One$Two' | true            | 'Two'
+            'com.adarshr.Test' | 'com.adarshr.Test'         | true            | 'Test'
+    }
+
     def "classDisplayName falls back to className if classDisplayName property is missing"() {
         given:
             testDescriptorMock.properties >> [:]