Kroach/oasis 1509 concurrent (#187)

* Remove #if ... #endif surrounding testConcurrentMapping

* OASIS-1509 Diagnose and fix OPTLYJSONModel's testConcurrentMapping unit test.

Summary:
Diagnose and fix OPTLYJSONModel's testConcurrentMapping unit test.
Remove #if ... #endif surrounding testConcurrentMapping
Add lockObject to testConcurrentMapping to synchronize access to local count .

Test Plan:
* testConcurrentMapping PASSED 120x in a row.
* Run bunch of regular test suites even though we don't need to.
None of the SDK framework code has changed.  The tests should
just pass.
* 8 iOS test suites PASSED
* OptimizelySDKiOS Product > Analyze PASSED
* OptimizelyiOSDemoApp PASSED

Reviewers: alda

JIRA Issues: OASIS-1509

Differential Revision: https://phabricator.optimizely.com/D17953

Author: kellyroach-optimizely

OptimizelySDKCore/OPTLYJSONModelTests/ConcurrentTests.m

@@ -46,39 +46,31 @@ - (void)setUp
 	self.jsonDict = [NSJSONSerialization JSONObjectWithData:jsonData options:kNilOptions error:&err];
 }
 
-#if true
-// TODO: This test removed from line up by Optimizely OASIS Team until unreliability
-// issues are resolved.
 - (void)testConcurrentMapping
 {
 	// Because the uncertainty of concurrency. Need multiple run to confirm the result.
+    __block NSObject *lockObject = [[NSObject alloc] init];
 	NSOperationQueue *queue = [NSOperationQueue new];
 	queue.maxConcurrentOperationCount = 50;
 	queue.suspended = YES;
-
 	XCTestExpectation *expectation = [self expectationWithDescription:@"Wait for queue...."];
-
 	__block int count = 0;
-
 	for (int i = 0; i < 100; i++)
 	{
 		[queue addOperationWithBlock:^
 		{
 			ConcurrentReposModel *model = [[ConcurrentReposModel alloc] initWithDictionary:self.jsonDict error:nil];
 #pragma unused(model)
-
-			count++;
-
-			if (count == 100)
-				[expectation fulfill];
-		}];
+            @synchronized (lockObject) {
+                count++;
+                if (count == 100) {
+                    [expectation fulfill];
+                }
+            }
+        }];
 	}
-
 	queue.suspended = NO;
-
 	[self waitForExpectationsWithTimeout:30 handler:nil];
 }
-#endif
-
 
 @end