Issue checkstyle#6207: Add xpath regression test for EmptyStatement

src/it/java/org/checkstyle/suppressionxpathfilter/XpathRegressionEmptyStatementTest.java

@@ -0,0 +1,77 @@
+////////////////////////////////////////////////////////////////////////////////
+// checkstyle: Checks Java source code for adherence to a set of rules.
+// Copyright (C) 2001-2021 the original author or authors.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+////////////////////////////////////////////////////////////////////////////////
+
+package org.checkstyle.suppressionxpathfilter;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+
+import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
+import com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck;
+
+public class XpathRegressionEmptyStatementTest extends AbstractXpathTestSupport {
+
+    private final String checkName = EmptyStatementCheck.class.getSimpleName();
+
+    @Override
+    protected String getCheckName() {
+        return checkName;
+    }
+
+    @Test
+    public void testForLoopEmptyStatement() throws Exception {
+        final File fileToProcess =
+                new File(getPath("SuppressionXpathRegressionEmptyStatement1.java"));
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(EmptyStatementCheck.class);
+        final String[] expectedViolation = {
+            "5:36: " + getCheckMessage(EmptyStatementCheck.class, EmptyStatementCheck.MSG_KEY),
+        };
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT"
+                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyStatement1']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
+                        + "/SLIST/LITERAL_FOR/EMPTY_STAT"
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+
+    @Test
+    public void testIfBlockEmptyStatement() throws Exception {
+        final File fileToProcess =
+                new File(getPath("SuppressionXpathRegressionEmptyStatement2.java"));
+        final DefaultConfiguration moduleConfig =
+                createModuleConfig(EmptyStatementCheck.class);
+        final String[] expectedViolation = {
+            "6:19: " + getCheckMessage(EmptyStatementCheck.class, EmptyStatementCheck.MSG_KEY),
+        };
+        final List<String> expectedXpathQueries = Collections.singletonList(
+                "/COMPILATION_UNIT"
+                        + "/CLASS_DEF[./IDENT[@text='SuppressionXpathRegressionEmptyStatement2']]"
+                        + "/OBJBLOCK/METHOD_DEF[./IDENT[@text='foo']]"
+                        + "/SLIST/LITERAL_IF/EMPTY_STAT"
+        );
+        runVerifications(moduleConfig, fileToProcess, expectedViolation,
+                expectedXpathQueries);
+    }
+}

src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement1.java

@@ -0,0 +1,7 @@
+package org.checkstyle.suppressionxpathfilter.emptystatement;
+
+public class SuppressionXpathRegressionEmptyStatement1 {
+    public void foo() {
+        for (int i = 0; i < 5; i++); // warn
+    }
+}

src/it/resources/org/checkstyle/suppressionxpathfilter/emptystatement/SuppressionXpathRegressionEmptyStatement2.java

@@ -0,0 +1,8 @@
+package org.checkstyle.suppressionxpathfilter.emptystatement;
+
+public class SuppressionXpathRegressionEmptyStatement2 {
+    public void foo() {
+        int i = 0;
+        if (i > 3); // warn
+    }
+}

src/test/java/com/puppycrawl/tools/checkstyle/internal/XpathRegressionTest.java

@@ -106,7 +106,6 @@ public class XpathRegressionTest extends AbstractModuleTestSupport {
             "DescendantToken",
             "DesignForExtension",
             "EmptyBlock",
-            "EmptyStatement",
             "EqualsAvoidNull",
             "EqualsHashCode",
             "ExecutableStatementCount",