mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Fix TestFailuresPlugin.TestFailure.compareTo()
This commit also polishes around it a bit. See gh-19863
This commit is contained in:
parent
1d396abec5
commit
f670615b40
@ -56,7 +56,7 @@ public class TestFailuresPlugin implements Plugin<Project> {
|
|||||||
|
|
||||||
private final class FailureRecordingTestListener implements TestListener {
|
private final class FailureRecordingTestListener implements TestListener {
|
||||||
|
|
||||||
private List<TestFailure> failures = new ArrayList<>();
|
private final List<TestFailure> failures = new ArrayList<>();
|
||||||
|
|
||||||
private final TestResultsExtension testResults;
|
private final TestResultsExtension testResults;
|
||||||
|
|
||||||
@ -106,7 +106,7 @@ public class TestFailuresPlugin implements Plugin<Project> {
|
|||||||
public int compareTo(TestFailure other) {
|
public int compareTo(TestFailure other) {
|
||||||
int comparison = this.descriptor.getClassName().compareTo(other.descriptor.getClassName());
|
int comparison = this.descriptor.getClassName().compareTo(other.descriptor.getClassName());
|
||||||
if (comparison == 0) {
|
if (comparison == 0) {
|
||||||
comparison = this.descriptor.getName().compareTo(other.descriptor.getClassName());
|
comparison = this.descriptor.getName().compareTo(other.descriptor.getName());
|
||||||
}
|
}
|
||||||
return comparison;
|
return comparison;
|
||||||
}
|
}
|
||||||
|
@ -22,9 +22,9 @@ import java.io.FileWriter;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.gradle.testkit.runner.BuildResult;
|
import org.gradle.testkit.runner.BuildResult;
|
||||||
import org.gradle.testkit.runner.GradleRunner;
|
import org.gradle.testkit.runner.GradleRunner;
|
||||||
@ -169,17 +169,12 @@ class TestFailuresPluginIntegrationTests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private List<String> readLines(String output) {
|
private List<String> readLines(String output) {
|
||||||
List<String> lines = new ArrayList<>();
|
|
||||||
try (BufferedReader reader = new BufferedReader(new StringReader(output))) {
|
try (BufferedReader reader = new BufferedReader(new StringReader(output))) {
|
||||||
String line;
|
return reader.lines().collect(Collectors.toList());
|
||||||
while ((line = reader.readLine()) != null) {
|
|
||||||
lines.add(line);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (IOException ex) {
|
catch (IOException ex) {
|
||||||
throw new RuntimeException(ex);
|
throw new RuntimeException(ex);
|
||||||
}
|
}
|
||||||
return lines;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user