Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions Tests/NFUnitTestSystemLib/UnitTestDouble.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ public void Equals()
(double)789,
"789",
false)
new DoubleTestData(
(0.0d),
(-0.0d),
true,
"0.0d should be equal to -0.0d")

};

// Floating point numbers should not be tested for equality
Expand All @@ -113,7 +119,8 @@ public void Equals()
{
Assert.AreEqual(
test.Expected,
test.D1.Equals(d2));
test.D1.Equals(d2),
test.AssertMessage);

if (double.IsNaN((double)test.D1) && double.IsNaN(d2))
{
Expand Down Expand Up @@ -158,12 +165,18 @@ private sealed class DoubleTestData
public object D1 { get; }
public object Value { get; }
public bool Expected { get; }
public string AssertMessage { get; }

public DoubleTestData(object d1, object value, bool expected)
public DoubleTestData(
object d1,
object value,
bool expected,
string assertMessage = "")
{
D1 = d1;
Value = value;
Expected = expected;
AssertMessage = assertMessage;
}
}
}
Expand Down
16 changes: 14 additions & 2 deletions Tests/NFUnitTestSystemLib/UnitTestSingle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ public void Equals()
(float)789,
"789",
false),
new SingleTestData(
(0.0F),
(-0.0F),
true,
"0.0F should be equal to -0.0F")
};

// Floating point numbers should not be tested for equality
Expand All @@ -114,7 +119,8 @@ public void Equals()
{
Assert.AreEqual(
test.Expected,
test.F1.Equals(f2));
test.F1.Equals(f2),
test.AssertMessage);

if (float.IsNaN((float)test.F1) && float.IsNaN(f2))
{
Expand Down Expand Up @@ -152,12 +158,18 @@ private sealed class SingleTestData
public object F1 { get; }
public object Value { get; }
public bool Expected { get; }
public string AssertMessage { get; }

public SingleTestData(object f1, object value, bool expected)
public SingleTestData(
object f1,
object value,
bool expected,
string assertMessage = "")
{
F1 = f1;
Value = value;
Expected = expected;
AssertMessage = assertMessage;
}
}
}
Expand Down
Loading