-
Notifications
You must be signed in to change notification settings - Fork 99
Add protocol-level @available annotation inheritance to generated mocks #315
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Keitaro0226
wants to merge
8
commits into
uber:master
Choose a base branch
from
Keitaro0226:fix-available-annotation-handling
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
0261032
Add protocol-level @available annotation inheritance to generated mocks
Keitaro0226 b5cf99e
Merge remote-tracking branch 'upstream/master' into fix-available-ann…
Keitaro0226 1ff56ed
Fix unintended formatting changes introduced during conflict resolution
Keitaro0226 d4a41e0
Add tests for protocol-level @available inheritance on Sendable mocks
Keitaro0226 2fa6c3d
Add availability-gated Sendable fixture coverage
Keitaro0226 3e51751
Remove redundant ParsedEntity attribute comment
Keitaro0226 7f3a38b
Fix availability attribute extraction for mock generation
Keitaro0226 32dffb1
Add availability test for inherited protocols
Keitaro0226 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,6 +100,7 @@ | |
| init() { } | ||
| } | ||
|
|
||
| @available(iOS 18.0, *) | ||
| class P1Mock: P1 { | ||
| init() { } | ||
| } | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -208,4 +208,76 @@ | |
| } | ||
| } | ||
| } | ||
|
|
||
| @Fixture enum availableSendableProtocol { | ||
| @available(macOS 99.0, *) | ||
| struct Bar {} | ||
|
|
||
| /// @mockable | ||
| @available(macOS 99.0, *) | ||
| protocol Foo: Sendable { | ||
| func bar() -> Bar | ||
| } | ||
|
|
||
| @Fixture(includesConcurrencyHelpers: true) | ||
| enum expected { | ||
| @available(macOS 99.0, *) | ||
| final class FooMock: Foo, @unchecked Sendable { | ||
| init() { } | ||
|
|
||
|
|
||
| private let barState = MockoloMutex(MockoloHandlerState<Never, @Sendable () -> Bar>()) | ||
| var barCallCount: Int { | ||
| return barState.withLock(\.callCount) | ||
| } | ||
| var barHandler: (@Sendable () -> Bar)? { | ||
| get { barState.withLock(\.handler) } | ||
| set { barState.withLock { $0.handler = newValue } } | ||
| } | ||
| func bar() -> Bar { | ||
| let barHandler = barState.withLock { state in | ||
| state.callCount += 1 | ||
| return state.handler | ||
| } | ||
| if let barHandler = barHandler { | ||
| return barHandler() | ||
| } | ||
| fatalError("barHandler returns can't have a default value thus its handler must be set") | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Fixture enum availableInheritedProtocol { | ||
| @available(macOS 100.0, *) | ||
| struct Bar {} | ||
|
|
||
| @available(macOS 90.0, *) | ||
| protocol Foo { | ||
| } | ||
|
|
||
| /// @mockable | ||
| @available(macOS 100.0, *) | ||
| protocol Foo2: Foo { | ||
| var bar: Bar { get set } | ||
| } | ||
|
|
||
| @Fixture enum expected { | ||
| @available(macOS 100.0, *) | ||
| class Foo2Mock: Foo2 { | ||
| init() { } | ||
| init(bar: Bar) { | ||
| self._bar = bar | ||
| } | ||
|
|
||
|
|
||
| private(set) var barSetCallCount = 0 | ||
| private var _bar: Bar! { didSet { barSetCallCount += 1 } } | ||
| var bar: Bar { | ||
| get { return _bar } | ||
| set { _bar = newValue } | ||
| } | ||
| } | ||
| } | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I need a test case for protocol inheritance scenarios: @available(macOS 100.0, *)
struct Bar {}
@available(macOS 90.0, *)
protocol Foo {
}
/// @mockable
@available(macOS 100.0, *)
protocol Foo2: Foo {
var bar: Bar { get set }
}
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed in 32dffb1. |
||
| } | ||
| #endif | ||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I want to enforce a compilation error when
@availableisn't applied to a mock.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 2fa6c3d.
I updated the fixture to use an availability-gated return type (
Bar) so the generated mock must inherit@availableto compile.