(chore) Re-enable Findbugs linting.

TestFX · Dec 3, 2016 · 0f1cbc6 · 0f1cbc6
1 parent f4a9a45
commit 0f1cbc6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -97,7 +97,7 @@ subprojects { subproject ->
     apply(plugin: "java")
 
     apply(from: rootProject.file("gradle/check-checkstyle.gradle"))
-    //apply(from: rootProject.file("gradle/check-findbugs.gradle"))
+    apply(from: rootProject.file("gradle/check-findbugs.gradle"))
     //apply(from: rootProject.file("gradle/check-jdepend.gradle"))
     apply(from: rootProject.file("gradle/check-license.gradle"))
 

diff --git a/gradle/check-findbugs.gradle b/gradle/check-findbugs.gradle
@@ -23,7 +23,7 @@
 apply plugin: "findbugs"
 
 findbugs {
-    toolVersion = "3.0.0"
+    toolVersion = "3.0.1"
     sourceSets = [sourceSets.main]
     ignoreFailures = true
     reportsDir = file("$project.buildDir/reports/findbugs")

diff --git a/subprojects/testfx-core/src/main/java/org/testfx/service/support/impl/PixelMatcherRgb.java b/subprojects/testfx-core/src/main/java/org/testfx/service/support/impl/PixelMatcherRgb.java
@@ -23,6 +23,8 @@
 import org.testfx.service.support.PixelMatcher;
 import org.testfx.util.ColorUtils;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 public class PixelMatcherRgb extends PixelMatcherBase implements PixelMatcher {
 
     //---------------------------------------------------------------------------------------------
@@ -55,6 +57,8 @@ public PixelMatcherRgb(double minColorDistFactor,
     //---------------------------------------------------------------------------------------------
 
     @Override
+    @SuppressFBWarnings(value = "FE_FLOATING_POINT_EQUALITY", justification = "checking for initialized value " +
+            "(not result of computation)")
     public boolean matchColors(Color color0, Color color1) {
         if (minColorDistSq == Double.MIN_VALUE) {
             double maxColorDistSq = ColorUtils.calculateColorDistSq(Color.BLACK, Color.WHITE);

diff --git a/subprojects/testfx-core/testfx-core.gradle b/subprojects/testfx-core/testfx-core.gradle
@@ -20,6 +20,7 @@ ext.pomDescription = "TestFX Core"
 dependencies {
     compile "com.google.guava:guava:20.0"
     compile "org.hamcrest:hamcrest-all:1.3"
+    compile 'com.google.code.findbugs:annotations:3.0.1u2'
 
     testCompile("junit:junit:4.12") {
         exclude group: "org.hamcrest", module: "hamcrest-core"