Skip to content

Commit 5670404

Browse files
paulsolt-ofswpaulsolt-ofsw
committed
SQUASH - Testing updated for NS_ENUM
1 parent cfa27aa commit 5670404

12 files changed

+54
-44
lines changed

‎sf-ios/SFGeometryCollection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ -(SFGeometryType) collectionType{
119119
}
120120
break;
121121
default:
122-
[NSException raise:@"Unexpected" format:@"Unexpected Geometry Collection Type: %u", geometryType];
122+
[NSException raise:@"Unexpected" format:@"Unexpected Geometry Collection Type: %ld", geometryType];
123123
}
124124

125125
return geometryType;

‎sf-ios/extended/SFExtendedGeometryCollection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ -(void) updateGeometryType{
6363
geometryType = SF_MULTISURFACE;
6464
break;
6565
default:
66-
[NSException raise:@"Unsupported" format:@"Unsupported extended geometry collection geometry type: %u", geometryType];
66+
[NSException raise:@"Unsupported" format:@"Unsupported extended geometry collection geometry type: %ld", geometryType];
6767
}
6868
self.extendedGeometryType = geometryType;
6969
}

‎sf-ios/util/SFGeometryUtils.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ +(int) dimensionOfGeometry: (SFGeometry *) geometry{
5252
}
5353
break;
5454
default:
55-
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %d", geometryType];
55+
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %ld", geometryType];
5656
}
5757

5858
return dimension;
@@ -1782,7 +1782,7 @@ +(BOOL) hasM: (NSArray<SFGeometry *> *) geometries{
17821782

17831783
SFGeometryType parentType = [self parentTypeOfType:geometryType];
17841784
while(parentType != SF_NONE && parentType >= 0){
1785-
[hierarchy addObject:[NSNumber numberWithInt:parentType]];
1785+
[hierarchy addObject:[NSNumber numberWithInteger:parentType]];
17861786
parentType = [self parentTypeOfType:parentType];
17871787
}
17881788

‎sf-ios/util/centroid/SFCentroidCurve.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ -(void) addGeometry: (SFGeometry *) geometry{
6969
// Doesn't contribute to curve dimension
7070
break;
7171
default:
72-
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %d", geometryType];
72+
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %ld", geometryType];
7373
}
7474
}
7575

‎sf-ios/util/centroid/SFCentroidPoint.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ -(void) addGeometry: (SFGeometry *) geometry{
6565
}
6666
break;
6767
default:
68-
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %d", geometryType];
68+
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %ld", geometryType];
6969
}
7070
}
7171

‎sf-ios/util/centroid/SFCentroidSurface.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ -(void) addGeometry: (SFGeometry *) geometry{
8282
// Doesn't contribute to surface dimension
8383
break;
8484
default:
85-
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %d", geometryType];
85+
[NSException raise:@"Geometry Not Supported" format:@"Unsupported Geometry Type: %ld", geometryType];
8686
}
8787
}
8888

@@ -138,7 +138,7 @@ -(void) addCurvePolygon: (SFCurvePolygon *) curvePolygon{
138138
[self addLineString:(SFLineString *)curve];
139139
break;
140140
default:
141-
[NSException raise:@"Curve Type" format:@"Unexpected Curve Type: %d", curveGeometryType];
141+
[NSException raise:@"Curve Type" format:@"Unexpected Curve Type: %ld", curveGeometryType];
142142
}
143143

144144
for(int i = 1; i < rings.count; i++){
@@ -158,7 +158,7 @@ -(void) addCurvePolygon: (SFCurvePolygon *) curvePolygon{
158158
[self addHoleLineString:(SFLineString *)curveHole];
159159
break;
160160
default:
161-
[NSException raise:@"Curve Type" format:@"Unexpected Curve Type: %d", curveHoleGeometryType];
161+
[NSException raise:@"Curve Type" format:@"Unexpected Curve Type: %ld", curveHoleGeometryType];
162162
}
163163
}
164164
}

‎sf-ios/util/filter/SFPointFiniteFilter.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ -(BOOL) filterDouble: (double) value{
9191
passes = !isinf(value);
9292
break;
9393
default:
94-
[NSException raise:@"Unsupported" format:@"Unsupported filter type: %u", _type];
94+
[NSException raise:@"Unsupported" format:@"Unsupported filter type: %ld", _type];
9595
}
9696
return passes;
9797
}

