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

Fixed bug; thx to Luis Alberto Domínguez Ruiz for the report

Browse Source 
git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@2533 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Tom Copeland
2004-02-02 21:11:02 +00:00
parent 56a339de2f
commit 5b81acab07
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pmd/regress/test/net/sourceforge/pmd/rules/IfElseStmtsMustUseBracesRuleTest.java
View File

@ -15,23 +15,26 @@ public class IfElseStmtsMustUseBracesRuleTest extends SimpleAggregatorTst {
public void setUp() {
rule = new XPathRule();
rule.addProperty("xpath", "//IfStatement[count(*) > 2][not(Statement/Block)]");
rule.addProperty("xpath", "//Statement[parent::IfStatement and not(child::Block)]");
}
public void testAll() {
runTests(new TestDescriptor[] {
new TestDescriptor(TEST1, "simple failure case", 1, rule),
new TestDescriptor(TEST1, "else without braces", 1, rule),
new TestDescriptor(TEST2, "ok", 0, rule),
new TestDescriptor(TEST3, "two sets of missing braces", 2, rule),
});
}
private static final String TEST1 =
"public class Foo {" + PMD.EOL +
" int y;" + PMD.EOL +
" public void foo() { " + PMD.EOL +
" if (true) " + PMD.EOL +
" y=2;" + PMD.EOL +
" else " + PMD.EOL +
" x=4;" + PMD.EOL +
" if (true) {" + PMD.EOL +
" x=2;" + PMD.EOL +
" } else " + PMD.EOL +
" y=4;" + PMD.EOL +
" " + PMD.EOL +
" }" + PMD.EOL +
"}";
@ -45,4 +48,15 @@ public class IfElseStmtsMustUseBracesRuleTest extends SimpleAggregatorTst {
" }" + PMD.EOL +
" }" + PMD.EOL +
"}";
private static final String TEST3 =
"public class Foo {" + PMD.EOL +
" public void foo() { " + PMD.EOL +
" if (true) " + PMD.EOL +
" y=2;" + PMD.EOL +
" else " + PMD.EOL +
" x=4;" + PMD.EOL +
" }" + PMD.EOL +
"}";
}

2
pmd/rulesets/braces.xml
View File

@ -71,7 +71,7 @@ The Braces Ruleset contains a collection of braces rules.
<property name="xpath">
<value>
<![CDATA[
//IfStatement[count(*) > 2][not(Statement/Block)]
//Statement[parent::IfStatement and not(child::Block)]
]]>
</value>
</property>

1
pmd/xdocs/credits.xml
View File

@ -38,6 +38,7 @@
</subsection>
<subsection name="Contributors">
<ul>
<li>Luis Alberto Domínguez Ruiz - bug report for IfElseStmtsMustUseBracesRule</li>
<li>Chad Loder - SuspiciousOctalEscapeRule, EmptyStatementNotInLoop, SuspiciousHashcodeMethodName, NonCaseLabelInSwitchStatement, DefaultLabelNotLastInSwitchStmt, NonStaticInitializer, ExplicitCallToFinalize, MethodWithSameNameAsEnclosingClassRuleTest, FinalizeDoesNotCallSuperFinalize, FinalizeOverloaded, FinalizeOnlyCallsSuperFinalize, UnconditionalIfStatement, AvoidDollarSigns, EmptyStaticInitializer, EmptyFinalizerMethod rule, DontImportSun rule, improvements to ASTBooleanLiteral</li>
<li>Maik Schreiber - AccessNode bug report, other bug reports</li>
<li>Lokesh Gupta - improvements to the AST viewer</li>