Fixed numeric precision warnings in the unit tests.

eskroch · eskroch · commit 099e3da9941d · 2016-03-21T20:36:48.000-04:00
diff --git a/framework/Source/CPTMutableNumericDataTests.m b/framework/Source/CPTMutableNumericDataTests.m
@@ -198,7 +198,7 @@ -(void)testConvertTypeConvertsType
 
     const double *doubleSamples = (const double *)dd.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertTrue(samples[i] == doubleSamples[i], @"(float)%g != (double)%g", samples[i], doubleSamples[i]);
+        XCTAssertTrue( (double)samples[i] == doubleSamples[i], @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );
     }
 }
 
diff --git a/framework/Source/CPTMutableNumericDataTypeConversionTests.m b/framework/Source/CPTMutableNumericDataTypeConversionTests.m
@@ -25,7 +25,7 @@ -(void)testFloatToDoubleInPlaceConversion
 
     const double *doubleSamples = (const double *)numericData.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", samples[i], doubleSamples[i] );
+        XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );
     }
 }
 
@@ -46,7 +46,7 @@ -(void)testDoubleToFloatInPlaceConversion
 
     const float *floatSamples = (const float *)numericData.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", floatSamples[i], samples[i] );
+        XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", (double)floatSamples[i], samples[i] );
     }
 }
 
@@ -67,7 +67,7 @@ -(void)testFloatToIntegerInPlaceConversion
 
     const NSInteger *intSamples = (const NSInteger *)numericData.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", samples[i], (long)intSamples[i] );
+        XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", (double)samples[i], (long)intSamples[i] );
     }
 }
 
@@ -88,7 +88,7 @@ -(void)testIntegerToFloatInPlaceConversion
 
     const float *floatSamples = (const float *)numericData.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], precision, @"(float)%g != (NSInteger)%ld", floatSamples[i], (long)samples[i]);
+        XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], (float)precision, @"(float)%g != (NSInteger)%ld", (double)floatSamples[i], (long)samples[i]);
     }
 }
 
diff --git a/framework/Source/CPTNumericDataTests.m b/framework/Source/CPTNumericDataTests.m
@@ -225,7 +225,7 @@ -(void)testConvertTypeConvertsType
 
     const double *doubleSamples = (const double *)dd.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertTrue(samples[i] == doubleSamples[i], @"(float)%g != (double)%g", samples[i], doubleSamples[i]);
+        XCTAssertTrue( (double)samples[i] == doubleSamples[i], @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );
     }
 }
 
diff --git a/framework/Source/CPTNumericDataTypeConversionTests.m b/framework/Source/CPTNumericDataTypeConversionTests.m
@@ -27,7 +27,7 @@ -(void)testFloatToDoubleConversion
 
     const double *doubleSamples = (const double *)dd.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", samples[i], doubleSamples[i] );
+        XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );
     }
 }
 
@@ -50,7 +50,7 @@ -(void)testDoubleToFloatConversion
 
     const float *floatSamples = (const float *)fd.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", floatSamples[i], samples[i] );
+        XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", (double)floatSamples[i], samples[i] );
     }
 }
 
@@ -73,7 +73,7 @@ -(void)testFloatToIntegerConversion
 
     const NSInteger *intSamples = (const NSInteger *)intData.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", samples[i], (long)intSamples[i] );
+        XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", (double)samples[i], (long)intSamples[i] );
     }
 }
 
@@ -96,7 +96,7 @@ -(void)testIntegerToFloatConversion
 
     const float *floatSamples = (const float *)fd.data.bytes;
     for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {
-        XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], precision, @"(float)%g != (NSInteger)%ld", floatSamples[i], (long)samples[i]);
+        XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], (float)precision, @"(float)%g != (NSInteger)%ld", (double)floatSamples[i], (long)samples[i]);
     }
 }
 
diff --git a/framework/Source/CPTUtilitiesTests.m b/framework/Source/CPTUtilitiesTests.m
@@ -82,7 +82,7 @@ -(void)testToDecimalConversion
 
     XCTAssertEqualObjects([NSDecimalNumber decimalNumberWithString:@"100"], [NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromInteger(i)], @"NSInteger to NSDecimal conversion failed");
     XCTAssertEqualObjects([NSDecimalNumber decimalNumberWithString:@"100"], [NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromUnsignedInteger(unsignedI)], @"NSUInteger to NSDecimal conversion failed");
-    XCTAssertEqualWithAccuracy([@(f)floatValue], [[NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromFloat(f)] floatValue], 1.0e-7, @"float to NSDecimal conversion failed");
+    XCTAssertEqualWithAccuracy([@(f)floatValue], [[NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromFloat(f)] floatValue], 1.0e-7f, @"float to NSDecimal conversion failed");
     XCTAssertEqualObjects(@(d), [NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromDouble(d)], @"double to NSDecimal conversion failed.");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ -(void)testConvertTypeConvertsType`
`198`	`198`
`199`	`199`	`const double doubleSamples = (const double )dd.data.bytes;`
`200`	`200`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`201`		`- XCTAssertTrue(samples[i] == doubleSamples[i], @"(float)%g != (double)%g", samples[i], doubleSamples[i]);`
	`201`	`+ XCTAssertTrue( (double)samples[i] == doubleSamples[i], @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );`
`202`	`202`	`}`
`203`	`203`	`}`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ -(void)testFloatToDoubleInPlaceConversion`
`25`	`25`
`26`	`26`	`const double doubleSamples = (const double )numericData.data.bytes;`
`27`	`27`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`28`		`- XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", samples[i], doubleSamples[i] );`
	`28`	`+ XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -46,7 +46,7 @@ -(void)testDoubleToFloatInPlaceConversion`