‎sf-iosTests/SFGeometryCollectionTestCase.m

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ -(void) testMultiPoint {
4343
[SFTestUtils assertEqualWithValue:multiPoint.geometries andValue2:geometryCollection.geometries];
4444

4545
[SFTestUtils assertTrue:[multiPoint isMultiPoint]];
46-
[SFTestUtils assertEqualIntWithValue:SF_MULTIPOINT andValue2:[multiPoint collectionType]];
46+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTIPOINT andValue2:[multiPoint collectionType]];
4747
[SFTestUtils assertFalse:[multiPoint isMultiLineString]];
4848
[SFTestUtils assertFalse:[multiPoint isMultiCurve]];
4949
[SFTestUtils assertFalse:[multiPoint isMultiPolygon]];
5050
[SFTestUtils assertFalse:[multiPoint isMultiSurface]];
5151

5252
[SFTestUtils assertTrue:[geometryCollection isMultiPoint]];
53-
[SFTestUtils assertEqualIntWithValue:SF_MULTIPOINT andValue2:[geometryCollection collectionType]];
53+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTIPOINT andValue2:[geometryCollection collectionType]];
5454
[SFTestUtils assertFalse:[geometryCollection isMultiLineString]];
5555
[SFTestUtils assertFalse:[geometryCollection isMultiCurve]];
5656
[SFTestUtils assertFalse:[geometryCollection isMultiPolygon]];
@@ -65,8 +65,8 @@ -(void) testMultiPoint {
6565
[SFTestUtils assertEqualWithValue:geometryCollection2 andValue2:[geometryCollection asGeometryCollection]];
6666

6767
SFExtendedGeometryCollection *extendedGeometryCollection = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection];
68-
[SFTestUtils assertEqualIntWithValue:SF_GEOMETRYCOLLECTION andValue2:extendedGeometryCollection.geometryType];
69-
[SFTestUtils assertEqualIntWithValue:SF_MULTIPOINT andValue2:[extendedGeometryCollection collectionType]];
68+
[SFTestUtils assertEqualIntegerWithValue:SF_GEOMETRYCOLLECTION andValue2:extendedGeometryCollection.geometryType];
69+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTIPOINT andValue2:[extendedGeometryCollection collectionType]];
7070
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:[[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection]];
7171

7272
}
@@ -90,14 +90,14 @@ -(void) testMultiLineString {
9090

9191
[SFTestUtils assertTrue:[multiLineString isMultiLineString]];
9292
[SFTestUtils assertTrue:[multiLineString isMultiCurve]];
93-
[SFTestUtils assertEqualIntWithValue:SF_MULTILINESTRING andValue2:[multiLineString collectionType]];
93+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTILINESTRING andValue2:[multiLineString collectionType]];
9494
[SFTestUtils assertFalse:[multiLineString isMultiPoint]];
9595
[SFTestUtils assertFalse:[multiLineString isMultiPolygon]];
9696
[SFTestUtils assertFalse:[multiLineString isMultiSurface]];
9797

9898
[SFTestUtils assertTrue:[geometryCollection isMultiLineString]];
9999
[SFTestUtils assertTrue:[geometryCollection isMultiCurve]];
100-
[SFTestUtils assertEqualIntWithValue:SF_MULTILINESTRING andValue2:[geometryCollection collectionType]];
100+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTILINESTRING andValue2:[geometryCollection collectionType]];
101101
[SFTestUtils assertFalse:[geometryCollection isMultiPoint]];
102102
[SFTestUtils assertFalse:[geometryCollection isMultiPolygon]];
103103
[SFTestUtils assertFalse:[geometryCollection isMultiSurface]];
@@ -116,8 +116,8 @@ -(void) testMultiLineString {
116116
[SFTestUtils assertEqualWithValue:multiCurve andValue2:multiCurve2];
117117

118118
SFExtendedGeometryCollection *extendedGeometryCollection = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection];
119-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:extendedGeometryCollection.geometryType];
120-
[SFTestUtils assertEqualIntWithValue:SF_MULTILINESTRING andValue2:[extendedGeometryCollection collectionType]];
119+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:extendedGeometryCollection.geometryType];
120+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTILINESTRING andValue2:[extendedGeometryCollection collectionType]];
121121
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:[[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection]];
122122

