[ASImageNode+AnimatedImage] Fix early return when animatedImage is ni…

…l in setAnimatedImage #trivial (#925) * [ASNetworkImageNodeTests] Add defaultImage test and improve image test. #trivial * [ASImageNode+AnimatedImage] Fix early return when animatedImage is nil in setAnimatedImage. #trivial
TextureGroup · May 21, 2018 · ede9a7f · ede9a7f
1 parent b9ae6c4
commit ede9a7f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/Source/ASImageNode+AnimatedImage.mm b/Source/ASImageNode+AnimatedImage.mm
@@ -50,7 +50,7 @@ - (void)setAnimatedImage:(id <ASAnimatedImageProtocol>)animatedImage
 
 - (void)_locked_setAnimatedImage:(id <ASAnimatedImageProtocol>)animatedImage
 {
-  if (ASObjectIsEqual(_animatedImage, animatedImage) && animatedImage.playbackReady) {
+  if (ASObjectIsEqual(_animatedImage, animatedImage) && (animatedImage == nil || animatedImage.playbackReady)) {
     return;
   }
 

diff --git a/Tests/ASNetworkImageNodeTests.m b/Tests/ASNetworkImageNodeTests.m
@@ -81,10 +81,29 @@ - (void)testThatSettingAnImageWillStayForEnteringAndExitingPreloadState
   UIImage *image = [[UIImage alloc] init];
   ASNetworkImageNode *networkImageNode = [[ASNetworkImageNode alloc] init];
   networkImageNode.image = image;
+  [networkImageNode enterHierarchyState:ASHierarchyStateRangeManaged];  // Ensures didExitPreloadState is called
+  XCTAssertEqualObjects(image, networkImageNode.image);
   [networkImageNode enterInterfaceState:ASInterfaceStatePreload];
   XCTAssertEqualObjects(image, networkImageNode.image);
   [networkImageNode exitInterfaceState:ASInterfaceStatePreload];
   XCTAssertEqualObjects(image, networkImageNode.image);
+  [networkImageNode exitHierarchyState:ASHierarchyStateRangeManaged];
+  XCTAssertEqualObjects(image, networkImageNode.image);
+}
+
+- (void)testThatSettingADefaultImageWillStayForEnteringAndExitingPreloadState
+{
+  UIImage *image = [[UIImage alloc] init];
+  ASNetworkImageNode *networkImageNode = [[ASNetworkImageNode alloc] init];
+  networkImageNode.defaultImage = image;
+  [networkImageNode enterHierarchyState:ASHierarchyStateRangeManaged];  // Ensures didExitPreloadState is called
+  XCTAssertEqualObjects(image, networkImageNode.defaultImage);
+  [networkImageNode enterInterfaceState:ASInterfaceStatePreload];
+  XCTAssertEqualObjects(image, networkImageNode.defaultImage);
+  [networkImageNode exitInterfaceState:ASInterfaceStatePreload];
+  XCTAssertEqualObjects(image, networkImageNode.defaultImage);
+  [networkImageNode exitHierarchyState:ASHierarchyStateRangeManaged];
+  XCTAssertEqualObjects(image, networkImageNode.defaultImage);
 }
 
 @end