Issue #3143: forbid empty return statements and fixed violations

1 files changed, 25 insertions, 26 deletions

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java
index 689d9c88a..f46047964 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/internal/XDocsPagesTest.java
@@ -216,38 +216,37 @@ public class XDocsPagesTest {
     private static void validateCheckstyleXml(String fileName, String code,
             String unserializedSource) throws IOException {
         // can't process non-existent examples, or out of context snippets
-        if (code.contains("com.mycompany") || code.contains("checkstyle-packages")
-                || code.contains("MethodLimit") || code.contains("<suppress ")
-                || code.contains("<import-control ") || unserializedSource.startsWith("<property ")
-                || unserializedSource.startsWith("<taskdef ")) {
-            return;
-        }
-
-        // validate checkstyle structure and contents
-        try {
-            final Properties properties = new Properties();
+        if (!code.contains("com.mycompany") && !code.contains("checkstyle-packages")
+                && !code.contains("MethodLimit") && !code.contains("<suppress ")
+                && !code.contains("<import-control ")
+                && !unserializedSource.startsWith("<property ")
+                && !unserializedSource.startsWith("<taskdef ")) {
+            // validate checkstyle structure and contents
+            try {
+                final Properties properties = new Properties();
 
-            properties.setProperty("checkstyle.header.file",
-                    new File("config/java.header").getCanonicalPath());
+                properties.setProperty("checkstyle.header.file",
+                        new File("config/java.header").getCanonicalPath());
 
-            final PropertiesExpander expander = new PropertiesExpander(properties);
-            final Configuration config = ConfigurationLoader.loadConfiguration(new InputSource(
-                    new StringReader(code)), expander, false);
-            final Checker checker = new Checker();
+                final PropertiesExpander expander = new PropertiesExpander(properties);
+                final Configuration config = ConfigurationLoader.loadConfiguration(new InputSource(
+                        new StringReader(code)), expander, false);
+                final Checker checker = new Checker();
 
-            try {
-                final ClassLoader moduleClassLoader = Checker.class.getClassLoader();
-                checker.setModuleClassLoader(moduleClassLoader);
-                checker.configure(config);
+                try {
+                    final ClassLoader moduleClassLoader = Checker.class.getClassLoader();
+                    checker.setModuleClassLoader(moduleClassLoader);
+                    checker.configure(config);
+                }
+                finally {
+                    checker.destroy();
+                }
             }
-            finally {
-                checker.destroy();
+            catch (CheckstyleException ex) {
+                Assert.fail(fileName + " has invalid Checkstyle xml (" + ex.getMessage() + "): "
+                        + unserializedSource);
             }
         }
-        catch (CheckstyleException ex) {
-            Assert.fail(fileName + " has invalid Checkstyle xml (" + ex.getMessage() + "): "
-                    + unserializedSource);
-        }
     }
 
     @Test