From 13f7675b67401ade55f7be87741c8173632e5c04 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 28 May 2016 11:27:22 +0200 Subject: [PATCH] Fixes #1481 no problems found results in blank file instead of empty xml --- .../pmd/cpd/CPDCommandLineInterface.java | 2 +- .../pmd/cpd/CPDCommandLineInterfaceTest.java | 33 +++++++++++++++++++ src/site/markdown/overview/changelog.md | 2 ++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDCommandLineInterfaceTest.java 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 3f33269854..b5ce0c9c6d 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 @@ -86,8 +86,8 @@ public class CPDCommandLineInterface { } cpd.go(); + System.out.println(arguments.getRenderer().render(cpd.getMatches())); if (cpd.getMatches().hasNext()) { - System.out.println(arguments.getRenderer().render(cpd.getMatches())); setStatusCodeOrExit(DUPLICATE_CODE_FOUND); } } diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDCommandLineInterfaceTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDCommandLineInterfaceTest.java new file mode 100644 index 0000000000..513cf8c1ea --- /dev/null +++ b/pmd-core/src/test/java/net/sourceforge/pmd/cpd/CPDCommandLineInterfaceTest.java @@ -0,0 +1,33 @@ +/** + * BSD-style license; for more info see http://pmd.sourceforge.net/license.html + */ + +package net.sourceforge.pmd.cpd; + +import org.junit.Assert; +import org.junit.Rule; +import org.junit.Test; +import org.junit.contrib.java.lang.system.LogMode; +import org.junit.contrib.java.lang.system.RestoreSystemProperties; +import org.junit.contrib.java.lang.system.StandardOutputStreamLog; +import org.junit.rules.TestRule; + +public class CPDCommandLineInterfaceTest { + @Rule + public final TestRule restoreSystemProperties = new RestoreSystemProperties(); + @Rule + public final StandardOutputStreamLog log = new StandardOutputStreamLog(LogMode.LOG_ONLY); + + @Test + public void testEmptyResultRendering() { + System.setProperty(CPDCommandLineInterface.NO_EXIT_AFTER_RUN, "true"); + CPDCommandLineInterface.main(new String[] { + "--minimum-tokens", "340", + "--language", "java", + "--files", "src/test/resources/net/sourceforge/pmd/cpd/files/", + "--format", "xml" + }); + Assert.assertEquals("\n\n", log.getLog()); + } + +} diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md index 7f9ad192cb..83e12d43f5 100644 --- a/src/site/markdown/overview/changelog.md +++ b/src/site/markdown/overview/changelog.md @@ -16,6 +16,8 @@ * java-unusedcode/UnusedLocalVariable * [#1484](https://sourceforge.net/p/pmd/bugs/1484/): UnusedLocalVariable - false positive - parenthesis +* General + * [#1481](https://sourceforge.net/p/pmd/bugs/1481/): no problems found results in blank file instead of empty xml **API Changes:**