Skip to content

Commit

Permalink
Update test imports
Browse files Browse the repository at this point in the history
  • Loading branch information
maicki committed Dec 16, 2018
1 parent ee9ecc4 commit 7f8ff85
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 30 deletions.
10 changes: 6 additions & 4 deletions Tests/ASConfigurationTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
//

#import <XCTest/XCTest.h>

#import <AsyncDisplayKit/ASAvailability.h>
#import <AsyncDisplayKit/ASConfiguration.h>
#import <AsyncDisplayKit/ASConfigurationDelegate.h>
#import <AsyncDisplayKit/ASConfigurationInternal.h>

#import "ASTestCase.h"
#import "ASAvailability.h"
#import "ASConfiguration.h"
#import "ASConfigurationDelegate.h"
#import "ASConfigurationInternal.h"

static ASExperimentalFeatures features[] = {
ASExperimentalGraphicsContexts,
Expand Down
3 changes: 2 additions & 1 deletion Tests/ASDimensionTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
//

#import <XCTest/XCTest.h>
#import "ASXCTExtensions.h"
#import <AsyncDisplayKit/ASDimension.h>

#import "ASXCTExtensions.h"


@interface ASDimensionTests : XCTestCase
@end
Expand Down
4 changes: 2 additions & 2 deletions Tests/ASDisplayNodeAppearanceTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
//

#import <objc/runtime.h>

#import <UIKit/UIKit.h>

#import <objc/runtime.h>

#import <XCTest/XCTest.h>

#import <AsyncDisplayKit/_ASDisplayView.h>
Expand Down
3 changes: 2 additions & 1 deletion Tests/ASDisplayNodeLayoutTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@

#import "ASXCTExtensions.h"
#import <AsyncDisplayKit/AsyncDisplayKit.h>
#import "ASLayoutSpecSnapshotTestsHelper.h"
#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
#import <stdatomic.h>

#import "ASLayoutSpecSnapshotTestsHelper.h"

@interface ASDisplayNodeLayoutTests : XCTestCase
@end

Expand Down
6 changes: 3 additions & 3 deletions Tests/ASDisplayNodeTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
//

#import <QuartzCore/QuartzCore.h>

#import "ASXCTExtensions.h"
#import <XCTest/XCTest.h>

#import <AsyncDisplayKit/_ASDisplayLayer.h>
Expand All @@ -19,7 +17,6 @@
#import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
#import <AsyncDisplayKit/ASDisplayNodeInternal.h>
#import <AsyncDisplayKit/ASDisplayNodeCornerLayerDelegate.h>
#import "ASDisplayNodeTestsHelper.h"
#import <AsyncDisplayKit/UIView+ASConvenience.h>
#import <AsyncDisplayKit/ASCellNode.h>
#import <AsyncDisplayKit/ASEditableTextNode.h>
Expand All @@ -34,6 +31,9 @@
#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
#import <AsyncDisplayKit/ASViewController.h>

#import "ASXCTExtensions.h"
#import "ASDisplayNodeTestsHelper.h"

// Conveniences for making nodes named a certain way
#define DeclareNodeNamed(n) ASDisplayNode *n = [[ASDisplayNode alloc] init]; n.debugName = @#n
#define DeclareViewNamed(v) \
Expand Down
4 changes: 2 additions & 2 deletions Tests/ASDisplayViewAccessibilityTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#import <AsyncDisplayKit/ASDisplayNode.h>
#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
#import <AsyncDisplayKit/ASTextNode.h>
#import "ASConfiguration.h"
#import "ASConfigurationInternal.h"
#import <AsyncDisplayKit/ASConfiguration.h>
#import <AsyncDisplayKit/ASConfigurationInternal.h>

@interface ASDisplayViewAccessibilityTests : XCTestCase
@end
Expand Down
2 changes: 1 addition & 1 deletion Tests/ASNavigationControllerTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//

#import <XCTest/XCTest.h>

#import <AsyncDisplayKit/AsyncDisplayKit.h>
#import "ASNavigationController.h"

@interface ASNavigationControllerTests : XCTestCase
@end
Expand Down
1 change: 1 addition & 0 deletions Tests/ASRunLoopQueueTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#import "ASTestCase.h"

#import <AsyncDisplayKit/ASRunLoopQueue.h>

#import "ASDisplayNodeTestsHelper.h"

static NSTimeInterval const kRunLoopRunTime = 0.001; // Allow the RunLoop to run for one millisecond each time.
Expand Down
2 changes: 2 additions & 0 deletions Tests/ASScrollNodeTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@

#import <UIKit/UIKit.h>
#import <XCTest/XCTest.h>

#import <AsyncDisplayKit/AsyncDisplayKit.h>

#import "ASXCTExtensions.h"

@interface ASScrollNodeTests : XCTestCase
Expand Down
2 changes: 1 addition & 1 deletion Tests/ASTLayoutFixture.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
//

#import <Foundation/Foundation.h>
#import <AsyncDisplayKit/AsyncDisplayKit.h>

#import "ASTestCase.h"
#import "ASLayoutTestNode.h"

Expand Down
4 changes: 2 additions & 2 deletions Tests/ASTabBarControllerTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
//

#import <XCTest/XCTest.h>
#import "ASTabBarController.h"
#import "ASViewController.h"
#import <AsyncDisplayKit/ASTabBarController.h>
#import <AsyncDisplayKit/ASViewController.h>

@interface ASTabBarControllerTests: XCTestCase

Expand Down
5 changes: 3 additions & 2 deletions Tests/ASTableViewTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
//

#import <XCTest/XCTest.h>
#import <JGMethodSwizzler/JGMethodSwizzler.h>

#import <AsyncDisplayKit/AsyncDisplayKit.h>
#import <AsyncDisplayKit/ASTableView.h>
Expand All @@ -16,10 +17,10 @@
#import <AsyncDisplayKit/ASCellNode.h>
#import <AsyncDisplayKit/ASTableNode.h>
#import <AsyncDisplayKit/ASTableView+Undeprecated.h>
#import <JGMethodSwizzler/JGMethodSwizzler.h>
#import "ASXCTExtensions.h"
#import <AsyncDisplayKit/ASInternalHelpers.h>

#import "ASXCTExtensions.h"

#define NumberOfSections 10
#define NumberOfReloadIterations 50

Expand Down
4 changes: 2 additions & 2 deletions Tests/ASTextNode2Tests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

#import <CoreText/CoreText.h>

#import "ASTestCase.h"
#import <XCTest/XCTest.h>

#import <AsyncDisplayKit/ASDisplayNode+Beta.h>
#import <AsyncDisplayKit/ASTextNode2.h>
#import <AsyncDisplayKit/ASTextNode+Beta.h>

#import <XCTest/XCTest.h>
#import "ASTestCase.h"

@interface ASTextNode2Tests : XCTestCase

Expand Down
3 changes: 2 additions & 1 deletion Tests/ASTextNodePerformanceTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@
#import <AsyncDisplayKit/ASTextNode.h>
#import <AsyncDisplayKit/ASLayout.h>
#import <AsyncDisplayKit/ASInternalHelpers.h>
#import "ASXCTExtensions.h"
#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>

#import "ASXCTExtensions.h"

/**
* NOTE: This test case is not run during the "test" action. You have to run it manually (click the little diamond.)
*/
Expand Down
8 changes: 4 additions & 4 deletions Tests/ASTextNodeTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@

#import <CoreText/CoreText.h>

#import "ASTestCase.h"

#import <XCTest/XCTest.h>
#import <OCMock/OCMock.h>

#import <AsyncDisplayKit/ASAvailability.h>
#import <AsyncDisplayKit/ASLayout.h>
#import <AsyncDisplayKit/ASTextNode.h>
#import <AsyncDisplayKit/ASTextNode+Beta.h>

#import <XCTest/XCTest.h>
#import <AsyncDisplayKit/CoreGraphics+ASConvenience.h>

#import "ASTestCase.h"



@interface ASTextNodeTestDelegate : NSObject <ASTextNodeDelegate>

Expand Down
6 changes: 4 additions & 2 deletions Tests/ASVideoNodeTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
// Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
//

#import <OCMock/OCMock.h>

#import <UIKit/UIKit.h>

#import <OCMock/OCMock.h>
#import <XCTest/XCTest.h>
#import <AVFoundation/AVFoundation.h>

#import <AsyncDisplayKit/AsyncDisplayKit.h>

#import "ASDisplayNodeTestsHelper.h"

@interface ASVideoNodeTests : XCTestCase <ASVideoNodeDelegate>
Expand Down
5 changes: 4 additions & 1 deletion Tests/ASViewControllerTests.mm
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@
//

#import <XCTest/XCTest.h>
#import <AsyncDisplayKit/AsyncDisplayKit.h>

#import <OCMock/OCMock.h>

#import <AsyncDisplayKit/AsyncDisplayKit.h>

#import "NSInvocation+ASTestHelpers.h"

@interface ASViewControllerTests : XCTestCase
Expand Down
3 changes: 2 additions & 1 deletion Tests/Common/ASTestCase.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@

// Not strictly necessary, but convenient
#import <OCMock/OCMock.h>

#import <AsyncDisplayKit/AsyncDisplayKit.h>

#import "OCMockObject+ASAdditions.h"
#import "ASConfigurationInternal.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down

0 comments on commit 7f8ff85

Please sign in to comment.