From 052d38200e0986aedd1d685860c3529892093c41 Mon Sep 17 00:00:00 2001 From: Renato Oliveira Date: Thu, 18 Jul 2019 16:24:42 -0300 Subject: [PATCH] Change return code to zero for CPD when the help command is requested through the CLI. --- .../net/sourceforge/pmd/cpd/CPDCommandLineInterface.java | 5 +++-- .../java/net/sourceforge/pmd/it/BinaryDistributionIT.java | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java index 91aaba88df..fef32365df 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/cpd/CPDCommandLineInterface.java @@ -26,8 +26,9 @@ import com.beust.jcommander.ParameterException; public final class CPDCommandLineInterface { private static final Logger LOGGER = Logger.getLogger(CPDCommandLineInterface.class.getName()); - private static final int DUPLICATE_CODE_FOUND = 4; + public static final int NO_ERRORS_STATUS = 0; private static final int ERROR_STATUS = 1; + private static final int DUPLICATE_CODE_FOUND = 4; public static final String NO_EXIT_AFTER_RUN = "net.sourceforge.pmd.cli.noExit"; public static final String STATUS_CODE_PROPERTY = "net.sourceforge.pmd.cli.status"; @@ -66,7 +67,7 @@ public final class CPDCommandLineInterface { if (arguments.isHelp()) { jcommander.usage(); System.out.println(buildUsageText()); - setStatusCodeOrExit(ERROR_STATUS); + setStatusCodeOrExit(NO_ERRORS_STATUS); return; } } catch (ParameterException e) { diff --git a/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java b/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java index 1bf4da9e5a..b6e635437d 100644 --- a/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java +++ b/pmd-dist/src/test/java/net/sourceforge/pmd/it/BinaryDistributionIT.java @@ -111,8 +111,7 @@ public class BinaryDistributionIT { ExecutionResult result; result = CpdExecutor.runCpd(tempDir, "-h"); - - result.assertExecutionResult(1, "Supported languages: [apex, cpp, cs, dart, ecmascript, fortran, go, groovy, java, jsp, kotlin, lua, matlab, objectivec, perl, php, plsql, python, ruby, scala, swift, vf]"); + result.assertExecutionResult(0, "Supported languages: [apex, cpp, cs, dart, ecmascript, fortran, go, groovy, java, jsp, kotlin, lua, matlab, objectivec, perl, php, plsql, python, ruby, scala, swift, vf]"); result = CpdExecutor.runCpd(tempDir, "--minimum-tokens", "10", "--format", "text", "--files", srcDir); result.assertExecutionResult(4, "Found a 10 line (55 tokens) duplication in the following files:");