Skip to content

Commit f842df5

Browse files
committed
Move AbsolutionPositionContentTests to InsetTests
1 parent ff83132 commit f842df5

File tree

3 files changed

+41
-78
lines changed

3 files changed

+41
-78
lines changed

FlexLayout.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
24AE97411FEAF30A00995987 /* UIView+FlexLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE97321FEAF30A00995987 /* UIView+FlexLayout.swift */; };
1515
24AE97421FEAF30A00995987 /* Percent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE97331FEAF30A00995987 /* Percent.swift */; };
1616
24AE974A1FEAF30A00995987 /* YGLayoutExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 24AE973D1FEAF30A00995987 /* YGLayoutExtensions.swift */; };
17-
711F2EE62ACC727000DDDD67 /* AbsolutionPositionContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE02ACC727000DDDD67 /* AbsolutionPositionContentTests.swift */; };
1817
711F2EE72ACC727000DDDD67 /* WidthSizeContentTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE12ACC727000DDDD67 /* WidthSizeContentTests.swift */; };
1918
711F2EE82ACC727000DDDD67 /* PaddingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE22ACC727000DDDD67 /* PaddingTests.swift */; };
2019
711F2EE92ACC727000DDDD67 /* FlexLayoutTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F2EE32ACC727000DDDD67 /* FlexLayoutTests.swift */; };
@@ -139,7 +138,6 @@
139138
24DA37631EF843C500D1AB2F /* FlexLayoutTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FlexLayoutTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
140139
2B210ECFE9D7665DACB8E8A7 /* Pods-FlexLayoutTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutTests.debug.xcconfig"; path = "Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests.debug.xcconfig"; sourceTree = "<group>"; };
141140
38E690AA4AF8EDFC95DB6626 /* Pods-FlexLayoutTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FlexLayoutTests.release.xcconfig"; path = "Target Support Files/Pods-FlexLayoutTests/Pods-FlexLayoutTests.release.xcconfig"; sourceTree = "<group>"; };
142-
711F2EE02ACC727000DDDD67 /* AbsolutionPositionContentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AbsolutionPositionContentTests.swift; sourceTree = "<group>"; };
143141
711F2EE12ACC727000DDDD67 /* WidthSizeContentTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WidthSizeContentTests.swift; sourceTree = "<group>"; };
144142
711F2EE22ACC727000DDDD67 /* PaddingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PaddingTests.swift; sourceTree = "<group>"; };
145143
711F2EE32ACC727000DDDD67 /* FlexLayoutTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FlexLayoutTests.swift; sourceTree = "<group>"; };
@@ -306,7 +304,6 @@
306304
711F2EDF2ACC727000DDDD67 /* FlexLayoutTests */ = {
307305
isa = PBXGroup;
308306
children = (
309-
711F2EE02ACC727000DDDD67 /* AbsolutionPositionContentTests.swift */,
310307
711F2EE12ACC727000DDDD67 /* WidthSizeContentTests.swift */,
311308
711F2EE22ACC727000DDDD67 /* PaddingTests.swift */,
312309
711F2EE32ACC727000DDDD67 /* FlexLayoutTests.swift */,
@@ -718,7 +715,6 @@
718715
711F2EEA2ACC727000DDDD67 /* MarginTests.swift in Sources */,
719716
711F2EE92ACC727000DDDD67 /* FlexLayoutTests.swift in Sources */,
720717
711F2EE82ACC727000DDDD67 /* PaddingTests.swift in Sources */,
721-
711F2EE62ACC727000DDDD67 /* AbsolutionPositionContentTests.swift in Sources */,
722718
711F2EEB2ACC727000DDDD67 /* JustifyContentTests.swift in Sources */,
723719
EF5445402C1D607100BF4A33 /* InsetTests.swift in Sources */,
724720
711F2EE72ACC727000DDDD67 /* WidthSizeContentTests.swift in Sources */,

Tests/FlexLayoutTests/AbsolutionPositionContentTests.swift

Lines changed: 0 additions & 71 deletions
This file was deleted.

Tests/FlexLayoutTests/InsetTests.swift

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ final class InsetTests: XCTestCase {
2121

2222
override func setUp() {
2323
super.setUp()
24-
24+
2525
viewController = UIViewController()
26-
26+
2727
rootFlexContainer = UIView()
2828
rootFlexContainer.frame = CGRect(x: 0, y: 0, width: 400, height: 400)
2929
viewController.view.addSubview(rootFlexContainer)
30-
30+
3131
aView = UIView()
3232
}
3333

@@ -78,4 +78,42 @@ final class InsetTests: XCTestCase {
7878
rootFlexContainer.flex.layout()
7979
XCTAssertEqual(aView.frame, CGRect(x: 0.0, y: 10.0, width: 400.0, height: 400.0))
8080
}
81+
82+
func test_adjust_the_aView_size_absolute_position_with_left_right() {
83+
rootFlexContainer.flex.define { flex in
84+
flex.addItem(aView).position(.absolute).left(10).right(10).width(300).height(200)
85+
}
86+
87+
rootFlexContainer.flex.layout()
88+
XCTAssertEqual(aView.frame, CGRect(x: 10.0, y: 0.0, width: 300.0, height: 200.0))
89+
}
90+
91+
func test_adjust_the_aView_size_absolute_position_with_right() {
92+
rootFlexContainer.flex.define { flex in
93+
flex.addItem(aView).position(.absolute).left(10).right(10).width(300).height(200)
94+
}
95+
96+
// Later reset the aspectRatio
97+
aView.flex.left(0)
98+
rootFlexContainer.flex.layout()
99+
XCTAssertEqual(aView.frame, CGRect(x: 0.0, y: 0.0, width: 300.0, height: 200.0))
100+
}
101+
102+
func test_adjust_the_aView_size_absolute_position_with_horizontally_vertically() {
103+
rootFlexContainer.flex.define { flex in
104+
flex.addItem(aView).position(.absolute).horizontally(15).vertically(20)
105+
}
106+
107+
rootFlexContainer.flex.layout()
108+
XCTAssertEqual(aView.frame, CGRect(x: 15.0, y: 20.0, width: 370.0, height: 360.0))
109+
}
110+
111+
func test_adjust_the_aView_size_absolute_position_with_horizontally_all() {
112+
rootFlexContainer.flex.define { flex in
113+
flex.addItem(aView).position(.absolute).all(45)
114+
}
115+
116+
rootFlexContainer.flex.layout()
117+
XCTAssertEqual(aView.frame, CGRect(x: 45.0, y: 45.0, width: 310.0, height: 310.0))
118+
}
81119
}

0 commit comments

Comments
 (0)