From 04d6b21dfbbd24aec57241619b9e3d2d8d48a1df Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 17 Jan 2020 11:40:16 +0000
Subject: [PATCH] Sort test failures before logging them

See gh-19696
---
 .../boot/build/testing/TestFailuresPlugin.java           | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/boot/build/testing/TestFailuresPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/testing/TestFailuresPlugin.java
index e20d06c8fae..01081706c5a 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/testing/TestFailuresPlugin.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/testing/TestFailuresPlugin.java
@@ -17,6 +17,7 @@
 package org.springframework.boot.build.testing;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -69,6 +70,7 @@ public class TestFailuresPlugin implements Plugin<Project> {
 		@Override
 		public void afterSuite(TestDescriptor descriptor, TestResult result) {
 			if (!this.failures.isEmpty()) {
+				Collections.sort(this.failures);
 				this.testResults.addFailures(this.test, this.failures);
 			}
 		}
@@ -76,7 +78,7 @@ public class TestFailuresPlugin implements Plugin<Project> {
 		@Override
 		public void afterTest(TestDescriptor descriptor, TestResult result) {
 			if (result.getFailedTestCount() > 0) {
-				this.failures.add(new TestFailure(descriptor, result.getExceptions()));
+				this.failures.add(new TestFailure(descriptor));
 			}
 		}
 
@@ -96,11 +98,8 @@ public class TestFailuresPlugin implements Plugin<Project> {
 
 		private final TestDescriptor descriptor;
 
-		private final List<Throwable> exceptions;
-
-		private TestFailure(TestDescriptor descriptor, List<Throwable> exceptions) {
+		private TestFailure(TestDescriptor descriptor) {
 			this.descriptor = descriptor;
-			this.exceptions = exceptions;
 		}
 
 		@Override