123123
}
@@ -140,14 +140,14 @@ -(void) testMultiPolygon {
140140

141141
[SFTestUtils assertTrue:[multiPolygon isMultiPolygon]];
142142
[SFTestUtils assertTrue:[multiPolygon isMultiSurface]];
143-
[SFTestUtils assertEqualIntWithValue:SF_MULTIPOLYGON andValue2:[multiPolygon collectionType]];
143+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTIPOLYGON andValue2:[multiPolygon collectionType]];
144144
[SFTestUtils assertFalse:[multiPolygon isMultiPoint]];
145145
[SFTestUtils assertFalse:[multiPolygon isMultiLineString]];
146146
[SFTestUtils assertFalse:[multiPolygon isMultiCurve]];
147147

148148
[SFTestUtils assertTrue:[geometryCollection isMultiPolygon]];
149149
[SFTestUtils assertTrue:[geometryCollection isMultiSurface]];
150-
[SFTestUtils assertEqualIntWithValue:SF_MULTIPOLYGON andValue2:[geometryCollection collectionType]];
150+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTIPOLYGON andValue2:[geometryCollection collectionType]];
151151
[SFTestUtils assertFalse:[geometryCollection isMultiPoint]];
152152
[SFTestUtils assertFalse:[geometryCollection isMultiLineString]];
153153
[SFTestUtils assertFalse:[geometryCollection isMultiCurve]];
@@ -166,8 +166,8 @@ -(void) testMultiPolygon {
166166
[SFTestUtils assertEqualWithValue:multiSurface andValue2:multiSurface2];
167167

168168
SFExtendedGeometryCollection *extendedGeometryCollection = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection];
169-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:extendedGeometryCollection.geometryType];
170-
[SFTestUtils assertEqualIntWithValue:SF_MULTIPOLYGON andValue2:[extendedGeometryCollection collectionType]];
169+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:extendedGeometryCollection.geometryType];
170+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTIPOLYGON andValue2:[extendedGeometryCollection collectionType]];
171171
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:[[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection]];
172172

173173
}
@@ -189,18 +189,18 @@ -(void) testMultiCurve {
189189
SFGeometryCollection *multiCurve = [SFGeometryCollection geometryCollectionWithGeometries:(NSMutableArray<SFGeometry *> *)curves];
190190
SFGeometryCollection *geometryCollection = [SFGeometryCollection geometryCollectionWithGeometries:geometries];
191191

192-
[SFTestUtils assertEqualIntWithValue:[multiCurve numGeometries] andValue2:[geometryCollection numGeometries]];
192+
[SFTestUtils assertEqualIntegerWithValue:[multiCurve numGeometries] andValue2:[geometryCollection numGeometries]];
193193
[SFTestUtils assertEqualWithValue:multiCurve.geometries andValue2:geometryCollection.geometries];
194194

195195
[SFTestUtils assertTrue:[multiCurve isMultiCurve]];
196-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:[multiCurve collectionType]];
196+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:[multiCurve collectionType]];
197197
[SFTestUtils assertFalse:[multiCurve isMultiPoint]];
198198
[SFTestUtils assertFalse:[multiCurve isMultiLineString]];
199199
[SFTestUtils assertFalse:[multiCurve isMultiPolygon]];
200200
[SFTestUtils assertFalse:[multiCurve isMultiSurface]];
201201

