Skip to content

Commit cdfcadc

Browse files
committed
[Tests] Use a value which can be exactly represented as a fp number
So we don't need to use an accuracy modifier.
1 parent 3c6dc47 commit cdfcadc

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

JSONHelperTests/DecimalTests.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import JSONHelper
88

99
class DecimalTests: XCTestCase {
1010
let testInt = 1
11-
let testFloat = Float(1.2)
12-
let testDouble = Double(1.2)
13-
let testDecimal = Decimal(1.2)
14-
let testNSNumber = NSNumber(value: 1.2 as Double)
15-
let testNSDecimalNumber = NSDecimalNumber(value: 1.2 as Double)
16-
let testString = "1.2"
11+
let testFloat = Float(1.5)
12+
let testDouble = Double(1.5)
13+
let testDecimal = Decimal(1.5)
14+
let testNSNumber = NSNumber(value: 1.5 as Double)
15+
let testNSDecimalNumber = NSDecimalNumber(value: 1.5 as Double)
16+
let testString = "1.5"
1717

1818
var value = Decimal(0)
1919

@@ -23,12 +23,12 @@ class DecimalTests: XCTestCase {
2323

2424
func testIntConversion() {
2525
value <-- (testInt as Any)
26-
XCTAssert(Int(NSDecimalNumber(decimal: value)) == testInt)
26+
XCTAssertEqual(Int(NSDecimalNumber(decimal: value)), testInt)
2727
}
2828

2929
func testFloatConversion() {
3030
value <-- (testFloat as Any)
31-
XCTAssert(abs(value - testDecimal) < Decimal(Double(FLT_EPSILON)))
31+
XCTAssertEqual(value, testDecimal)
3232
}
3333

3434
func testDoubleConversion() {

JSONHelperTests/DoubleTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import JSONHelper
88

99
class DoubleTests: XCTestCase {
1010
let testInt = 1
11-
let testFloat = Float(1.2)
12-
let testDouble = Double(1.2)
13-
let testNSNumber = NSNumber(value: 1.2 as Double)
14-
let testNSDecimalNumber = NSDecimalNumber(value: 1.2 as Double)
15-
let testString = "1.2"
11+
let testFloat = Float(1.5)
12+
let testDouble = Double(1.5)
13+
let testNSNumber = NSNumber(value: 1.5 as Double)
14+
let testNSDecimalNumber = NSDecimalNumber(value: 1.5 as Double)
15+
let testString = "1.5"
1616

1717
var value = 0.0
1818

@@ -27,7 +27,7 @@ class DoubleTests: XCTestCase {
2727

2828
func testFloatConversion() {
2929
value <-- (testFloat as Any)
30-
XCTAssertEqualWithAccuracy(value, testDouble, accuracy: Double(FLT_EPSILON))
30+
XCTAssertEqual(value, testDouble)
3131
}
3232

3333
func testDoubleConversion() {

JSONHelperTests/FloatTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import JSONHelper
88

99
class FloatTests: XCTestCase {
1010
let testInt = 1
11-
let testFloat = Float(1.2)
12-
let testDouble = Double(1.2)
13-
let testNSNumber = NSNumber(value: 1.2 as Double)
14-
let testNSDecimalNumber = NSDecimalNumber(value: 1.2 as Double)
15-
let testString = "1.2"
11+
let testFloat = Float(1.5)
12+
let testDouble = Double(1.5)
13+
let testNSNumber = NSNumber(value: 1.5 as Double)
14+
let testNSDecimalNumber = NSDecimalNumber(value: 1.5 as Double)
15+
let testString = "1.5"
1616

1717
var value = Float(0)
1818

@@ -22,7 +22,7 @@ class FloatTests: XCTestCase {
2222

2323
func testIntConversion() {
2424
value <-- (testInt as Any)
25-
XCTAssert(Int(value) == testInt)
25+
XCTAssertEqual(Int(value), testInt)
2626
}
2727

2828
func testFloatConversion() {

0 commit comments

Comments
 (0)