Skip to content

Commit 113ee73

Browse files
committed
fix
1 parent 065d9c5 commit 113ee73

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatSpotlessPluginTest.groovy

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,19 +132,12 @@ class PalantirJavaFormatSpotlessPluginTest extends IntegrationTestKitSpec {
132132
return classpath.split(File.pathSeparator).collect { new File(it) }
133133
}
134134

135-
private GradlewExecutionResult runGradlewTasksAndFail(String... tasks) {
136-
ProcessBuilder processBuilder = getProcessBuilder(tasks)
137-
Process process = processBuilder.start()
138-
process.waitFor()
139-
GradlewExecutionResult result = new GradlewExecutionResult(process)
140-
assert result.failure
141-
}
142-
143135
private GradlewExecutionResult runGradlewTasks(String... tasks) {
144136
ProcessBuilder processBuilder = getProcessBuilder(tasks)
145137
Process process = processBuilder.start()
146138
process.waitFor()
147-
GradlewExecutionResult result = new GradlewExecutionResult(process)
139+
String output = readAllInput(process.getInputStream())
140+
GradlewExecutionResult result = new GradlewExecutionResult(process.exitValue(), output)
148141
assert result.success
149142
return result
150143
}
@@ -155,10 +148,10 @@ class PalantirJavaFormatSpotlessPluginTest extends IntegrationTestKitSpec {
155148
private final String standardOutput
156149
private final Throwable failure
157150

158-
GradlewExecutionResult(Process process) {
159-
this.success = process.exitValue() == 0
160-
this.standardOutput = readAllInput(process.getInputStream())
161-
this.failure = process.exitValue() != 0 ? new RuntimeException(String.format("Build failed with exitCode %s", process.exitValue())) : null
151+
GradlewExecutionResult(int exitValue, String output) {
152+
this.success = exitValue == 0
153+
this.standardOutput = output
154+
this.failure = exitValue != 0 ? new RuntimeException(String.format("Build failed with exitCode %s", exitValue)) : null
162155
}
163156
}
164157

0 commit comments

Comments
 (0)