hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Merge branch 'master' into port-properties

Browse Source
This commit is contained in:
Clément Fournier
2023-05-26 11:42:11 +02:00
parent f55c01ac1f ffeb9ab608
commit fd0416c85a
393 changed files with 11573 additions and 4966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pmd-test/pom.xml
View File

@@ -58,11 +58,6 @@
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-lambda</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>

30
pmd-test/src/main/java/net/sourceforge/pmd/AbstractRuleSetFactoryTest.java
View File

@@ -136,8 +136,7 @@ public abstract class AbstractRuleSetFactoryTest {
.append(fileName)
.append("/")
.append(rule.getName())
.append(" is missing 'since' attribute")
.append(PMD.EOL);
.append(" is missing 'since' attribute\n");
}
// Is URL valid ?
if (rule.getExternalInfoUrl() == null || "".equalsIgnoreCase(rule.getExternalInfoUrl())) {
@@ -146,10 +145,9 @@ public abstract class AbstractRuleSetFactoryTest {
.append(fileName)
.append("/")
.append(rule.getName())
.append(" is missing 'externalInfoURL' attribute")
.append(PMD.EOL);
.append(" is missing 'externalInfoURL' attribute\n");
} else {
String expectedExternalInfoURL = "https?://pmd.(sourceforge.net|github.io)/.+/pmd_rules_"
String expectedExternalInfoURL = "https://docs.pmd-code.org/.+/pmd_rules_"
+ language.getTerseName() + "_"
+ IOUtil.getFilenameBase(fileName)
+ ".html#"
@@ -165,7 +163,7 @@ public abstract class AbstractRuleSetFactoryTest {
.append(rule.getExternalInfoUrl())
.append("), it should be:")
.append(expectedExternalInfoURL)
.append(PMD.EOL);
.append('\n');
}
}
// Proper class name/packaging?
@@ -182,7 +180,7 @@ public abstract class AbstractRuleSetFactoryTest {
.append(rule.getRuleClass())
.append("), it should be:")
.append(expectedClassName)
.append(PMD.EOL);
.append('\n');
}
// Should not have violation suppress regex property
if (rule.getProperty(Rule.VIOLATION_SUPPRESS_REGEX_DESCRIPTOR).isPresent()) {
@@ -193,13 +191,12 @@ public abstract class AbstractRuleSetFactoryTest {
.append(rule.getName())
.append(" should not have '")
.append(Rule.VIOLATION_SUPPRESS_REGEX_DESCRIPTOR.name())
.append("', this is intended for end user customization only.")
.append(PMD.EOL);
.append("', this is intended for end user customization only.\n");
}
// Should not have violation suppress xpath property
if (rule.getProperty(Rule.VIOLATION_SUPPRESS_XPATH_DESCRIPTOR).isPresent()) {
invalidXPathSuppress++;
messages.append("Rule ").append(fileName).append("/").append(rule.getName()).append(" should not have '").append(Rule.VIOLATION_SUPPRESS_XPATH_DESCRIPTOR.name()).append("', this is intended for end user customization only.").append(PMD.EOL);
messages.append("Rule ").append(fileName).append("/").append(rule.getName()).append(" should not have '").append(Rule.VIOLATION_SUPPRESS_XPATH_DESCRIPTOR.name()).append("', this is intended for end user customization only.").append(System.lineSeparator());
}
}
}
@@ -212,7 +209,7 @@ public abstract class AbstractRuleSetFactoryTest {
+ " are invalid), a class name meeting conventions (" + invalidClassName + " are invalid), no '"
+ Rule.VIOLATION_SUPPRESS_REGEX_DESCRIPTOR.name() + "' property (" + invalidRegexSuppress
+ " are invalid), and no '" + Rule.VIOLATION_SUPPRESS_XPATH_DESCRIPTOR.name() + "' property ("
+ invalidXPathSuppress + " are invalid)" + PMD.EOL + messages);
+ invalidXPathSuppress + " are invalid)\n" + messages);
}
}
@@ -357,10 +354,13 @@ public abstract class AbstractRuleSetFactoryTest {
+ " https://pmd.sourceforge.io/ruleset_\\d_0_0.xsd\"", "");
if (RuleSetWriter.RULESET_2_0_0_NS_URI.equals(rulesetNamespace)) {
file = "<?xml version=\"1.0\"?>" + PMD.EOL + "<!DOCTYPE ruleset SYSTEM "
+ "\"https://pmd.sourceforge.io/ruleset_2_0_0.dtd\">" + PMD.EOL + file;
file = "<?xml version=\"1.0\"?>" + System.lineSeparator()
+ "<!DOCTYPE ruleset SYSTEM \"https://pmd.sourceforge.io/ruleset_2_0_0.dtd\">" + System.lineSeparator()
+ file;
} else {
file = "<?xml version=\"1.0\"?>" + PMD.EOL + "<!DOCTYPE ruleset>" + PMD.EOL + file;
file = "<?xml version=\"1.0\"?>" + System.lineSeparator()
+ "<!DOCTYPE ruleset>" + System.lineSeparator()
+ file;
}
try (InputStream modifiedStream = new ByteArrayInputStream(file.getBytes())) {
@@ -375,7 +375,7 @@ public abstract class AbstractRuleSetFactoryTest {
String line;
while ((line = reader.readLine()) != null) {
buf.append(line);
buf.append(PMD.EOL);
buf.append(System.lineSeparator());
}
return buf.toString();
}

7
pmd-test/src/main/java/net/sourceforge/pmd/testframework/RuleTst.java
View File

@@ -201,8 +201,9 @@ public abstract class RuleTst {
System.out.println(" -> Expected messages: " + test.getExpectedMessages());
System.out.println(" -> Expected line numbers: " + test.getExpectedLineNumbers());
System.out.println();
StringWriter reportOutput = new StringWriter();
TextRenderer renderer = new TextRenderer();
renderer.setWriter(new StringWriter());
renderer.setWriter(reportOutput);
try {
renderer.start();
renderer.renderFileReport(report);
@@ -210,7 +211,7 @@ public abstract class RuleTst {
} catch (IOException e) {
throw new RuntimeException(e);
}
System.out.println(renderer.getWriter().toString());
System.out.println(reportOutput);
System.out.println("--------------------------------------------------------------");
}
@@ -225,7 +226,7 @@ public abstract class RuleTst {
PMDConfiguration configuration = new PMDConfiguration();
configuration.setIgnoreIncrementalAnalysis(true);
configuration.setDefaultLanguageVersion(languageVersion);
configuration.setThreads(1);
configuration.setThreads(0); // don't use separate threads
configuration.prependAuxClasspath(".");
try (PmdAnalysis pmd = PmdAnalysis.create(configuration)) {