kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-03-29 16:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[Layout] Rename ASLayoutable to ASLayoutElement (#2290)

Browse Source 
* [Layout API] Rename ASLayoutable to ASLayoutElement

* arg

* fix wrapperWithLayoutElement

* [Layout API] Rename ASLayoutable to ASLayoutElement

* arg

* address Michael's comments

* Remove ASLayoutValidation files that were deleted on master since this diff was created.
This commit is contained in:
Hannah Troisi
2016-09-29 00:02:47 -07:00
committed by appleguy
parent 1abc1a833c
commit 7551627b58
50 changed files with 719 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
AsyncDisplayKitTests/ASLayoutableStyleTests.m → AsyncDisplayKitTests/ASLayoutElementStyleTests.m
View File

@@ -1,5 +1,5 @@
//
// ASLayoutableStyleTests.mm
// ASLayoutElementStyleTests.mm
// AsyncDisplayKit
//
// Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
@@ -9,15 +9,15 @@
//
#import <XCTest/XCTest.h>
#import "ASLayoutable.h"
#import "ASLayoutElement.h"
#pragma mark - ASLayoutableStyleTestsDelegate
#pragma mark - ASLayoutElementStyleTestsDelegate
@interface ASLayoutableStyleTestsDelegate : NSObject<ASLayoutableStyleDelegate>
@interface ASLayoutElementStyleTestsDelegate : NSObject<ASLayoutElementStyleDelegate>
@property (copy, nonatomic) NSString *propertyNameChanged;
@end
@implementation ASLayoutableStyleTestsDelegate
@implementation ASLayoutElementStyleTestsDelegate
- (void)style:(id)style propertyDidChange:(NSString *)propertyName
{
@@ -26,17 +26,17 @@
@end
#pragma mark - ASLayoutableStyleTests
#pragma mark - ASLayoutElementStyleTests
@interface ASLayoutableStyleTests : XCTestCase
@interface ASLayoutElementStyleTests : XCTestCase
@end
@implementation ASLayoutableStyleTests
@implementation ASLayoutElementStyleTests
- (void)testSettingSizeProperties
{
ASLayoutableStyle *style = [ASLayoutableStyle new];
ASLayoutElementStyle *style = [ASLayoutElementStyle new];
style.width = ASDimensionMake(100);
style.height = ASDimensionMake(100);
@@ -46,7 +46,7 @@
- (void)testSettingSizeViaHelper
{
ASLayoutableStyle *style = [ASLayoutableStyle new];
ASLayoutElementStyle *style = [ASLayoutElementStyle new];
[style setSizeWithCGSize:CGSizeMake(100, 100)];
XCTAssertTrue(ASDimensionEqualToDimension(style.width, ASDimensionMake(100)));
@@ -55,7 +55,7 @@
- (void)testSettingExactSize
{
ASLayoutableStyle *style = [ASLayoutableStyle new];
ASLayoutElementStyle *style = [ASLayoutElementStyle new];
[style setExactSizeWithCGSize:CGSizeMake(100, 100)];
XCTAssertTrue(ASDimensionEqualToDimension(style.minWidth, ASDimensionMake(100)));
@@ -66,12 +66,12 @@
- (void)testSettingPropertiesWillCallDelegate
{
ASLayoutableStyleTestsDelegate *delegate = [ASLayoutableStyleTestsDelegate new];
ASLayoutableStyle *style = [[ASLayoutableStyle alloc] initWithDelegate:delegate];
ASLayoutElementStyleTestsDelegate *delegate = [ASLayoutElementStyleTestsDelegate new];
ASLayoutElementStyle *style = [[ASLayoutElementStyle alloc] initWithDelegate:delegate];
XCTAssertTrue(ASDimensionEqualToDimension(style.width, ASDimensionAuto));
style.width = ASDimensionMake(100);
XCTAssertTrue(ASDimensionEqualToDimension(style.width, ASDimensionMake(100)));
XCTAssertTrue([delegate.propertyNameChanged isEqualToString:ASLayoutableStyleWidthProperty]);
XCTAssertTrue([delegate.propertyNameChanged isEqualToString:ASLayoutElementStyleWidthProperty]);
}
@end

2
AsyncDisplayKitTests/ASStackLayoutSpecSnapshotTests.mm
View File

@@ -48,7 +48,7 @@ static void setCGSizeToNode(CGSize size, ASDisplayNode *node)
node.style.height = ASDimensionMakeWithPoints(size.height);
}
- (void)testDefaultStackLayoutableFlexProperties
- (void)testDefaultStackLayoutElementFlexProperties
{
ASDisplayNode *displayNode = [[ASDisplayNode alloc] init];