@@ -38,18 +38,16 @@ objCType: @encode(of_range_t)])) TEST(@"-[objCType]", strcmp(value.objCType, @encode(of_range_t)) == 0) TEST(@"-[getValue:size:]", - R([value getValue: &range2 - size: sizeof(of_range_t)]) && + R([value getValue: &range2 size: sizeof(of_range_t)]) && of_range_equal(range2, range)) EXPECT_EXCEPTION(@"-[getValue:size:] with wrong size throws", OFOutOfRangeException, - [value getValue: &range - size: sizeof(of_range_t) - 1]) + [value getValue: &range size: sizeof(of_range_t) - 1]) TEST(@"+[valueWithPointer:]", (value = [OFValue valueWithPointer: pointer])) TEST(@"-[pointerValue]", @@ -84,12 +82,11 @@ objCType: @encode(of_range_t)]) && of_range_equal(value.rangeValue, range)) TEST(@"-[getValue:size:] for OFRangeValue", (value = [OFValue valueWithRange: range]) && - R([value getValue: &range2 - size: sizeof(range2)]) && + R([value getValue: &range2 size: sizeof(range2)]) && of_range_equal(range2, range)) EXPECT_EXCEPTION(@"-[rangeValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" @@ -104,12 +101,11 @@ objCType: @encode(of_point_t)]) && of_point_equal(value.pointValue, point)) TEST(@"-[getValue:size:] for OFPointValue", (value = [OFValue valueWithPoint: point]) && - R([value getValue: &point2 - size: sizeof(point2)]) && + R([value getValue: &point2 size: sizeof(point2)]) && of_point_equal(point2, point)) EXPECT_EXCEPTION(@"-[pointValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" @@ -124,12 +120,11 @@ objCType: @encode(of_dimension_t)]) && of_dimension_equal(value.dimensionValue, dimension)) TEST(@"-[getValue:size:] for OFDimensionValue", (value = [OFValue valueWithDimension: dimension]) && - R([value getValue: &dimension2 - size: sizeof(dimension2)]) && + R([value getValue: &dimension2 size: sizeof(dimension2)]) && of_dimension_equal(dimension2, dimension)) EXPECT_EXCEPTION(@"-[dimensionValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" @@ -144,12 +139,11 @@ objCType: @encode(of_rectangle_t)]) && of_rectangle_equal(value.rectangleValue, rectangle)) TEST(@"-[getValue:size:] for OFRectangleValue", (value = [OFValue valueWithRectangle: rectangle]) && - R([value getValue: &rectangle2 - size: sizeof(rectangle2)]) && + R([value getValue: &rectangle2 size: sizeof(rectangle2)]) && of_rectangle_equal(rectangle2, rectangle)) EXPECT_EXCEPTION(@"-[rectangleValue] with wrong size throws", OFOutOfRangeException, [[OFValue valueWithBytes: "a" @@ -157,17 +151,14 @@ TEST(@"-[isEqual:]", [[OFValue valueWithRectangle: rectangle] isEqual: [OFValue valueWithBytes: &rectangle objCType: @encode(of_rectangle_t)]] && - ![[OFValue valueWithBytes: "a" - objCType: @encode(signed char)] + ![[OFValue valueWithBytes: "a" objCType: @encode(signed char)] isEqual: [OFValue valueWithBytes: "a" objCType: @encode(unsigned char)]] && - ![[OFValue valueWithBytes: "a" - objCType: @encode(char)] - isEqual: [OFValue valueWithBytes: "b" - objCType: @encode(char)]]) + ![[OFValue valueWithBytes: "a" objCType: @encode(char)] + isEqual: [OFValue valueWithBytes: "b" objCType: @encode(char)]]) objc_autoreleasePoolPop(pool); } @end