Merge Test Support Module #71
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
An attempt to fix #70.
stephencelis
commented
May 11, 2020
| @@ -1,16 +0,0 @@ | |||
| { | |||
There was a problem hiding this comment.
Deleting an old file.
stephencelis
commented
May 11, 2020
| @@ -24,6 +24,8 @@ | |||
| CAF7FD82245C83B40081E4C3 /* IfLetSubscript.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAF7FD81245C83B40081E4C3 /* IfLetSubscript.swift */; }; | |||
| DC07231724465D1E003A8B65 /* 02-Effects-TimersTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC07231624465D1E003A8B65 /* 02-Effects-TimersTests.swift */; }; | |||
| DC072322244663B1003A8B65 /* 03-Navigation-Sheet-LoadThenPresent.swift in Sources */ = {isa = PBXBuildFile; fileRef = DC072321244663B1003A8B65 /* 03-Navigation-Sheet-LoadThenPresent.swift */; }; | |||
| DC13940E2469E25C00EE1157 /* ComposableArchitecture in Frameworks */ = {isa = PBXBuildFile; productRef = DC13940D2469E25C00EE1157 /* ComposableArchitecture */; }; | |||
There was a problem hiding this comment.
A bit of churn in every Xcode project since we have to remove the old, dynamic SPM library and use the new static one.
stephencelis
commented
May 11, 2020
Makefile
Outdated
| @@ -59,6 +59,6 @@ test-workspace: | |||
| -quiet | |||
|
|
|||
| format: | |||
| swift format --in-place --recursive . | |||
| swift format --ignore-unparsable-files --in-place --recursive . | |||
There was a problem hiding this comment.
Swift-format trips up on @convention(c).
stephencelis
commented
May 11, 2020
Comment on lines
416
to
435
| private func _XCTFail(_ message: String = "", file: StaticString = #file, line: UInt = #line) { | ||
| guard | ||
| let _XCTest = NSClassFromString("XCTest") | ||
| .flatMap(Bundle.init(for:)) | ||
| .flatMap({ $0.executablePath }) | ||
| .flatMap({ dlopen($0, RTLD_NOW) }) | ||
| else { return } | ||
|
|
||
| guard | ||
| let _XCTFailureHandler = dlsym(_XCTest, "_XCTFailureHandler") | ||
| .map({ unsafeBitCast($0, to: XCTFailureHandler.self) }) | ||
| else { return } | ||
|
|
||
| guard | ||
| let _XCTCurrentTestCase = dlsym(_XCTest, "_XCTCurrentTestCase") | ||
| .map({ unsafeBitCast($0, to: XCTCurrentTestCase.self) }) | ||
| else { return } | ||
|
|
||
| _XCTFailureHandler(_XCTCurrentTestCase(), true, "\(file)", line, message, nil) | ||
| } |
There was a problem hiding this comment.
This is the dark magic that allows us to hook into XCTest dynamically.
stephencelis
commented
May 11, 2020
| @@ -0,0 +1,3 @@ | |||
| typealias XCTCurrentTestCase = @convention(c) () -> AnyObject | |||
| typealias XCTFailureHandler | |||
| = @convention(c) (AnyObject, Bool, UnsafePointer<CChar>, UInt, String, String?) -> Void | |||
There was a problem hiding this comment.
Moved these into their own file since swift-format breaks on them and we still would like TestStore.swift to be formatted.
There was a problem hiding this comment.
Actually turns out that swift-format tripped on them only when they were referenced inline (@convention(c) (...) -> ...).self.
They format fine as type aliases!
stephencelis
commented
May 11, 2020
Comment on lines
-3
to
-24
| extension Reducer { | ||
| public func callAsFunction( | ||
| _ state: State, | ||
| _ action: Action, | ||
| _ environment: Environment | ||
| ) -> (State, Effect<Action, Never>) { | ||
| var state = state | ||
| let effects = self.callAsFunction(&state, action, environment) | ||
| return (state, effects) | ||
| } | ||
| } | ||
|
|
||
| extension Reducer where Environment == Void { | ||
| public func callAsFunction( | ||
| _ state: State, | ||
| _ action: Action | ||
| ) -> State { | ||
| var state = state | ||
| _ = self.callAsFunction(&state, action) | ||
| return state | ||
| } | ||
| } |
There was a problem hiding this comment.
Deleted these convenience functions...it seems rare to test a reducer by calling it directly so it seems like surface area we can trim.
This was referenced May 11, 2020
mbrandonw
reviewed
May 11, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An attempt to fix #70.