From 578ac4c48d87f762467da287b937b60fd3e65d58 Mon Sep 17 00:00:00 2001 From: Adlai Holler Date: Sun, 28 Aug 2016 16:47:03 -0700 Subject: [PATCH] [Unit Tests] Add Text Layout Performance Tests (#2161) * Add single-threaded text node performance testing * Relax test a bit --- AsyncDisplayKit.xcodeproj/project.pbxproj | 10 + .../Details/CGRect+ASConvenience.h | 6 + .../ASPerformanceTestContext.h | 43 +++++ .../ASPerformanceTestContext.m | 126 ++++++++++++ .../ASTextNodePerformanceTests.m | 180 ++++++++++++++++++ AsyncDisplayKitTests/ASTextNodeTests.m | 5 +- 6 files changed, 366 insertions(+), 4 deletions(-) create mode 100644 AsyncDisplayKitTests/ASPerformanceTestContext.h create mode 100644 AsyncDisplayKitTests/ASPerformanceTestContext.m create mode 100644 AsyncDisplayKitTests/ASTextNodePerformanceTests.m diff --git a/AsyncDisplayKit.xcodeproj/project.pbxproj b/AsyncDisplayKit.xcodeproj/project.pbxproj index b2ff93b6..8789f8b4 100644 --- a/AsyncDisplayKit.xcodeproj/project.pbxproj +++ b/AsyncDisplayKit.xcodeproj/project.pbxproj @@ -426,6 +426,8 @@ CC7FD9DF1BB5E962005CCB2B /* ASPhotosFrameworkImageRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = CC7FD9DD1BB5E962005CCB2B /* ASPhotosFrameworkImageRequest.m */; }; CC7FD9E11BB5F750005CCB2B /* ASPhotosFrameworkImageRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC7FD9E01BB5F750005CCB2B /* ASPhotosFrameworkImageRequestTests.m */; }; CC7FD9E21BB603FF005CCB2B /* ASPhotosFrameworkImageRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = CC7FD9DC1BB5E962005CCB2B /* ASPhotosFrameworkImageRequest.h */; settings = {ATTRIBUTES = (Public, ); }; }; + CC8B05D61D73836400F54286 /* ASPerformanceTestContext.m in Sources */ = {isa = PBXBuildFile; fileRef = CC8B05D51D73836400F54286 /* ASPerformanceTestContext.m */; }; + CC8B05D81D73979700F54286 /* ASTextNodePerformanceTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CC8B05D71D73979700F54286 /* ASTextNodePerformanceTests.m */; }; CCA221D31D6FA7EF00AF6A0F /* ASViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CCA221D21D6FA7EF00AF6A0F /* ASViewControllerTests.m */; }; CCB2F34D1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CCB2F34C1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m */; }; CCF18FF41D2575E300DF5895 /* NSIndexSet+ASHelpers.h in Headers */ = {isa = PBXBuildFile; fileRef = CC4981BA1D1C7F65004E13CC /* NSIndexSet+ASHelpers.h */; }; @@ -1102,6 +1104,9 @@ CC7FD9DC1BB5E962005CCB2B /* ASPhotosFrameworkImageRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASPhotosFrameworkImageRequest.h; sourceTree = ""; }; CC7FD9DD1BB5E962005CCB2B /* ASPhotosFrameworkImageRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASPhotosFrameworkImageRequest.m; sourceTree = ""; }; CC7FD9E01BB5F750005CCB2B /* ASPhotosFrameworkImageRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASPhotosFrameworkImageRequestTests.m; sourceTree = ""; }; + CC8B05D41D73836400F54286 /* ASPerformanceTestContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ASPerformanceTestContext.h; sourceTree = ""; }; + CC8B05D51D73836400F54286 /* ASPerformanceTestContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASPerformanceTestContext.m; sourceTree = ""; }; + CC8B05D71D73979700F54286 /* ASTextNodePerformanceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASTextNodePerformanceTests.m; sourceTree = ""; }; CCA221D21D6FA7EF00AF6A0F /* ASViewControllerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASViewControllerTests.m; sourceTree = ""; }; CCB2F34C1D63CCC6004E6DE9 /* ASDisplayNodeSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ASDisplayNodeSnapshotTests.m; sourceTree = ""; }; D3779BCFF841AD3EB56537ED /* Pods-AsyncDisplayKitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AsyncDisplayKitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AsyncDisplayKitTests/Pods-AsyncDisplayKitTests.release.xcconfig"; sourceTree = ""; }; @@ -1338,6 +1343,9 @@ 058D09C5195D04C000B7D73C /* AsyncDisplayKitTests */ = { isa = PBXGroup; children = ( + CC8B05D71D73979700F54286 /* ASTextNodePerformanceTests.m */, + CC8B05D41D73836400F54286 /* ASPerformanceTestContext.h */, + CC8B05D51D73836400F54286 /* ASPerformanceTestContext.m */, 69B225681D7265DA00B25B22 /* ASXCTExtensions.h */, CC54A81D1D7008B300296A24 /* ASDispatchTests.m */, CCA221D21D6FA7EF00AF6A0F /* ASViewControllerTests.m */, @@ -2221,8 +2229,10 @@ CC7FD9E11BB5F750005CCB2B /* ASPhotosFrameworkImageRequestTests.m in Sources */, 052EE0661A159FEF002C6279 /* ASMultiplexImageNodeTests.m in Sources */, 058D0A3C195D057000B7D73C /* ASMutableAttributedStringBuilderTests.m in Sources */, + CC8B05D81D73979700F54286 /* ASTextNodePerformanceTests.m in Sources */, 697B315A1CFE4B410049936F /* ASEditableTextNodeTests.m in Sources */, ACF6ED611B178DC700DA7C62 /* ASOverlayLayoutSpecSnapshotTests.mm in Sources */, + CC8B05D61D73836400F54286 /* ASPerformanceTestContext.m in Sources */, CC0AEEA41D66316E005D1C78 /* ASUICollectionViewTests.m in Sources */, 69B225671D72535E00B25B22 /* ASDisplayNodeLayoutTests.mm in Sources */, ACF6ED621B178DC700DA7C62 /* ASRatioLayoutSpecSnapshotTests.mm in Sources */, diff --git a/AsyncDisplayKit/Details/CGRect+ASConvenience.h b/AsyncDisplayKit/Details/CGRect+ASConvenience.h index c6148fd7..e8cec806 100644 --- a/AsyncDisplayKit/Details/CGRect+ASConvenience.h +++ b/AsyncDisplayKit/Details/CGRect+ASConvenience.h @@ -13,6 +13,7 @@ #import "ASBaseDefines.h" #import "ASLayoutController.h" +#include "tgmath.h" #ifndef CGFLOAT_EPSILON #if CGFLOAT_IS_DOUBLE @@ -26,6 +27,11 @@ NS_ASSUME_NONNULL_BEGIN ASDISPLAYNODE_EXTERN_C_BEGIN +ASDISPLAYNODE_INLINE BOOL CGSizeEqualToSizeWithIn(CGSize size1, CGSize size2, CGFloat delta) +{ + return fabs(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta; +}; + struct ASDirectionalScreenfulBuffer { CGFloat positiveDirection; // Positive relative to iOS Core Animation layer coordinate space. CGFloat negativeDirection; diff --git a/AsyncDisplayKitTests/ASPerformanceTestContext.h b/AsyncDisplayKitTests/ASPerformanceTestContext.h new file mode 100644 index 00000000..730445a0 --- /dev/null +++ b/AsyncDisplayKitTests/ASPerformanceTestContext.h @@ -0,0 +1,43 @@ +// +// ASPerformanceTestContext.h +// AsyncDisplayKit +// +// Created by Adlai Holler on 8/28/16. +// Copyright © 2016 Facebook. All rights reserved. +// + +#import +#import + +#define ASXCTAssertRelativePerformanceInRange(test, caseName, min, max) \ + _XCTPrimitiveAssertLessThanOrEqual(self, test.results[caseName].relativePerformance, @#caseName, max, @#max);\ + _XCTPrimitiveAssertGreaterThanOrEqual(self, test.results[caseName].relativePerformance, @#caseName, min, @#min) + +NS_ASSUME_NONNULL_BEGIN + +typedef void (^ASTestPerformanceCaseBlock)(dispatch_block_t startMeasuring, dispatch_block_t stopMeasuring); + +@interface ASPerformanceTestResult : NSObject +@property (nonatomic, readonly) NSTimeInterval timePer1000; +@property (nonatomic, readonly) NSString *caseName; + +@property (nonatomic, readonly, getter=isReferenceCase) BOOL referenceCase; +@property (nonatomic, readonly) float relativePerformance; + +@property (nonatomic, readonly) NSMutableDictionary *userInfo; +@end + +@interface ASPerformanceTestContext : NSObject + +/** + * The first case you add here will be considered the reference case. + */ +- (void)addCaseWithName:(NSString *)caseName block:(__attribute((noescape)) ASTestPerformanceCaseBlock)block; + +@property (nonatomic, copy, readonly) NSDictionary *results; + +- (BOOL)areAllUserInfosEqual; + +@end + +NS_ASSUME_NONNULL_END diff --git a/AsyncDisplayKitTests/ASPerformanceTestContext.m b/AsyncDisplayKitTests/ASPerformanceTestContext.m new file mode 100644 index 00000000..1c7af5b2 --- /dev/null +++ b/AsyncDisplayKitTests/ASPerformanceTestContext.m @@ -0,0 +1,126 @@ +// +// ASPerformanceTestContext.m +// AsyncDisplayKit +// +// Created by Adlai Holler on 8/28/16. +// Copyright © 2016 Facebook. All rights reserved. +// + +#import +#import "ASPerformanceTestContext.h" +#import "ASAssert.h" + +@interface ASPerformanceTestResult () +@property (nonatomic) NSTimeInterval timePer1000; +@property (nonatomic) NSString *caseName; + +@property (nonatomic, getter=isReferenceCase) BOOL referenceCase; +@property (nonatomic) float relativePerformance; +@end + +@implementation ASPerformanceTestResult + +- (instancetype)init +{ + self = [super init]; + if (self != nil) { + _userInfo = [NSMutableDictionary dictionary]; + } + return self; +} + +- (NSString *)description +{ + NSString *userInfoStr = [_userInfo.description stringByReplacingOccurrencesOfString:@"\n" withString:@" "]; + return [NSString stringWithFormat:@"<%-20s: time-per-1000=%04.2f rel-perf=%04.2f user-info=%@>", _caseName.UTF8String, _timePer1000, _relativePerformance, userInfoStr]; +} + +@end + +@implementation ASPerformanceTestContext { + NSMutableDictionary *_results; + NSInteger _iterationCount; + ASPerformanceTestResult * _Nullable _referenceResult; +} + +- (instancetype)init +{ + self = [super init]; + if (self != nil) { + _iterationCount = 1E4; + _results = [[NSMutableDictionary alloc] init]; + } + return self; +} + +- (void)dealloc +{ + /** + * I know this seems wacky but it's a pain to have to put this in every single test method. + */ + NSLog(@"%@", self.description); +} + +- (BOOL)areAllUserInfosEqual +{ + ASDisplayNodeAssert(_results.count >= 2, nil); + NSEnumerator *resultsEnumerator = [_results objectEnumerator]; + NSDictionary *userInfo = [[resultsEnumerator nextObject] userInfo]; + for (ASPerformanceTestResult *otherResult in resultsEnumerator) { + if ([userInfo isEqualToDictionary:otherResult.userInfo] == NO) { + return NO; + } + } + return YES; +} + +- (void)addCaseWithName:(NSString *)caseName block:(__attribute((noescape)) ASTestPerformanceCaseBlock)block +{ + ASDisplayNodeAssert(_results[caseName] == nil, @"Already have a case named %@", caseName); + ASPerformanceTestResult *result = [[ASPerformanceTestResult alloc] init]; + result.caseName = caseName; + result.timePer1000 = [self _testPerformanceForCaseWithBlock:block] / (_iterationCount / 1000); + if (_referenceResult == nil) { + result.referenceCase = YES; + result.relativePerformance = 1.0f; + _referenceResult = result; + } else { + result.relativePerformance = _referenceResult.timePer1000 / result.timePer1000; + } + _results[caseName] = result; +} + +/// Returns total work time +- (CFTimeInterval)_testPerformanceForCaseWithBlock:(__attribute((noescape)) ASTestPerformanceCaseBlock)block +{ + __block CFTimeInterval time = 0; + for (NSInteger i = 0; i < _iterationCount; i++) { + __block CFAbsoluteTime start = 0; + __block BOOL calledStop = NO; + @autoreleasepool { + block(^{ + ASDisplayNodeAssert(start == 0, @"Called startMeasuring block twice."); + start = CFAbsoluteTimeGetCurrent(); + }, ^{ + time += (CFAbsoluteTimeGetCurrent() - start); + ASDisplayNodeAssert(calledStop == NO, @"Called stopMeasuring block twice."); + ASDisplayNodeAssert(start != 0, @"Failed to call startMeasuring block"); + calledStop = YES; + }); + } + + ASDisplayNodeAssert(calledStop, @"Failed to call stopMeasuring block."); + } + return time; +} + +- (NSString *)description +{ + NSMutableString *str = [NSMutableString stringWithString:@"Results:\n"]; + for (ASPerformanceTestResult *result in [_results objectEnumerator]) { + [str appendFormat:@"\t%@\n", result]; + } + return str; +} + +@end diff --git a/AsyncDisplayKitTests/ASTextNodePerformanceTests.m b/AsyncDisplayKitTests/ASTextNodePerformanceTests.m new file mode 100644 index 00000000..b3cc27f2 --- /dev/null +++ b/AsyncDisplayKitTests/ASTextNodePerformanceTests.m @@ -0,0 +1,180 @@ +// +// ASTextNodePerformanceTests.m +// AsyncDisplayKit +// +// Created by Adlai Holler on 8/28/16. +// Copyright © 2016 Facebook. All rights reserved. +// + +#import +#import "ASPerformanceTestContext.h" +#import +#import "ASinternalHelpers.h" +#import "ASXCTExtensions.h" +#include "CGRect+ASConvenience.h" + +@interface ASTextNodePerformanceTests : XCTestCase + +@end + +@implementation ASTextNodePerformanceTests + +#pragma mark Performance Tests + +static NSString *const kTestCaseUIKit = @"UIKit"; +static NSString *const kTestCaseASDK = @"ASDK"; +static NSString *const kTestCaseUIKitPrivateCaching = @"UIKitPrivateCaching"; +static NSString *const kTestCaseUIKitWithNoContext = @"UIKitNoContext"; +static NSString *const kTestCaseUIKitWithFreshContext = @"UIKitFreshContext"; +static NSString *const kTestCaseUIKitWithReusedContext = @"UIKitReusedContext"; + +- (void)testPerformance_TwoParagraphLatinNoTruncation +{ + NSAttributedString *text = [ASTextNodePerformanceTests twoParagraphLatinText]; + + CGSize maxSize = CGSizeMake(355, CGFLOAT_MAX); + CGSize __block uiKitSize, __block asdkSize; + + ASPerformanceTestContext *ctx = [[ASPerformanceTestContext alloc] init]; + [ctx addCaseWithName:kTestCaseUIKit block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + startMeasuring(); + uiKitSize = [text boundingRectWithSize:maxSize options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine context:nil].size; + stopMeasuring(); + }]; + uiKitSize.width = ASCeilPixelValue(uiKitSize.width); + uiKitSize.height = ASCeilPixelValue(uiKitSize.height); + ctx.results[kTestCaseUIKit].userInfo[@"size"] = NSStringFromCGSize(uiKitSize); + + [ctx addCaseWithName:kTestCaseASDK block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + ASTextNode *node = [[ASTextNode alloc] init]; + startMeasuring(); + node.attributedText = text; + asdkSize = [node measure:maxSize]; + stopMeasuring(); + }]; + ctx.results[kTestCaseASDK].userInfo[@"size"] = NSStringFromCGSize(asdkSize); + + ASXCTAssertEqualSizes(uiKitSize, asdkSize); + ASXCTAssertRelativePerformanceInRange(ctx, kTestCaseASDK, 0.2, 0.5); +} + +- (void)testPerformance_OneParagraphLatinWithTruncation +{ + NSAttributedString *text = [ASTextNodePerformanceTests oneParagraphLatinText]; + + CGSize maxSize = CGSizeMake(355, 150); + CGSize __block uiKitSize, __block asdkSize; + + ASPerformanceTestContext *testCtx = [[ASPerformanceTestContext alloc] init]; + [testCtx addCaseWithName:kTestCaseUIKit block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + startMeasuring(); + uiKitSize = [text boundingRectWithSize:maxSize options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine context:nil].size; + stopMeasuring(); + }]; + uiKitSize.width = ASCeilPixelValue(uiKitSize.width); + uiKitSize.height = ASCeilPixelValue(uiKitSize.height); + testCtx.results[kTestCaseUIKit].userInfo[@"size"] = NSStringFromCGSize(uiKitSize); + + [testCtx addCaseWithName:kTestCaseASDK block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + ASTextNode *node = [[ASTextNode alloc] init]; + startMeasuring(); + node.attributedText = text; + asdkSize = [node measure:maxSize]; + stopMeasuring(); + }]; + testCtx.results[kTestCaseASDK].userInfo[@"size"] = NSStringFromCGSize(asdkSize); + + XCTAssert(CGSizeEqualToSizeWithIn(uiKitSize, asdkSize, 5)); + ASXCTAssertRelativePerformanceInRange(testCtx, kTestCaseASDK, 0.1, 0.3); +} + +- (void)testThatNotUsingAStringDrawingContextHasSimilarPerformanceToHavingOne +{ + ASPerformanceTestContext *ctx = [[ASPerformanceTestContext alloc] init]; + + NSAttributedString *text = [ASTextNodePerformanceTests oneParagraphLatinText]; + CGSize maxSize = CGSizeMake(355, 150); + NSStringDrawingOptions options = NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine; + __block CGSize size; + // nil context + [ctx addCaseWithName:kTestCaseUIKitWithNoContext block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + startMeasuring(); + size = [text boundingRectWithSize:maxSize options:options context:nil].size; + stopMeasuring(); + }]; + ctx.results[kTestCaseUIKitWithNoContext].userInfo[@"size"] = NSStringFromCGSize(size); + + // Fresh context + [ctx addCaseWithName:kTestCaseUIKitWithFreshContext block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + NSStringDrawingContext *stringDrawingCtx = [[NSStringDrawingContext alloc] init]; + startMeasuring(); + size = [text boundingRectWithSize:maxSize options:options context:stringDrawingCtx].size; + stopMeasuring(); + }]; + ctx.results[kTestCaseUIKitWithFreshContext].userInfo[@"size"] = NSStringFromCGSize(size); + + // Reused context + NSStringDrawingContext *stringDrawingCtx = [[NSStringDrawingContext alloc] init]; + [ctx addCaseWithName:kTestCaseUIKitWithReusedContext block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + startMeasuring(); + size = [text boundingRectWithSize:maxSize options:options context:stringDrawingCtx].size; + stopMeasuring(); + }]; + ctx.results[kTestCaseUIKitWithReusedContext].userInfo[@"size"] = NSStringFromCGSize(size); + + XCTAssertTrue([ctx areAllUserInfosEqual]); + ASXCTAssertRelativePerformanceInRange(ctx, kTestCaseUIKitWithReusedContext, 0.8, 1.2); + ASXCTAssertRelativePerformanceInRange(ctx, kTestCaseUIKitWithFreshContext, 0.8, 1.2); +} + +- (void)testThatUIKitPrivateLayoutCachingIsAwesome +{ + NSAttributedString *text = [ASTextNodePerformanceTests oneParagraphLatinText]; + ASPerformanceTestContext *ctx = [[ASPerformanceTestContext alloc] init]; + CGSize maxSize = CGSizeMake(355, 150); + __block CGSize uncachedSize, cachedSize; + NSStringDrawingOptions options = NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingTruncatesLastVisibleLine; + + // No caching, reused ctx + NSStringDrawingContext *defaultCtx = [[NSStringDrawingContext alloc] init]; + XCTAssertFalse([[defaultCtx valueForKey:@"cachesLayout"] boolValue]); + [ctx addCaseWithName:kTestCaseUIKit block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + startMeasuring(); + uncachedSize = [text boundingRectWithSize:maxSize options:options context:defaultCtx].size; + stopMeasuring(); + }]; + XCTAssertFalse([[defaultCtx valueForKey:@"cachesLayout"] boolValue]); + ctx.results[kTestCaseUIKit].userInfo[@"size"] = NSStringFromCGSize(uncachedSize); + + // Caching + NSStringDrawingContext *cachingCtx = [[NSStringDrawingContext alloc] init]; + [cachingCtx setValue:@YES forKey:@"cachesLayout"]; + [ctx addCaseWithName:kTestCaseUIKitPrivateCaching block:^(dispatch_block_t _Nonnull startMeasuring, dispatch_block_t _Nonnull stopMeasuring) { + startMeasuring(); + cachedSize = [text boundingRectWithSize:maxSize options:options context:cachingCtx].size; + stopMeasuring(); + }]; + ctx.results[kTestCaseUIKitPrivateCaching].userInfo[@"size"] = NSStringFromCGSize(cachedSize); + + XCTAssertTrue([ctx areAllUserInfosEqual]); + ASXCTAssertRelativePerformanceInRange(ctx, kTestCaseUIKitPrivateCaching, 1.5, FLT_MAX); +} + +#pragma mark Fixture Data + ++ (NSMutableAttributedString *)oneParagraphLatinText +{ + NSDictionary *attributes = @{ + NSFontAttributeName: [UIFont systemFontOfSize:14] + }; + return [[NSMutableAttributedString alloc] initWithString:@"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam gravida, metus non tincidunt tincidunt, arcu quam vulputate magna, nec semper libero mi in lorem. Quisque turpis erat, congue sit amet eros at, gravida gravida lacus. Maecenas maximus lectus in efficitur pulvinar. Nam elementum massa eget luctus condimentum. Curabitur egestas mauris urna. Fusce lacus ante, laoreet vitae leo quis, mattis aliquam est. Donec bibendum augue at elit lacinia lobortis. Cras imperdiet ac justo eget sollicitudin. Pellentesque malesuada nec tellus vitae dictum. Proin vestibulum tempus odio in condimentum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Duis vel turpis at velit dignissim rutrum. Nunc lorem felis, molestie eget ornare id, luctus at nunc. Maecenas suscipit nisi sit amet nulla cursus, id eleifend odio laoreet." attributes:attributes]; +} + ++ (NSMutableAttributedString *)twoParagraphLatinText +{ + NSDictionary *attributes = @{ + NSFontAttributeName: [UIFont systemFontOfSize:14] + }; + return [[NSMutableAttributedString alloc] initWithString:@"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam gravida, metus non tincidunt tincidunt, arcu quam vulputate magna, nec semper libero mi in lorem. Quisque turpis erat, congue sit amet eros at, gravida gravida lacus. Maecenas maximus lectus in efficitur pulvinar. Nam elementum massa eget luctus condimentum. Curabitur egestas mauris urna. Fusce lacus ante, laoreet vitae leo quis, mattis aliquam est. Donec bibendum augue at elit lacinia lobortis. Cras imperdiet ac justo eget sollicitudin. Pellentesque malesuada nec tellus vitae dictum. Proin vestibulum tempus odio in condimentum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Duis vel turpis at velit dignissim rutrum. Nunc lorem felis, molestie eget ornare id, luctus at nunc. Maecenas suscipit nisi sit amet nulla cursus, id eleifend odio laoreet.\n\nPellentesque auctor pulvinar velit, venenatis elementum ex tempus eu. Vestibulum iaculis hendrerit tortor quis sagittis. Pellentesque quam sem, varius ac orci nec, tincidunt ultricies mauris. Aliquam est nunc, eleifend et posuere sed, vestibulum eu elit. Pellentesque pharetra bibendum finibus. Aliquam interdum metus ac feugiat congue. Donec suscipit neque quis mauris volutpat, at molestie tortor aliquam. Aenean posuere nulla a ex posuere finibus. Integer tincidunt quam urna, et vulputate enim tempor sit amet. Nullam ut tellus ac arcu fringilla cursus." attributes:attributes]; +} +@end diff --git a/AsyncDisplayKitTests/ASTextNodeTests.m b/AsyncDisplayKitTests/ASTextNodeTests.m index e928a225..cb96f4fc 100644 --- a/AsyncDisplayKitTests/ASTextNodeTests.m +++ b/AsyncDisplayKitTests/ASTextNodeTests.m @@ -15,11 +15,8 @@ #import #import +#include "CGRect+ASConvenience.h" -static BOOL CGSizeEqualToSizeWithIn(CGSize size1, CGSize size2, CGFloat delta) -{ - return fabs(size1.width - size2.width) < delta && fabs(size1.height - size2.height) < delta; -} @interface ASTextNodeTestDelegate : NSObject