ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-21 05:39:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make tests use CALayer.asyncdisplaykit_node.name rather than CALayer.asyncdisplaykit_name as needed

Browse Source
This commit is contained in:
Adlai Holler 2015-10-24 10:58:09 -07:00
parent 0d53a82985
commit 99113388a8
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AsyncDisplayKitTests/ASDisplayNodeAppearanceTests.m
View File

@ -57,8 +57,11 @@ static dispatch_block_t modifyMethodByAddingPrologueBlockAndReturnCleanupBlock(C
@end @end
#define DeclareNodeNamed(n) ASDisplayNode *n = [[ASDisplayNode alloc] init]; n.name = @#n #define DeclareNodeNamed(n) ASDisplayNode *n = [[ASDisplayNode alloc] init]; n.name = @#n
#define DeclareViewNamed(v) UIView *v = [[UIView alloc] init]; v.layer.asyncdisplaykit_name = @#v
#define DeclareLayerNamed(l) CALayer *l = [[CALayer alloc] init]; l.asyncdisplaykit_name = @#l // FIXME: It's goofy to use `setValue:forKey:` here but importing ASDisplayNodeInternal.h
// in this file causes build to fail (compiler chokes at ASDN::RecursiveMutex)
#define DeclareViewNamed(v) UIView *v = [[UIView alloc] init]; [v.layer setValue:@#v forKey:@"asyncdisplaykit_node.name"]
#define DeclareLayerNamed(l) CALayer *l = [[CALayer alloc] init]; [l setValue:@#l forKey:@"asyncdisplaykit_node.name"]
@implementation ASDisplayNodeAppearanceTests @implementation ASDisplayNodeAppearanceTests
{ {

13
AsyncDisplayKitTests/ASDisplayNodeTests.m
View File

@ -19,19 +19,22 @@
// Conveniences for making nodes named a certain way // Conveniences for making nodes named a certain way
#define DeclareNodeNamed(n) ASDisplayNode *n = [[ASDisplayNode alloc] init]; n.name = @#n #define DeclareNodeNamed(n) ASDisplayNode *n = [[ASDisplayNode alloc] init]; n.name = @#n
#define DeclareViewNamed(v) UIView *v = [[UIView alloc] init]; v.layer.asyncdisplaykit_name = @#v
#define DeclareLayerNamed(l) CALayer *l = [[CALayer alloc] init]; l.asyncdisplaykit_name = @#l // FIXME: It's goofy to use `setValue:forKey:` here but importing ASDisplayNodeInternal.h
// in this file causes build to fail (compiler chokes at ASDN::RecursiveMutex)
#define DeclareViewNamed(v) UIView *v = [[UIView alloc] init]; [v.layer setValue:@#v forKey:@"asyncdisplaykit_node.name"]
#define DeclareLayerNamed(l) CALayer *l = [[CALayer alloc] init]; [l setValue:@#l forKey:@"asyncdisplaykit_node.name"]
static NSString *orderStringFromSublayers(CALayer *l) { static NSString *orderStringFromSublayers(CALayer *l) {
return [[[l.sublayers valueForKey:@"asyncdisplaykit_name"] allObjects] componentsJoinedByString:@","]; return [[l.sublayers valueForKey:@"asyncdisplaykit_node.name"] componentsJoinedByString:@","];
} }
static NSString *orderStringFromSubviews(UIView *v) { static NSString *orderStringFromSubviews(UIView *v) {
return [[[v.subviews valueForKeyPath:@"layer.asyncdisplaykit_name"] allObjects] componentsJoinedByString:@","]; return [[v.subviews valueForKeyPath:@"layer.asyncdisplaykit_node.name"] componentsJoinedByString:@","];
} }
static NSString *orderStringFromSubnodes(ASDisplayNode *n) { static NSString *orderStringFromSubnodes(ASDisplayNode *n) {
return [[[n.subnodes valueForKey:@"name"] allObjects] componentsJoinedByString:@","]; return [[n.subnodes valueForKey:@"name"] componentsJoinedByString:@","];
} }
// Asserts subnode, subview, sublayer order match what you provide here // Asserts subnode, subview, sublayer order match what you provide here