TESTING - Refactor test logic to test less points and prevent invalid point calculations by using a fixed quantity. The tests were taking 20-30 seconds each, these should be fast.

Author: paulsolt-ofsw

sf-iosTests/sweep/ShamosHoeyTestCase.m

@@ -462,10 +462,11 @@ - (void)testExternalHole {
 
 - (void)testLargeSimple {
 
-    double increment = .01;
-    double radius = 1250;
+    double increment = .07;
+    double radius = 127;
     double x = -radius + increment;
     double y = 0;
+    int expectedPoints = 7256;
 
     NSMutableArray<SFPoint *> *points = [NSMutableArray array];
 
@@ -495,17 +496,18 @@ - (void)testLargeSimple {
     [SFTestUtils assertTrue:[SFShamosHoey simplePolygon:[SFPolygon polygonWithRing:[SFLineString lineStringWithPoints:points]]]];
     [SFTestUtils assertTrue:[[SFLineString lineStringWithPoints:points] isSimple]];
     [SFTestUtils assertTrue:[[SFPolygon polygonWithRing:[SFLineString lineStringWithPoints:points]] isSimple]];
-    [SFTestUtils assertEqualIntWithValue:(int) (radius / increment * 4) andValue2:(int)points.count];
+    [SFTestUtils assertEqualIntWithValue:expectedPoints andValue2:(int)points.count];
 
 }
 
 - (void)testLargeNonSimple {
 
-    double increment = .01;
-    double radius = 1250;
+    double increment = .07;
+    double radius = 127;
     double x = -radius + increment;
     double y = 0;
-    
+    int expectedPoints = 7257;
+
     NSMutableArray<SFPoint *> *points = [NSMutableArray array];
 
     while (x <= radius) {
@@ -538,7 +540,7 @@ - (void)testLargeNonSimple {
     [SFTestUtils assertFalse:[SFShamosHoey simplePolygon:[SFPolygon polygonWithRing:[SFLineString lineStringWithPoints:points]]]];
     [SFTestUtils assertFalse:[[SFLineString lineStringWithPoints:points] isSimple]];
     [SFTestUtils assertFalse:[[SFPolygon polygonWithRing:[SFLineString lineStringWithPoints:points]] isSimple]];
-    [SFTestUtils assertEqualIntWithValue:1 + (int) (radius / increment * 4) andValue2:(int)points.count];
+    [SFTestUtils assertEqualIntWithValue:expectedPoints andValue2:(int)points.count];
 
     [points removeObjectAtIndex:invalidIndex];
     previousPoint = [points objectAtIndex:points.count - 3];
@@ -549,7 +551,7 @@ - (void)testLargeNonSimple {
     [SFTestUtils assertFalse:[SFShamosHoey simplePolygon:[SFPolygon polygonWithRing:[SFLineString lineStringWithPoints:points]]]];
     [SFTestUtils assertFalse:[[SFLineString lineStringWithPoints:points] isSimple]];
     [SFTestUtils assertFalse:[[SFPolygon polygonWithRing:[SFLineString lineStringWithPoints:points]] isSimple]];
-    [SFTestUtils assertEqualIntWithValue:1 + (int) (radius / increment * 4) andValue2:(int)points.count];
+    [SFTestUtils assertEqualIntWithValue:expectedPoints andValue2:(int)points.count];
 
 }