202202
[SFTestUtils assertTrue:[geometryCollection isMultiCurve]];
203-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:[geometryCollection collectionType]];
203+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:[geometryCollection collectionType]];
204204
[SFTestUtils assertFalse:[geometryCollection isMultiPoint]];
205205
[SFTestUtils assertFalse:[geometryCollection isMultiLineString]];
206206
[SFTestUtils assertFalse:[geometryCollection isMultiPolygon]];
@@ -216,10 +216,10 @@ -(void) testMultiCurve {
216216

217217
SFExtendedGeometryCollection *extendedGeometryCollection = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection];
218218
SFExtendedGeometryCollection *extendedGeometryCollection2 = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:multiCurve];
219-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:extendedGeometryCollection.geometryType];
220-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:extendedGeometryCollection2.geometryType];
221-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:[extendedGeometryCollection collectionType]];
222-
[SFTestUtils assertEqualIntWithValue:SF_MULTICURVE andValue2:[extendedGeometryCollection2 collectionType]];
219+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:extendedGeometryCollection.geometryType];
220+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:extendedGeometryCollection2.geometryType];
221+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:[extendedGeometryCollection collectionType]];
222+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTICURVE andValue2:[extendedGeometryCollection2 collectionType]];
223223
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:[[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection]];
224224
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:extendedGeometryCollection2];
225225

@@ -246,14 +246,14 @@ -(void) testMultiSurface {
246246
[SFTestUtils assertEqualWithValue:multiSurface.geometries andValue2:geometryCollection.geometries];
247247

248248
[SFTestUtils assertTrue:[multiSurface isMultiSurface]];
249-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:[multiSurface collectionType]];
249+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:[multiSurface collectionType]];
250250
[SFTestUtils assertFalse:[multiSurface isMultiPoint]];
251251
[SFTestUtils assertFalse:[multiSurface isMultiLineString]];
252252
[SFTestUtils assertFalse:[multiSurface isMultiCurve]];
253253
[SFTestUtils assertFalse:[multiSurface isMultiPolygon]];
254254

255255
[SFTestUtils assertTrue:[geometryCollection isMultiSurface]];
256-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:[geometryCollection collectionType]];
256+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:[geometryCollection collectionType]];
257257
[SFTestUtils assertFalse:[geometryCollection isMultiPoint]];
258258
[SFTestUtils assertFalse:[geometryCollection isMultiLineString]];
259259
[SFTestUtils assertFalse:[geometryCollection isMultiCurve]];
@@ -269,10 +269,10 @@ -(void) testMultiSurface {
269269

270270
SFExtendedGeometryCollection *extendedGeometryCollection = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection];
271271
SFExtendedGeometryCollection *extendedGeometryCollection2 = [[SFExtendedGeometryCollection alloc] initWithGeometryCollection:multiSurface];
272-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:extendedGeometryCollection.geometryType];
273-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:extendedGeometryCollection2.geometryType];
274-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:[extendedGeometryCollection collectionType]];
275-
[SFTestUtils assertEqualIntWithValue:SF_MULTISURFACE andValue2:[extendedGeometryCollection2 collectionType]];
272+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:extendedGeometryCollection.geometryType];
273+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:extendedGeometryCollection2.geometryType];
274+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:[extendedGeometryCollection collectionType]];
275+
[SFTestUtils assertEqualIntegerWithValue:SF_MULTISURFACE andValue2:[extendedGeometryCollection2 collectionType]];
276276
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:[[SFExtendedGeometryCollection alloc] initWithGeometryCollection:geometryCollection]];
277277
[SFTestUtils assertEqualWithValue:extendedGeometryCollection andValue2:extendedGeometryCollection2];
278278

‎sf-iosTests/SFGeometryTestUtils.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ +(void) compareGeometriesWithExpected: (SFGeometry *) expected andActual: (SFGeo
9090
[self compareTriangleWithExpected:(SFTriangle *)expected andActual:(SFTriangle *)actual];
9191
break;
9292
default:
93-
[NSException raise:@"Geometry Type Not Supported" format:@"Geometry Type not supported: %d", geometryType];
93+
[NSException raise:@"Geometry Type Not Supported" format:@"Geometry Type not supported: %ld", geometryType];
9494
}
9595
}
9696
}
9797

9898
+(void) compareBaseGeometryAttributesWithExpected: (SFGeometry *) expected andActual: (SFGeometry *) actual{
99-
[SFTestUtils assertEqualIntWithValue:expected.geometryType andValue2:actual.geometryType];
99+
[SFTestUtils assertEqualIntegerWithValue:expected.geometryType andValue2:actual.geometryType];
100100
[SFTestUtils assertEqualBoolWithValue:expected.hasZ andValue2:actual.hasZ];
101101
[SFTestUtils assertEqualBoolWithValue:expected.hasM andValue2:actual.hasM];
102102
}

