phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pmd: fix #1081 Regression: CPD skipping all files when using relative paths

Browse Source
This commit is contained in:
Andreas Dangel 2013-04-12 23:02:40 +02:00
parent 89ebc32141
commit f60128b142
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pmd/etc/changelog.txt
View File

@ -1,3 +1,8 @@
????? ??, 2013 - 5.0.4:
Fixed bug 1081: Regression: CPD skipping all files when using relative paths
April 5, 2013 - 5.0.3:
Fixed bug 938: False positive on LooseCoupling for overriding methods

4
pmd/src/main/java/net/sourceforge/pmd/cpd/CPD.java
View File

@ -16,6 +16,8 @@ import java.util.TreeMap;
import net.sourceforge.pmd.util.FileFinder;
import org.apache.commons.io.FilenameUtils;
public class CPD {
private static final int MISSING_FILES = 1;
@ -93,7 +95,7 @@ public class CPD {
current.add(signature);
}
if (!file.getCanonicalPath().equals(file.getAbsolutePath())) {
if (!FilenameUtils.equalsNormalizedOnSystem(file.getAbsoluteFile().getCanonicalPath(), file.getAbsolutePath())) {
System.err.println("Skipping " + file + " since it appears to be a symlink");
return;
}

34
pmd/src/test/java/net/sourceforge/pmd/cpd/CPDTest.java
View File

@ -15,7 +15,6 @@ import org.junit.Test;
public class CPDTest {
private static final String BASE_TEST_RESOURCE_PATH = "src/test/resources/net/sourceforge/pmd/cpd/files/";
private CPD cpd;
@Before
@ -31,9 +30,11 @@ public class CPDTest {
*/
@Test
public void testFileSectionWithBrokenSymlinks() throws Exception {
cpd.setCpdListener(new NoFileAssertListener(0));
NoFileAssertListener listener = new NoFileAssertListener(0);
cpd.setCpdListener(listener);
cpd.add(new File(BASE_TEST_RESOURCE_PATH, "this-is-a-broken-sym-link-for-test"));
listener.verify();
}
/**
@ -42,30 +43,49 @@ public class CPDTest {
*/
@Test
public void testFileAddedAsSymlinkAndReal() throws Exception {
cpd.setCpdListener(new NoFileAssertListener(1));
NoFileAssertListener listener = new NoFileAssertListener(1);
cpd.setCpdListener(listener);
cpd.add(new File(BASE_TEST_RESOURCE_PATH, "real-file.txt"));
cpd.add(new File(BASE_TEST_RESOURCE_PATH, "symlink-for-real-file.txt"));
listener.verify();
}
/**
* Add a file with a relative path - should still be added and not be detected as a sym link.
* @throws Exception any error
*/
@Test
public void testFileAddedWithRelativePath() throws Exception {
NoFileAssertListener listener = new NoFileAssertListener(1);
cpd.setCpdListener(listener);
cpd.add(new File("./" + BASE_TEST_RESOURCE_PATH, "real-file.txt"));
listener.verify();
}
/**
* Simple listener that fails, if to many files were added and not skipped.
*/
private static class NoFileAssertListener implements CPDListener {
private int maximumFilesAllowed;
private int expectedFilesCount;
private int files;
public NoFileAssertListener(int maximumFilesAllowed) {
this.maximumFilesAllowed = maximumFilesAllowed;
public NoFileAssertListener(int expectedFilesCount) {
this.expectedFilesCount = expectedFilesCount;
this.files = 0;
}
public void addedFile(int fileCount, File file) {
files++;
if (files > maximumFilesAllowed) {
if (files > expectedFilesCount) {
Assert.fail("File was added! - " + file);
}
}
public void phaseUpdate(int phase) {
// not needed for this test
}
public void verify() {
Assert.assertEquals("Expected " + expectedFilesCount + " files, but " + files + " have been added.",
expectedFilesCount, files);
}
}
}