Skip to content

Commit

Permalink
[java] EmptyControlStatementRule - fix messages
Browse files Browse the repository at this point in the history
  • Loading branch information
@adangel
adangel committed May 27, 2022
1 parent 02581bc commit e41ac3d
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ...src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/EmptyControlStatementRule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public Object visit(ASTTryStatement node, Object data) {
}

if (hasResource && !allResourcesIgnored) {
asCtx(data).addViolationWithMessage(node, "Empty try body - you could rename the resource to 'ignored'");
asCtx(data).addViolationWithMessage(node, "Empty try body - you could rename the resource to ''ignored''");
} else if (!hasResource) {
asCtx(data).addViolationWithMessage(node, "Empty try body");
}
Expand Down
73 changes: 73 additions & 0 deletions ...test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/EmptyControlStatement.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<description>pos, empty try block</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>3</expected-linenumbers>
<expected-messages>
<message>Empty try body</message>
</expected-messages>
<code><![CDATA[
public class EmptyTryBlock1 {
public void foo() {
Expand All @@ -23,6 +26,9 @@
<description>pos, empty try block</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>3</expected-linenumbers>
<expected-messages>
<message>Empty try body</message>
</expected-messages>
<code><![CDATA[
public class EmptyTryBlock2 {
public void foo() {
Expand All @@ -38,6 +44,9 @@
<description>pos, empty finally block</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>5</expected-linenumbers>
<expected-messages>
<message>Empty finally clause</message>
</expected-messages>
<code><![CDATA[
public class EmptyTryBlock2 {
public void foo() {
Expand Down Expand Up @@ -68,6 +77,10 @@
<test-code>
<description>pos, empty try and finally block</description>
<expected-problems>2</expected-problems>
<expected-messages>
<message>Empty try body</message>
<message>Empty finally clause</message>
</expected-messages>
<code><![CDATA[
public class EmptyTryBlock3 {
public void foo() {
Expand All @@ -82,6 +95,9 @@
<test-code>
<description>#432 empty try-with-resource - not ok</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty try body - you could rename the resource to 'ignored'</message>
</expected-messages>
<code><![CDATA[
class X {
void method() {
Expand Down Expand Up @@ -113,6 +129,9 @@
<description>empty concise try-with-resource - not ok</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>4</expected-linenumbers>
<expected-messages>
<message>Empty try body - you could rename the resource to 'ignored'</message>
</expected-messages>
<code><![CDATA[
import java.io.InputStream;
class X {
Expand All @@ -127,6 +146,9 @@
<test-code>
<description>pos, empty synchronized stmt</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty synchronized statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
void foo() {
Expand All @@ -151,6 +173,9 @@
<test-code>
<description>pos, empty switch stmt</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty switch statement</message>
</expected-messages>
<code><![CDATA[
public class EmptySwitchStmt1 {
public void bar() {
Expand Down Expand Up @@ -180,6 +205,9 @@
<test-code>
<description>pos, empty block</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty block</message>
</expected-messages>
<code><![CDATA[
public class Foo {
public void bar() {
Expand All @@ -204,6 +232,9 @@
<test-code>
<description>empty initializer failure case (non static)</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty initializer statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
{}
Expand All @@ -214,6 +245,9 @@
<test-code>
<description>empty initializer failure case (static)</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty initializer statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
static {}
Expand All @@ -224,6 +258,9 @@
<test-code>
<description>not an initializer - empty statement block</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty block</message>
</expected-messages>
<code><![CDATA[
public class Foo {
public void bar() {
Expand Down Expand Up @@ -260,6 +297,10 @@
<description>pos, empty for</description>
<expected-problems>2</expected-problems>
<expected-linenumbers>3,5</expected-linenumbers>
<expected-messages>
<message>Empty for statement</message>
<message>Empty for statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
public void bar() {
Expand All @@ -277,6 +318,10 @@
<description>pos, empty do..while</description>
<expected-problems>2</expected-problems>
<expected-linenumbers>4,6</expected-linenumbers>
<expected-messages>
<message>Empty do..while statement</message>
<message>Empty do..while statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
public void bar() {
Expand All @@ -295,6 +340,10 @@
<description>pos, empty foreach</description>
<expected-problems>2</expected-problems>
<expected-linenumbers>6,8</expected-linenumbers>
<expected-messages>
<message>Empty for statement</message>
<message>Empty for statement</message>
</expected-messages>
<code><![CDATA[
import java.util.List;
Expand Down Expand Up @@ -335,6 +384,9 @@
<description>pos, empty while</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>3</expected-linenumbers>
<expected-messages>
<message>Empty while statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
public void bar() {
Expand All @@ -351,6 +403,9 @@
<test-code>
<description>while(true);</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty while statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
public void bar() {
Expand All @@ -364,6 +419,9 @@
<description>one empty if statement</description>
<expected-problems>1</expected-problems>
<expected-linenumbers>3</expected-linenumbers>
<expected-messages>
<message>Empty if statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
void bar(int x) {
Expand All @@ -378,6 +436,10 @@ public class Foo {
<description>empty if with else statement</description>
<expected-problems>2</expected-problems>
<expected-linenumbers>3,4</expected-linenumbers>
<expected-messages>
<message>Empty if statement</message>
<message>Empty else statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
void bar(int x) {
Expand All @@ -393,6 +455,11 @@ public class Foo {
<description>empty if with else and else if statement</description>
<expected-problems>3</expected-problems>
<expected-linenumbers>3,4,5</expected-linenumbers>
<expected-messages>
<message>Empty if statement</message>
<message>Empty if statement</message>
<message>Empty else statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
void bar(int x) {
Expand Down Expand Up @@ -422,6 +489,9 @@ public class Foo {
<test-code>
<description>empty if statement</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty if statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
void bar(int x) {
Expand All @@ -434,6 +504,9 @@ public class Foo {
<test-code>
<description>empty if statement with comment</description>
<expected-problems>1</expected-problems>
<expected-messages>
<message>Empty if statement</message>
</expected-messages>
<code><![CDATA[
public class Foo {
void bar(int x) {
Expand Down

0 comments on commit e41ac3d

Please sign in to comment.