fixed video tests

Author: lappp9

AsyncDisplayKit/ASVideoNode.mm

@@ -139,31 +139,6 @@ - (void)fetchData
   }
 }
 
-//- (void)fetchData
-//{
-//  [super fetchData];
-//  
-//  @try {
-//    [_currentItem removeObserver:self forKeyPath:NSStringFromSelector(@selector(status))];
-//  }
-//  @catch (NSException * __unused exception) {
-//    NSLog(@"unnecessary removal in fetch data");
-//  }
-//  
-//  {
-//    ASDN::MutexLocker l(_lock);
-//    
-//    _currentItem = [[AVPlayerItem alloc] initWithAsset:_asset];
-//    [_currentItem addObserver:self forKeyPath:NSStringFromSelector(@selector(status)) options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:NULL];
-//    
-//    [((AVPlayerLayer *)_playerNode.layer).player replaceCurrentItemWithPlayerItem:_currentItem];
-//  }
-//  
-//  if (_shouldAutoPlay) {
-//    [self play];
-//  }
-//}
-
 - (void)clearFetchedData
 {
   [super clearFetchedData];
@@ -281,6 +256,11 @@ - (void)pause;
   _playButton.alpha = 1.0;
 }
 
+- (AVPlayerItem *)currentItem
+{
+  return _currentItem;
+}
+
 - (void)dealloc
 {
   [[NSNotificationCenter defaultCenter] removeObserver:self];

AsyncDisplayKitTests/ASVideoNodeTests.m

@@ -11,35 +11,39 @@
 #import "ASVideoNode.h"
 
 @interface ASVideoNodeTests : XCTestCase
+@end
 
+@interface ASVideoNode ()
+@property (atomic, readonly) AVPlayerItem *currentItem;
+@property (atomic) ASInterfaceState interfaceState;
 @end
 
 @implementation ASVideoNodeTests
 
-- (void)testVideoNodeReplacesAVPlayerWhenNewURLIsSet {
+- (void)testVideoNodeReplacesAVPlayerItemWhenNewURLIsSet {
   ASVideoNode *videoNode = [[ASVideoNode alloc] init];
+  videoNode.interfaceState = ASInterfaceStateFetchData;
   videoNode.asset = [AVAsset assetWithURL:[NSURL URLWithString:@"firstURL"]];
-  [videoNode fetchData];
-  AVPlayer *player = ((AVPlayerLayer *)videoNode.layer).player;
+  
+  AVPlayerItem *item = [videoNode currentItem];
 
   videoNode.asset = [AVAsset assetWithURL:[NSURL URLWithString:@"secondURL"]];
-  [videoNode fetchData];
-  AVPlayer *secondPlayer = ((AVPlayerLayer *)videoNode.layer).player;
- 
-  XCTAssertNotEqualObjects(player, secondPlayer);
+  AVPlayerItem *secondItem = [videoNode currentItem];
+  
+  XCTAssertNotEqualObjects(item, secondItem);
 }
 
-- (void)testVideoNodeDoesNotMakeNewPlayerWhenURLIsTheSame {
+- (void)testVideoNodeDoesNotReplaceAVPlayerItemWhenSameURLIsSet {
   ASVideoNode *videoNode = [[ASVideoNode alloc] init];
+  videoNode.interfaceState = ASInterfaceStateFetchData;
+
   videoNode.asset = [AVAsset assetWithURL:[NSURL URLWithString:@"firstURL"]];
-  [videoNode fetchData];
+  AVPlayerItem *item = [videoNode currentItem];
 
-  AVPlayer *firstPlayer = ((AVPlayerLayer *)videoNode.layer).player;
   videoNode.asset = [AVAsset assetWithURL:[NSURL URLWithString:@"firstURL"]];
-
-  AVPlayer *secondPlayer = ((AVPlayerLayer *)videoNode.layer).player;
+  AVPlayerItem *secondItem = [videoNode currentItem];
 
-  XCTAssertEqualObjects(firstPlayer, secondPlayer);
+  XCTAssertEqualObjects(item, secondItem);
 }
 
 @end