Merge pull request #908 from juherr/NaN

Fix Double.NaN assertion

2 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/org/testng/Assert.java b/src/main/java/org/testng/Assert.java
index 6ffcbf12..fe37b4bd 100644
--- a/src/main/java/org/testng/Assert.java
+++ b/src/main/java/org/testng/Assert.java
@@ -217,7 +217,12 @@ public class Assert {
         failNotEquals(actual, expected, message);
       }
     }
-    else if(!(Math.abs(expected - actual) <= delta)) { // Because comparison with NaN always returns false
+    else if (Double.isNaN(expected)) {
+      if (!Double.isNaN(actual)) {
+        failNotEquals(actual, expected, message);
+      }
+    }
+    else if(!(Math.abs(expected - actual) <= delta)) {
       failNotEquals(actual, expected, message);
     }
   }
diff --git a/src/test/java/test/asserttests/AssertTest.java b/src/test/java/test/asserttests/AssertTest.java
index 7a4abfdc..1191d6cc 100644
--- a/src/test/java/test/asserttests/AssertTest.java
+++ b/src/test/java/test/asserttests/AssertTest.java
@@ -148,4 +148,9 @@ public class AssertTest {
       }
     };
   }
+
+  @Test
+  public void doubleNaNAssertion() {
+    Assert.assertEquals(Double.NaN, Double.NaN, 0.0);
+  }
 }