Skip to content

Commit

Permalink
Color test results in Gradle output (apache#554)
Browse files Browse the repository at this point in the history
The coloring is enabled by default except on Windows.
It can be configured via `-Pnocolor`, `-Pnocolor=true|false`.
  • Loading branch information
vlsi authored Feb 7, 2020
1 parent 03693f7 commit b7919e6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 29 deletions.
15 changes: 3 additions & 12 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.github.vlsi.gradle.git.dsl.gitignore
import com.github.vlsi.gradle.properties.dsl.lastEditYear
import com.github.vlsi.gradle.properties.dsl.props
import com.github.vlsi.gradle.release.RepositoryType
import com.github.vlsi.gradle.test.dsl.printTestResults
import org.ajoberstar.grgit.Grgit
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
import org.sonarqube.gradle.SonarQubeProperties
Expand All @@ -39,6 +40,7 @@ plugins {
id("com.github.spotbugs")
id("org.sonarqube")
id("com.github.vlsi.crlf")
id("com.github.vlsi.gradle-extensions")
id("com.github.vlsi.ide")
id("com.github.vlsi.stage-vote-release")
publishing
Expand Down Expand Up @@ -523,18 +525,7 @@ allprojects {
passProperty("skip.test_TestDNSCacheManager.testWithCustomResolverAnd1Server")
passProperty("junit.jupiter.execution.parallel.enabled", "true")
passProperty("junit.jupiter.execution.timeout.default", "2 m")
// https://github.com/junit-team/junit5/issues/2041
// Gradle does not print parameterized test names yet :(
afterTest(KotlinClosure2<TestDescriptor, TestResult, Any>({ descriptor, result ->
if (result.resultType != TestResult.ResultType.SUCCESS) {
val test = descriptor as org.gradle.api.internal.tasks.testing.TestDescriptorInternal
val classDisplayName = test.className?.let {
if (it.endsWith(test.classDisplayName)) it else "${test.className} [${test.classDisplayName}]"
} ?: test.classDisplayName
val testDisplayName = if (test.name == test.displayName) test.displayName else "${test.name} [${test.displayName}]"
println("\n$classDisplayName > $testDisplayName: ${result.resultType}")
}
}))
printTestResults()
}
withType<SpotBugsTask>().configureEach {
group = LifecycleBasePlugin.VERIFICATION_GROUP
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ kotlin.parallel.tasks.in.project=true

# Plugins
com.github.autostyle.version=3.0
com.github.vlsi.checksum-dependency.sha512=748480D8C328C7F3D4923C22DDEC796CDDB62207BC851DD2CE10B678F7F98FB6AFDF1CD5AB2F239E8D831D3DD333F340323006123A07231F4E165CC3F0E16B6C
com.github.vlsi.checksum-dependency.version=1.37.0
com.github.vlsi.checksum-dependency.sha512=B9F1FAD15FEFA21686867449544783AD2CDFB7802A6C4F83C0AFB79A5392FEB22FA13D3EA72BC7F762ACE5FD30B603145FAA8466550221B3458E1CAE1ED60C34
com.github.vlsi.checksum-dependency.version=1.60
24 changes: 12 additions & 12 deletions checksum.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,20 @@
<dependency group='com.github.bulenkov.darcula' module='darcula' version='e208efb96f70e4be9dc362fbb46f6e181ef501dd'>
<sha512>80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22</sha512>
</dependency>
<dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.52'>
<sha512>9C5D7C21CFB40356F4B425A6BAED753E6FBC7E6966AA09715F4E5734DD77AEB6F1E0E0810C157288E7E124E535569C4BAE0826FC70A6F5AB8538CCF53AAF7D53</sha512>
<dependency group='com.github.vlsi.gradle' module='crlf-plugin' version='1.60'>
<sha512>C5F190CA8CD8CE97ED8067BFFF082C18D35BE24D7CF75E3D3396DCE644EA04EA7D9A034D1C4591D9045EBD4AA26B3D9136033537D31B0DA808278A001ECCF9DD</sha512>
</dependency>
<dependency group='com.github.vlsi.gradle' module='gradle-extensions-plugin' version='1.52'>
<sha512>342052E5CE7625248D16093C0F2EF5EE2EE5C3294202694E88F529073DE36A2D46851BD2DEB692A2C8560970C066DD3E83B803070844D3C0C30D0A366D81396</sha512>
<dependency group='com.github.vlsi.gradle' module='gradle-extensions-plugin' version='1.60'>
<sha512>909C4B21E328749BE2FF1E2A176050E248A2249AB99F709E394647F5E08A0CCB057CD90BED4F3B30C6DFAF489B734B6E772B3E7D22563A42F255BE759CA92B52</sha512>
</dependency>
<dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.52'>
<sha512>E9B898EDEB23483C537B4F250FA325B9D7AAEF3B479576006026C8AA1C4BF4D6DD5CCE96B05CE638920F70C81E19BCEF36FB4414B150F5AEE79D11F3EF445EB8</sha512>
<dependency group='com.github.vlsi.gradle' module='ide-plugin' version='1.60'>
<sha512>73D737F6E73171B75B47893339695604E7FF1A7B730625B33D65A14998B890A74B84499D2F5248170BEEA0F94754F4C58DDCA27D84254610DDC23F031E489A53</sha512>
</dependency>
<dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.52'>
<sha512>8D0D8E6BB53A26731AB869E69653A94400F3D44077FB4A4898FE8D8988FAC5BF47E0077FAFDCC80BE75906EA4B6209C0C9646874B30C0798C18871391A824DB5</sha512>
<dependency group='com.github.vlsi.gradle' module='license-gather-plugin' version='1.60'>
<sha512>1AC43B2A78CA9994791CFD5011AC9707FB30118C122F4D8946DBA5D9F1058919267984F5EB9340D52FDB460D0F0D93B8D07DE5F9628073ABE72AB908E07F834F</sha512>
</dependency>
<dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.52'>
<sha512>519A9DF63778CA8479C014AE7E6FCF025EF85D5DBF69CF23D54C7E8DB3AD379DC0D79D0F24B42195B190B3008159D750E2206864BBE58F82378C62F80569AD67</sha512>
<dependency group='com.github.vlsi.gradle' module='stage-vote-release-plugin' version='1.60'>
<sha512>4ABAEFA329E49CA8F80E5616DD4A3F32AAD6D88E602CB8DB22C3DDE55CC055C32F4DCF3DE60178D1F74B1DB0F1CD8B39CC172430F9DAAFC46A54C7DC70DD96DF</sha512>
</dependency>
<dependency group='commons-logging' module='commons-logging' version='1.0.4'>
<sha512>C8D2D39A60ADCC49091D393DAF30473D1776E4B6B09BB86639171F660833A17AFBDC9F3E85843093535DA16FA664CD7CD4CA38F54E141018DD1B78DE681AD668</sha512>
Expand All @@ -172,8 +172,8 @@
<dependency group='gradle.plugin.com.github.spotbugs' module='spotbugs-gradle-plugin' version='2.0.0'>
<sha512>B3BFAD07E6A3D4D73CBCE802D8614CF4AC84E589166D243D41028DC077F84C027DF4D514F145360405F37DA73A8F2E7B65D90877A9EE1151174D2440530F9051</sha512>
</dependency>
<dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.5'>
<sha512>4A6B7FA6CD8C6FA82A517C396510E408F1C6FAB5FF6D4C68008F80718F05E5943755AA240F329C95661CCB0231114DD0F6D7C38EFBF73EE6B1ECC70850F40F7E</sha512>
<dependency group='gradle.plugin.org.jetbrains.gradle.plugin.idea-ext' module='gradle-idea-ext' version='0.7'>
<sha512>A85249BA2BB5713B3779B88F3593CA60EA8739860327DAACE205057F811BAA330E772E4DD4B7BC42BBBFA589ACE38210AAFB0CF2919F5691794E6D9C5C505DAD</sha512>
</dependency>
<dependency group='net.jcip' module='jcip-annotations' version='1.0'>
<sha512>CB312B3F571D91EF183C119D878F50464FFD97F853B7311CBA386463F295E8B7B3A5A89ED4269A045CACD5AA7CB4C803D4882854A0FDDEFA9BBC28C72AA6C786</sha512>
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ velocity.version=1.7
# Plugins
com.github.autostyle.version=3.0
com.github.spotbugs.version=2.0.0
com.github.vlsi.checksum-dependency.sha512=993FD75CCCE1618BBE64BB2ED55242836C2B01442AD0AE98DA03CD672EAFF935567921304B6E8705AAE87367FDF7B8FF684C992A45E8008DDB4EF7E73FEA4DAD
com.github.vlsi.checksum-dependency.version=1.46.0
com.github.vlsi.vlsi-release-plugins.version=1.52
com.github.vlsi.checksum-dependency.sha512=B9F1FAD15FEFA21686867449544783AD2CDFB7802A6C4F83C0AFB79A5392FEB22FA13D3EA72BC7F762ACE5FD30B603145FAA8466550221B3458E1CAE1ED60C34
com.github.vlsi.checksum-dependency.version=1.60
com.github.vlsi.vlsi-release-plugins.version=1.60
org.jetbrains.gradle.plugin.idea-ext.version=0.5
org.nosphere.apache.rat.version=0.5.3
org.sonarqube.version=2.7.1
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pluginManagement {
idv("com.github.autostyle")
idv("com.github.spotbugs")
idv("com.github.vlsi.crlf", "com.github.vlsi.vlsi-release-plugins")
idv("com.github.vlsi.gradle-extensions", "com.github.vlsi.vlsi-release-plugins")
idv("com.github.vlsi.ide", "com.github.vlsi.vlsi-release-plugins")
idv("com.github.vlsi.stage-vote-release", "com.github.vlsi.vlsi-release-plugins")
idv("org.jetbrains.gradle.plugin.idea-ext")
Expand Down

0 comments on commit b7919e6

Please sign in to comment.