Fix isTruncated logic in ASTextNode2 (TextureGroup#1259)

* Fix isTruncated logic in ASTextNode2 * Add truncation tests
wsdwsd0829 · Mar 15, 2019 · 10d1a6d · 10d1a6d
1 parent 15243ba
commit 10d1a6d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -1145,7 +1145,7 @@ - (void)setTruncationMode:(NSLineBreakMode)truncationMode
 
 - (BOOL)isTruncated
 {
-  return ASLockedSelf([self locked_textLayoutForSize:[self _locked_threadSafeBounds].size].truncatedLine == nil);
+  return ASLockedSelf([self locked_textLayoutForSize:[self _locked_threadSafeBounds].size].truncatedLine != nil);
 }
 
 - (BOOL)shouldTruncateForConstrainedSize:(ASSizeRange)constrainedSize

diff --git a/Tests/ASTextNode2Tests.mm b/Tests/ASTextNode2Tests.mm
@@ -12,6 +12,7 @@
 
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
 #import <AsyncDisplayKit/ASTextNode2.h>
+#import <AsyncDisplayKit/ASTextNode+Beta.h>
 
 #import <XCTest/XCTest.h>
 
@@ -63,6 +64,14 @@ - (void)setUp
   _textNode.attributedText = _attributedText;
 }
 
+- (void)testTruncation
+{
+  XCTAssertTrue([(ASTextNode *)_textNode shouldTruncateForConstrainedSize:ASSizeRangeMake(CGSizeMake(100, 100))], @"Text Node should truncate");
+
+  _textNode.frame = CGRectMake(0, 0, 100, 100);
+  XCTAssertTrue(_textNode.isTruncated, @"Text Node should be truncated");
+}
+
 - (void)testAccessibility
 {
   XCTAssertTrue(_textNode.isAccessibilityElement, @"Should be an accessibility element");

diff --git a/Tests/ASTextNodeTests.mm b/Tests/ASTextNodeTests.mm
@@ -16,6 +16,7 @@
 #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>
@@ -102,6 +103,14 @@ - (void)testAllocASTextNode
 
 #pragma mark - ASTextNode
 
+- (void)testTruncation
+{
+  XCTAssertTrue([_textNode shouldTruncateForConstrainedSize:ASSizeRangeMake(CGSizeMake(100, 100))], @"");
+
+  _textNode.frame = CGRectMake(0, 0, 100, 100);
+  XCTAssertTrue(_textNode.isTruncated, @"Text Node should be truncated");
+}
+
 - (void)testSettingTruncationMessage
 {
   NSAttributedString *truncation = [[NSAttributedString alloc] initWithString:@"..." attributes:nil];