‎sf-iosTests/SFGeometryUtilsTestCase.m

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ -(void) testPointCentroid {
3434
for (int i = 0; i < GEOMETRIES_PER_TEST; i++) {
3535
// Create and test a point
3636
SFPoint *point = [SFGeometryTestUtils createPointWithHasZ:[SFTestUtils coinFlip] andHasM:[SFTestUtils coinFlip]];
37-
[SFTestUtils assertEqualIntWithValue:0 andValue2:[SFGeometryUtils dimensionOfGeometry:point]];
37+
// [SFTestUtils assertEqualIntWithValue:0 andValue2:[SFGeometryUtils dimensionOfGeometry:point]];
38+
XCTAssertEqual(0, [SFGeometryUtils dimensionOfGeometry:point]);
3839
[self geometryCentroidTesterWithGeometry:point];
3940
}
4041

@@ -1021,13 +1022,14 @@ -(void) testHierarchy{
10211022
SFGeometryType previousParentType = SF_NONE;
10221023

10231024
while (parentType != SF_NONE) {
1024-
[SFTestUtils assertEqualIntWithValue:parentType andValue2:[[parentHierarchy objectAtIndex:0] intValue]];
1025-
1025+
// [SFTestUtils assertEqualIntWithValue:parentType andValue2:[[parentHierarchy objectAtIndex:0] intValue]];
1026+
XCTAssertEqual(parentType, [parentHierarchy objectAtIndex:0].integerValue);
10261027
if (previousParentType != SF_NONE) {
10271028
NSArray<NSNumber *> *childTypes = [SFGeometryUtils childTypesOfType:parentType];
1028-
[SFTestUtils assertTrue:[childTypes containsObject:[NSNumber numberWithInt:previousParentType]]];
1029+
[SFTestUtils assertTrue:[childTypes containsObject:[NSNumber numberWithInteger:previousParentType]]];
1030+
10291031
NSDictionary<NSNumber *, NSDictionary *> *childHierarchy = [SFGeometryUtils childHierarchyOfType:parentType];
1030-
NSDictionary *previousParentChildHierarchy = [childHierarchy objectForKey:[NSNumber numberWithInt:previousParentType]];
1032+
NSDictionary *previousParentChildHierarchy = [childHierarchy objectForKey:[NSNumber numberWithInteger:previousParentType]];
10311033
[SFTestUtils assertTrue:previousParentChildHierarchy != nil && previousParentChildHierarchy.count > 0];
10321034
}
10331035

@@ -1065,8 +1067,8 @@ -(void) testChildHierarchyWithType: (SFGeometryType) geometryType andHierarchy:
10651067
NSDictionary *child = [childHierachy objectForKey:childTypeNumber];
10661068
[SFTestUtils assertTrue:child != nil];
10671069

1068-
[SFTestUtils assertEqualIntWithValue:geometryType andValue2:[SFGeometryUtils parentTypeOfType:childType]];
1069-
[SFTestUtils assertEqualIntWithValue:geometryType andValue2:[[[SFGeometryUtils parentHierarchyOfType:childType] objectAtIndex:0] intValue]];
1070+
[SFTestUtils assertEqualIntegerWithValue:geometryType andValue2:[SFGeometryUtils parentTypeOfType:childType]];
1071+
[SFTestUtils assertEqualIntegerWithValue:geometryType andValue2:[[[SFGeometryUtils parentHierarchyOfType:childType] objectAtIndex:0] intValue]];
10701072

10711073
[self testChildHierarchyWithType:childType andHierarchy:[SFGeometryUtils childHierarchyOfType:childType]];
10721074
}

‎sf-iosTests/SFTestUtils.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424

2525
+(void)assertEqualIntWithValue:(int) value andValue2: (int) value2;
2626

27+
+(void)assertEqualIntegerWithValue:(NSInteger) value andValue2: (NSInteger) value2;
28+
2729
+(void)assertEqualDoubleWithValue:(double) value andValue2: (double) value2;
2830

2931
+(void)assertEqualDoubleWithValue:(double) value andValue2: (double) value2 andDelta: (double) delta;

0 commit comments

Comments
 (0)