From 76a29aa75982a65018ef37ca18a02eb689ead670 Mon Sep 17 00:00:00 2001 From: Christopher Fuller Date: Thu, 7 Mar 2024 12:33:34 -0800 Subject: [PATCH] Improve tests (#367) --- .../LayoutItems/UIView+LayoutItemTests.swift | 2 +- .../LayoutItems/ViewLayoutItemTests.swift | 5 ++--- Tests/LayoutTests/LayoutItemTests.swift | 8 ++++---- Tests/LayoutTests/Swift/CollectionTests.swift | 14 ++++++-------- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/Tests/LayoutTests/LayoutItem/LayoutItems/UIView+LayoutItemTests.swift b/Tests/LayoutTests/LayoutItem/LayoutItems/UIView+LayoutItemTests.swift index b0316787..85b9a0fb 100644 --- a/Tests/LayoutTests/LayoutItem/LayoutItems/UIView+LayoutItemTests.swift +++ b/Tests/LayoutTests/LayoutItem/LayoutItems/UIView+LayoutItemTests.swift @@ -34,7 +34,7 @@ final class UIViewLayoutItemTests: XCTestCase { // THEN - expect(view.superviewConstraints(UIView())).to(beEmpty()) + expect(view.superviewConstraints(view)).to(beEmpty()) } func testLayoutBoundary() { diff --git a/Tests/LayoutTests/LayoutItem/LayoutItems/ViewLayoutItemTests.swift b/Tests/LayoutTests/LayoutItem/LayoutItems/ViewLayoutItemTests.swift index 6a9da95d..fca8ce35 100644 --- a/Tests/LayoutTests/LayoutItem/LayoutItems/ViewLayoutItemTests.swift +++ b/Tests/LayoutTests/LayoutItem/LayoutItems/ViewLayoutItemTests.swift @@ -18,7 +18,6 @@ final class ViewLayoutItemTests: XCTestCase { // GIVEN - let superview: UIView = .init() let view: UIView = .init() let constraint: NSLayoutConstraint = .init() var layoutItems: [LayoutItem] = [] @@ -36,12 +35,12 @@ final class ViewLayoutItemTests: XCTestCase { // WHEN - let superviewConstraints: [NSLayoutConstraint] = viewLayoutItem.superviewConstraints(superview) + let superviewConstraints: [NSLayoutConstraint] = viewLayoutItem.superviewConstraints(viewLayoutItem) // THEN expect(superviewConstraints === [constraint]) == true - expect(layoutItems === [superview]) == true + expect(layoutItems === [viewLayoutItem]) == true } func testLayoutBoundary() { diff --git a/Tests/LayoutTests/LayoutItemTests.swift b/Tests/LayoutTests/LayoutItemTests.swift index 5d862eea..8bef21a6 100644 --- a/Tests/LayoutTests/LayoutItemTests.swift +++ b/Tests/LayoutTests/LayoutItemTests.swift @@ -730,7 +730,7 @@ final class LayoutItemTests: XCTestCase { // THEN - expect(item.superviewConstraints(view)).to(throwAssertion()) + expect(item.superviewConstraints(item)).to(throwAssertion()) // WHEN @@ -738,7 +738,7 @@ final class LayoutItemTests: XCTestCase { // THEN - expect(item.superviewConstraints(view).count) == 4 + expect(item.superviewConstraints(item).count) == 4 } func testToMarginsInsetsPriorityDirectional() { @@ -882,7 +882,7 @@ final class LayoutItemTests: XCTestCase { // THEN - expect(item.superviewConstraints(view)).to(throwAssertion()) + expect(item.superviewConstraints(item)).to(throwAssertion()) // WHEN @@ -890,7 +890,7 @@ final class LayoutItemTests: XCTestCase { // THEN - expect(item.superviewConstraints(view).count) == 4 + expect(item.superviewConstraints(item).count) == 4 } func testToSafeAreaInsetsPriorityDirectional() { diff --git a/Tests/LayoutTests/Swift/CollectionTests.swift b/Tests/LayoutTests/Swift/CollectionTests.swift index a31a0496..7d615444 100644 --- a/Tests/LayoutTests/Swift/CollectionTests.swift +++ b/Tests/LayoutTests/Swift/CollectionTests.swift @@ -19,9 +19,8 @@ final class CollectionTests: XCTestCase { // GIVEN let view1: UIView = .init() - let subview1: UIView = .init() let widthConstraint1: NSLayoutConstraint = .init( - item: subview1, + item: view1, attribute: .width, relatedBy: .equal, toItem: nil, @@ -30,7 +29,7 @@ final class CollectionTests: XCTestCase { constant: 100 ) let heightConstraint1: NSLayoutConstraint = .init( - item: subview1, + item: view1, attribute: .height, relatedBy: .equal, toItem: nil, @@ -38,12 +37,11 @@ final class CollectionTests: XCTestCase { multiplier: 1, constant: 100 ) - let layout1: Layout = .init(view1, subview1) + let layout1: Layout = .init(view1) let view2: UIView = .init() - let subview2: UIView = .init() let widthConstraint2: NSLayoutConstraint = .init( - item: subview1, + item: view1, attribute: .width, relatedBy: .equal, toItem: nil, @@ -52,7 +50,7 @@ final class CollectionTests: XCTestCase { constant: 100 ) let heightConstraint2: NSLayoutConstraint = .init( - item: subview2, + item: view2, attribute: .height, relatedBy: .equal, toItem: nil, @@ -60,7 +58,7 @@ final class CollectionTests: XCTestCase { multiplier: 1, constant: 100 ) - let layout2: Layout = .init(view2, subview2) + let layout2: Layout = .init(view2) let layouts: [Layout] = [layout1, layout2]