`46`	`46`
`47`	`47`	`const float floatSamples = (const float )numericData.data.bytes;`
`48`	`48`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`49`		`- XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", floatSamples[i], samples[i] );`
	`49`	`+ XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", (double)floatSamples[i], samples[i] );`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`@@ -67,7 +67,7 @@ -(void)testFloatToIntegerInPlaceConversion`
`67`	`67`
`68`	`68`	`const NSInteger intSamples = (const NSInteger )numericData.data.bytes;`
`69`	`69`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`70`		`- XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", samples[i], (long)intSamples[i] );`
	`70`	`+ XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", (double)samples[i], (long)intSamples[i] );`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`@@ -88,7 +88,7 @@ -(void)testIntegerToFloatInPlaceConversion`
`88`	`88`
`89`	`89`	`const float floatSamples = (const float )numericData.data.bytes;`
`90`	`90`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`91`		`- XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], precision, @"(float)%g != (NSInteger)%ld", floatSamples[i], (long)samples[i]);`
	`91`	`+ XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], (float)precision, @"(float)%g != (NSInteger)%ld", (double)floatSamples[i], (long)samples[i]);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ -(void)testConvertTypeConvertsType`
`225`	`225`
`226`	`226`	`const double doubleSamples = (const double )dd.data.bytes;`
`227`	`227`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`228`		`- XCTAssertTrue(samples[i] == doubleSamples[i], @"(float)%g != (double)%g", samples[i], doubleSamples[i]);`
	`228`	`+ XCTAssertTrue( (double)samples[i] == doubleSamples[i], @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );`
`229`	`229`	`}`
`230`	`230`	`}`
`231`	`231`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ -(void)testFloatToDoubleConversion`
`27`	`27`
`28`	`28`	`const double doubleSamples = (const double )dd.data.bytes;`
`29`	`29`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`30`		`- XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", samples[i], doubleSamples[i] );`
	`30`	`+ XCTAssertEqualWithAccuracy( (double)samples[i], doubleSamples[i], precision, @"(float)%g != (double)%g", (double)samples[i], doubleSamples[i] );`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -50,7 +50,7 @@ -(void)testDoubleToFloatConversion`
`50`	`50`
`51`	`51`	`const float floatSamples = (const float )fd.data.bytes;`
`52`	`52`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`53`		`- XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", floatSamples[i], samples[i] );`
	`53`	`+ XCTAssertEqualWithAccuracy( (double)floatSamples[i], samples[i], precision, @"(float)%g != (double)%g", (double)floatSamples[i], samples[i] );`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`@@ -73,7 +73,7 @@ -(void)testFloatToIntegerConversion`
`73`	`73`
`74`	`74`	`const NSInteger intSamples = (const NSInteger )intData.data.bytes;`
`75`	`75`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`76`		`- XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", samples[i], (long)intSamples[i] );`
	`76`	`+ XCTAssertEqualWithAccuracy( (NSInteger)samples[i], intSamples[i], precision, @"(float)%g != (NSInteger)%ld", (double)samples[i], (long)intSamples[i] );`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`@@ -96,7 +96,7 @@ -(void)testIntegerToFloatConversion`
`96`	`96`
`97`	`97`	`const float floatSamples = (const float )fd.data.bytes;`
`98`	`98`	`for ( NSUInteger i = 0; i < numberOfSamples; i++ ) {`
`99`		`- XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], precision, @"(float)%g != (NSInteger)%ld", floatSamples[i], (long)samples[i]);`
	`99`	`+ XCTAssertEqualWithAccuracy(floatSamples[i], (float)samples[i], (float)precision, @"(float)%g != (NSInteger)%ld", (double)floatSamples[i], (long)samples[i]);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ -(void)testToDecimalConversion`
`82`	`82`
`83`	`83`	`XCTAssertEqualObjects([NSDecimalNumber decimalNumberWithString:@"100"], [NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromInteger(i)], @"NSInteger to NSDecimal conversion failed");`
`84`	`84`	`XCTAssertEqualObjects([NSDecimalNumber decimalNumberWithString:@"100"], [NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromUnsignedInteger(unsignedI)], @"NSUInteger to NSDecimal conversion failed");`
`85`		`- XCTAssertEqualWithAccuracy([@(f)floatValue], [[NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromFloat(f)] floatValue], 1.0e-7, @"float to NSDecimal conversion failed");`
	`85`	`+ XCTAssertEqualWithAccuracy([@(f)floatValue], [[NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromFloat(f)] floatValue], 1.0e-7f, @"float to NSDecimal conversion failed");`
`86`	`86`	`XCTAssertEqualObjects(@(d), [NSDecimalNumber decimalNumberWithDecimal:CPTDecimalFromDouble(d)], @"double to NSDecimal conversion failed.");`
`87`	`87`	`}`
`88`	`88`