clean up from #139

Author: jessesquires

Sources/CollectionViewDriver.swift

@@ -578,6 +578,8 @@ extension CollectionViewDriver: UICollectionViewDelegateFlowLayout {
     }
 }
 
+// MARK: - CustomDebugStringConvertible
+
 extension CollectionViewDriver {
     override public var debugDescription: String {
         MainActor.assumeIsolated {

Sources/DebugDescriptions.swift

@@ -16,13 +16,13 @@ import Foundation
 private enum Element {
     case type(Any.Type)
     case index(Int)
+    case field(label: String, value: Any?)
     case header(AnySupplementaryViewModel?)
     case footer(AnySupplementaryViewModel?)
     case cells([AnyCellViewModel])
     case supplementaryViews([AnySupplementaryViewModel])
     case sections([SectionViewModel])
     case registrations(Set<ViewRegistration>)
-    case field(label: String, value: Any?)
     case options(CollectionViewDriverOptions)
     case viewModel(CollectionViewModel)
     case end
@@ -119,11 +119,7 @@ private func debugDescriptionBuilder<Target: TextOutputStream>(
             }
 
         case let .field(label, value):
-            if let value {
-                buildString("\(label): \(value)", indent: indent, to: &output)
-            } else {
-                buildString("\(label): nil", indent: indent, to: &output)
-            }
+            buildString("\(label): \(value ?? "nil")", indent: indent, to: &output)
 
         case let .options(options):
             buildString("options:", indent: indent, to: &output)

Tests/TestCollectionViewDriverOptions.swift

@@ -35,5 +35,20 @@ final class TestCollectionViewDriverOptions: XCTestCase {
 
             """
         )
+
+        let options2 = CollectionViewDriverOptions(
+            diffOnBackgroundQueue: true,
+            reloadDataOnReplacingViewModel: true
+        )
+        XCTAssertEqual(
+            options2.debugDescription,
+            """
+            CollectionViewDriverOptions {
+              diffOnBackgroundQueue: true
+              reloadDataOnReplacingViewModel: true
+            }
+
+            """
+        )
     }
 }

Tests/TestDebugDescriptionDriver.swift

@@ -23,9 +23,18 @@ final class TestDebugDescriptionDriver: XCTestCase {
     private static let contentSizePattern = #"\{\d+, \d+\}"# // {0, 0}
     private static let adjustedContentInsetPattern = #"\{\d+, \d+, \d+, \d+\}"# // {0, 0, 0, 0}
 
-    private let viewPattern = "<ReactiveCollectionsKitTests\\.FakeCollectionView: \(addressPattern); baseClass = UICollectionView; frame = \(framePattern); clipsToBounds = YES; gestureRecognizers = <NSArray: \(addressPattern)>; backgroundColor = <UIDynamicSystemColor: \(addressPattern); name = systemBackgroundColor>; layer = <CALayer: \(addressPattern)>; contentOffset: \(contentOffsetPattern); contentSize: \(contentSizePattern); adjustedContentInset: \(adjustedContentInsetPattern); layout: <ReactiveCollectionsKitTests\\.FakeCollectionLayout: \(addressPattern)>; dataSource: <ReactiveCollectionsKit\\.DiffableDataSource: \(addressPattern)>>"
-
-    private func XCTAssertEqualRegex(
+    private let viewPattern = """
+        <ReactiveCollectionsKitTests\\.FakeCollectionView: \(addressPattern);
+        baseClass = UICollectionView; frame = \(framePattern); clipsToBounds = YES;
+        gestureRecognizers = <NSArray: \(addressPattern)>;
+        backgroundColor = <UIDynamicSystemColor: \(addressPattern); name = systemBackgroundColor>;
+        layer = <CALayer: \(addressPattern)>; contentOffset: \(contentOffsetPattern);
+        contentSize: \(contentSizePattern); adjustedContentInset: \(adjustedContentInsetPattern);
+        layout: <ReactiveCollectionsKitTests\\.FakeCollectionLayout: \(addressPattern)>;
+        dataSource: <ReactiveCollectionsKit\\.DiffableDataSource: \(addressPattern)>>
+        """
+
+    private func assertEqualRegex(
         string: String,
         pattern: String,
         numMatches: Int = 1,
@@ -75,7 +84,7 @@ final class TestDebugDescriptionDriver: XCTestCase {
 
             """
 
-        try XCTAssertEqualRegex(string: driver.debugDescription, pattern: pattern)
+        try self.assertEqualRegex(string: driver.debugDescription, pattern: pattern)
     }
 
     @MainActor
@@ -131,7 +140,7 @@ final class TestDebugDescriptionDriver: XCTestCase {
 
             """
 
-        try XCTAssertEqualRegex(string: driver.debugDescription, pattern: pattern)
+        try self.assertEqualRegex(string: driver.debugDescription, pattern: pattern)
     }
 
     @MainActor
@@ -180,6 +189,6 @@ final class TestDebugDescriptionDriver: XCTestCase {
 
             """
 
-        try XCTAssertEqualRegex(string: driver.debugDescription, pattern: pattern)
+        try self.assertEqualRegex(string: driver.debugDescription, pattern: pattern)
     }
 }