From a5369c60d178b436379e32e146aac24f50aa87cc Mon Sep 17 00:00:00 2001
From: Roman Ivanov <ivanov-jr@mail.ru>
Date: Sat, 30 Jan 2016 06:47:10 -0800
Subject: [PATCH] Issue #2546: fix for build failures for RegexpOnFilenameCheck

---
 config/suppressions.xml                                       | 2 +-
 .../checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/suppressions.xml b/config/suppressions.xml
index 25bc20166..34639cf13 100644
--- a/config/suppressions.xml
+++ b/config/suppressions.xml
@@ -74,7 +74,7 @@
               files="AbstractClassNameCheckTest.java|AbstractTypeAwareCheckTest.java|AbstractJavadocCheckTest.java|AbstractViolationReporterTest.java"/>
 
     <!-- Tone down the checking for test code -->
-    <suppress checks="CyclomaticComplexity" files="[\\/]XDocsPagesTest\.java" lines="299"/>
+    <suppress checks="CyclomaticComplexity" files="[\\/]XDocsPagesTest\.java"/>
     <suppress checks="IllegalCatch" files="[\\/]internal[\\/]\w+Util\.java"/>
     <suppress checks="EmptyBlock" files=".*[\\/]src[\\/]test[\\/]"/>
     <suppress checks="ImportControl" files=".*[\\/]src[\\/](test|it)[\\/]"/>
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java
index fdcf49c02..c59f790fb 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/regexp/RegexpOnFilenameCheckTest.java
@@ -193,7 +193,7 @@ public class RegexpOnFilenameCheckTest extends BaseFileSetCheckTestSupport {
     public void testNotMatchFolderAndFileNotMatchesFolder() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class);
         checkConfig.addAttribute("match", "false");
-        checkConfig.addAttribute("folderPattern", ".*[\\\\/]java[\\\\/].*");
+        checkConfig.addAttribute("folderPattern", ".*[\\\\/]javastrangefolder[\\\\/].*");
         checkConfig.addAttribute("fileNamePattern", ".*\\.dat");
         verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY);
     }
@@ -202,7 +202,7 @@ public class RegexpOnFilenameCheckTest extends BaseFileSetCheckTestSupport {
     public void testNotMatchFolderAndFileNotMatchesFile() throws Exception {
         final DefaultConfiguration checkConfig = createCheckConfig(RegexpOnFilenameCheck.class);
         checkConfig.addAttribute("match", "false");
-        checkConfig.addAttribute("folderPattern", ".*[\\\\/]gov[\\\\/].*");
+        checkConfig.addAttribute("folderPattern", ".*[\\\\/]govstrangefolder[\\\\/].*");
         checkConfig.addAttribute("fileNamePattern", ".*\\.java");
         verify(checkConfig, getPath("InputSemantic.java"), ArrayUtils.EMPTY_STRING_ARRAY);
     }