UTs coverage of SuppressElement is 100%. #1296

checkstyle · Jul 13, 2015 · 15818b8 · 15818b8
1 parent f2429b8
commit 15818b8
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1232,7 +1232,6 @@
             <regex><pattern>.*.checks.whitespace.WhitespaceAfterCheck</pattern><branchRate>86</branchRate><lineRate>90</lineRate></regex>
 
 
-            <regex><pattern>.*.filters.SuppressElement</pattern><branchRate>82</branchRate><lineRate>88</lineRate></regex>
             <regex><pattern>.*.filters.SuppressionCommentFilter</pattern><branchRate>83</branchRate><lineRate>93</lineRate></regex>
             <regex><pattern>.*.filters.SuppressionCommentFilter\$Tag</pattern><branchRate>96</branchRate><lineRate>94</lineRate></regex>
             <regex><pattern>.*.filters.SuppressionFilter</pattern><branchRate>100</branchRate><lineRate>58</lineRate></regex>

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
@@ -133,8 +133,8 @@ public void setColumns(String columns) {
     /** {@inheritDoc} */
     @Override
     public boolean accept(AuditEvent event) {
-        // file and check match?
-        if (isFileNameAndModuleMatching(event)) {
+        // reject if file or check module mismatch?
+        if (isFileNameAndModuleNotMatching(event)) {
             return true;
         }
 
@@ -149,14 +149,12 @@ public boolean accept(AuditEvent event) {
      * @param event event
      * @return true is matching
      */
-    private boolean isFileNameAndModuleMatching(AuditEvent event) {
+    private boolean isFileNameAndModuleNotMatching(AuditEvent event) {
         return event.getFileName() == null
                 || !fileRegexp.matcher(event.getFileName()).find()
                 || event.getLocalizedMessage() == null
-                || moduleId != null && !moduleId.equals(event
-                        .getModuleId())
-                || checkRegexp != null && !checkRegexp.matcher(
-                        event.getSourceName()).find();
+                || moduleId != null && !moduleId.equals(event.getModuleId())
+                || checkRegexp != null && !checkRegexp.matcher(event.getSourceName()).find();
     }
 
     @Override

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java
@@ -68,6 +68,8 @@ public void testDecideByLine() {
         assertFalse("In range 1-10", filter.accept(ev));
         filter.setLines("1-9, 11");
         assertTrue("Not in 1-9, 11", filter.accept(ev));
+        filter.setLines(null);
+        assertFalse("none", filter.accept(ev));
     }
 
     @Test
@@ -82,6 +84,82 @@ public void testDecideByColumn() {
         assertTrue("Not in 1-9, 1)", filter.accept(ev));
     }
 
+    @Test
+    public void testDecideByFileNameAndModuleMatching_FileNameNull() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, null, this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, null, message);
+        assertTrue(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_MessageNull() {
+        final AuditEvent ev = new AuditEvent(this, "ATest.java", null);
+        assertTrue(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_ModuleNull() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, "MyModule", this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "ATest.java", message);
+        filter.setModuleId(null);
+        assertFalse(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_ModuleEqual() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, "MyModule", this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "ATest.java", message);
+        filter.setModuleId("MyModule");
+        assertFalse(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_ModuleNotEqual() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, "TheirModule", this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "ATest.java", message);
+        filter.setModuleId("MyModule");
+        assertTrue(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_RegExpNotMatch() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, null, this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "T1est", message);
+        assertTrue(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_RegExpMatch() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, null, this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "TestSUFFIX", message);
+        SuppressElement filterWithoutChecks = new SuppressElement("Test");
+        assertFalse(filterWithoutChecks.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_CheckRegExpNotMatch() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, null, this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "ATest.java", message);
+        filter.setChecks("NON_EXISTING_CHECK");
+        assertTrue(filter.accept(ev));
+    }
+
+    @Test
+    public void testDecideByFileNameAndModuleMatching_CheckRegExpMatch() {
+        LocalizedMessage message =
+                new LocalizedMessage(10, 10, "", "", null, null, this.getClass(), null);
+        final AuditEvent ev = new AuditEvent(this, "ATest.java", message);
+        filter.setChecks(this.getClass().getCanonicalName());
+        assertFalse(filter.accept(ev));
+    }
+
     @Test
     public void testEquals() throws PatternSyntaxException {
         final SuppressElement filter2 = new SuppressElement("Test");