kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-03-26 10:04:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Tests] Two Minor Cleanups (#1977)

Browse Source 
* [Tests] Use XCTestExpectation instead of rolling our own in ASMultiplexImageNode

* [Tests] Remove do-nothing ASCollectionView test method
This commit is contained in:
Adlai Holler
2016-07-24 15:32:27 -07:00
committed by appleguy
parent a79c69a5f1
commit f434192339
2 changed files with 2 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AsyncDisplayKitTests/ASCollectionViewTests.mm
View File

@@ -142,18 +142,6 @@
XCTAssertEqualObjects([collectionView supplementaryNodeKindsInDataController:nil], @[UICollectionElementKindSectionHeader]);
}
- (void)testCollectionViewController
{
ASCollectionViewTestController *testController = [[ASCollectionViewTestController alloc] initWithNibName:nil bundle:nil];
UIView *containerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
[containerView addSubview:testController.view];
[testController.collectionView reloadData];
[[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:1.0]];
}
- (void)testSelection
{
ASCollectionViewTestController *testController = [[ASCollectionViewTestController alloc] initWithNibName:nil bundle:nil];

43
AsyncDisplayKitTests/ASMultiplexImageNodeTests.m
View File

@@ -45,42 +45,6 @@
return [[[UIImage alloc] initWithContentsOfFile:[self _testImageURL].path] autorelease];
}
static BOOL ASInvokeConditionBlockWithBarriers(BOOL (^block)()) {
// In case the block does multiple comparisons, ensure it has a consistent view of memory by issuing read-write
// barriers on either side of the block.
OSMemoryBarrier();
BOOL result = block();
OSMemoryBarrier();
return result;
}
static BOOL ASRunRunLoopUntilBlockIsTrue(BOOL (^block)())
{
// Time out after 30 seconds.
CFTimeInterval timeoutDate = CACurrentMediaTime() + 30.0f;
BOOL passed = NO;
while (true) {
passed = ASInvokeConditionBlockWithBarriers(block);
if (passed) {
break;
}
CFTimeInterval now = CACurrentMediaTime();
if (now > timeoutDate) {
break;
}
// Run 1000 times a second until the poll timeout or until timeoutDate, whichever is first.
CFTimeInterval runLoopTimeout = MIN(0.001, timeoutDate - now);
CFRunLoopRunInMode(kCFRunLoopDefaultMode, runLoopTimeout, true);
}
return passed;
}
#pragma mark -
#pragma mark Unit tests.
@@ -360,14 +324,11 @@ static BOOL ASRunRunLoopUntilBlockIsTrue(BOOL (^block)())
[imageNode reloadImageIdentifierSources];
// Wait until the image is loaded.
ASRunRunLoopUntilBlockIsTrue(^BOOL{
return [(id)imageNode.loadedImageIdentifier isEqual:imageIdentifier];
});
[self expectationForPredicate:[NSPredicate predicateWithFormat:@"loadedImageIdentifier = %@", imageIdentifier] evaluatedWithObject:imageNode handler:nil];
[self waitForExpectationsWithTimeout:30 handler:nil];
// Verify the delegation.
[mockDelegate verify];
// Also verify that it's acutally loaded (could be false if we timed out above).
XCTAssertEqualObjects(imageNode.loadedImageIdentifier, imageIdentifier, @"Failed to load image");
[imageNode release];
}