fix issues

Author: IlyaPechersky

qulice-checkstyle/src/main/resources/com/qulice/checkstyle/checks.xml

@@ -104,10 +104,10 @@ OF THE POSSIBILITY OF SUCH DAMAGE.
   Checks that the file is not binary
   -->
   <module name="RegexpMultiline">
-      <property name="format" value=".*[\x00-\x08\x0E-\x1F].*"/>
+      <property name="format" value="[^\x00-\x7F]+"/>
       <property name="fileExtensions" value="java"/>
-      <property name="id" value="BinaryFiles"/>
-      <property name="message" value="Binary files are not allowed"/>
+      <property name="id" value="BinaryContents"/>
+      <property name="message" value="Binary contents are not allowed"/>
   </module>
   <!--
   JavaDoc regexp checks

qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleMetainfoTest.java

@@ -30,37 +30,20 @@
  */
 package com.qulice.checkstyle;
 
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
+import com.qulice.spi.Violation;
+import java.util.Collection;
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 
 /**
  * Test case for file metainfo validation.
  * @since 0.3
  */
-@SuppressWarnings(
-    {
-        "PMD.TooManyMethods", "PMD.AvoidDuplicateLiterals", "PMD.GodClass"
-    }
-)
+@SuppressWarnings("PMD.AvoidDuplicateLiterals")
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-final class CheckstyleMetainfoTest {
-
-    /**
-     * Local Common (JavaHelper pattern) with useful utils to test checkstyle.
-     */
-    private Common common;
-
-    @BeforeAll
-    public void setcommon() {
-        this.common = new Common();
-    }
-
-    @BeforeEach
-    public void setRule() {
-        this.common.updateRule();
-    }
+final class CheckstyleMetainfoTest extends CheckstyleTestBase {
 
     /**
      * CheckstyleValidator can deny binary contents in java file.
@@ -69,6 +52,19 @@ public void setRule() {
      */
     @Test
     void rejectsJavaFileWithBinaryContent() throws Exception {
-        this.common.runValidation("JavaFileWithBinaryContent.java", false);
+        final String message =
+            "Binary contents are not allowed";
+        final String file = "JavaFileWithBinaryContent.java";
+        final String name = "RegexpMultilineCheck";
+        final Collection<Violation> results = runValidation(file, false);
+        MatcherAssert.assertThat(
+            "Two violations with binary contents shoud be found",
+            results,
+            Matchers.hasItems(
+                new ViolationMatcher(
+                    message, file, "13", name
+                )
+            )
+        );
     }
 }

qulice-checkstyle/src/test/java/com/qulice/checkstyle/Common.java renamed to qulice-checkstyle/src/test/java/com/qulice/checkstyle/CheckstyleTestBase.java

@@ -41,12 +41,13 @@
 import org.cactoos.text.TextOf;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
+import org.junit.jupiter.api.BeforeEach;
 
 /**
- * Common utils and constants for checkstyle tests.
+ * Base class for checkstyle tests.
  * @since 0.3
  */
-final class Common {
+public class CheckstyleTestBase {
 
     /**
      * Name of property to set to change location of the license.
@@ -64,18 +65,18 @@ final class Common {
     public static final String LICENSE = "Hello.";
 
     /**
-     * Rule for testing.
+     * License rule.
      */
     private License rule;
 
-    public void updateRule() {
+    /**
+     * Method to recet license rule before each test in inherited test classes.
+     */
+    @BeforeEach
+    public void setRule() {
         this.rule = new License();
     }
 
-    public License getRule() {
-        return this.rule;
-    }
-
     /**
      * Validates that checkstyle reported given violation.
      * @param file File to check.
@@ -107,13 +108,13 @@ public void validate(final String file, final boolean result,
     public Collection<Violation> runValidation(final String file,
         final boolean passes) throws IOException {
         final Environment.Mock mock = new Environment.Mock();
-        final File license = this.getRule().savePackageInfo(
-            new File(mock.basedir(), Common.DIRECTORY)
-        ).withLines(Common.LICENSE)
+        final File license = this.rule.savePackageInfo(
+            new File(mock.basedir(), CheckstyleTestBase.DIRECTORY)
+        ).withLines(CheckstyleTestBase.LICENSE)
             .withEol("\n").file();
         final Environment env = mock.withParam(
-            Common.LICENSE_PROP,
-            Common.toUrl(license)
+            CheckstyleTestBase.LICENSE_PROP,
+            CheckstyleTestBase.toUrl(license)
         )
             .withFile(
                 String.format("src/main/java/foo/%s", file),
@@ -143,12 +144,20 @@ public Collection<Violation> runValidation(final String file,
         return results;
     }
 
+    /**
+     * Method to access the rule from inherited classes.
+     * @return License rule
+     */
+    protected License getRule() {
+        return this.rule;
+    }
+
     /**
      * Convert file name to URL.
      * @param file The file
      * @return The URL
      */
-    private static String toUrl(final File file) {
+    protected static String toUrl(final File file) {
         return String.format("file:%s", file);
     }