Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return exit code 1 when not all errors are fixed #1868

Merged
merged 3 commits into from
Dec 18, 2023
Merged

Return exit code 1 when not all errors are fixed #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45acaca
Return exit code 1 when not all errors are fixed
nulls Dec 15, 2023
263ae06
updated test to expect 1 at the end
nulls Dec 18, 2023
348c702
Merge remote-tracking branch 'origin/master' into bugfix/exit-code
nulls Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion diktat-api/src/main/kotlin/com/saveourtool/diktat/api/DiktatProcessorListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ interface DiktatProcessorListener {
error: DiktatError,
isCorrected: Boolean
) {
incrementAndGet()
if (!isCorrected) {
incrementAndGet()
}
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.nio.file.Paths

import kotlin.io.path.absolutePathString
import kotlin.system.exitProcess

private val log = KotlinLogging.logger { }

Expand All @@ -39,12 +40,15 @@
)

val diktatRunner = diktatRunnerFactory(diktatRunnerArguments)
when (properties.mode) {
val unfixedErrors = when (properties.mode) {
DiktatMode.CHECK -> diktatRunner.checkAll(diktatRunnerArguments)
DiktatMode.FIX -> diktatRunner.fixAll(diktatRunnerArguments) { updatedFile ->
log.warn {
"Original and formatted content differ, writing to ${updatedFile.absolutePathString()}..."
}
}
}
if (unfixedErrors > 0) {
exitProcess(1)

Check warning on line 52 in diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt

View check run for this annotation

Codecov / codecov/patch

diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt#L52 

Added line #L52 was not covered by tests
}
}
2 changes: 1 addition & 1 deletion diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatCliTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class DiktatCliTest {

val diktatCliProcess = processBuilder.start()
val exitCode = diktatCliProcess.waitFor()
softly.assertThat(exitCode).describedAs("The exit code of Diktat CLI").isZero
softly.assertThat(exitCode).describedAs("The exit code of Diktat CLI").isOne

softly.assertThat(diktatCliLog).isRegularFile

Expand Down
Loading