-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Add test_parent_classes
option to single_test_class
, balanced_xctest_lifecycle
, and empty_xctest
rules
#4233
Closed
mildm8nnered
wants to merge
8
commits into
realm:main
from
mildm8nnered:mildm8nnered-add-test-parent-class-option-to-more-test-rules
Closed
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5f9aa6e
Added test_parent_classes to single_test_class rule
mildm8nnered df77a50
Added test_parent_classes option to balanced_xctest_lifecycle rule
mildm8nnered 37213ce
Added test_parent_classes option for empty_xctest_method
mildm8nnered 00a2d29
Added test_parent_classes to single_test_class rule
mildm8nnered 4a92737
Added test_parent_classes option to balanced_xctest_lifecycle rule
mildm8nnered e93761f
Added test_parent_classes option for empty_xctest_method
mildm8nnered 06fa7b6
Merge branch 'mildm8nnered-add-test-parent-class-option-to-more-test-…
mildm8nnered ec1801e
Updated changelog
mildm8nnered 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 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 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 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
27 changes: 27 additions & 0 deletions
27
...ce/SwiftLintFramework/Rules/RuleConfigurations/BalancedXCTestLifecycleConfiguration.swift
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
public struct BalancedXCTestLifecycleConfiguration: RuleConfiguration, Equatable { | ||
public private(set) var severityConfiguration = SeverityConfiguration(.warning) | ||
public private(set) var testParentClasses: Set<String> = ["XCTestCase"] | ||
|
||
public var consoleDescription: String { | ||
return severityConfiguration.consoleDescription + | ||
", test_parent_classes: [\(testParentClasses)]" | ||
} | ||
|
||
public mutating func apply(configuration: Any) throws { | ||
guard let configuration = configuration as? [String: Any] else { | ||
throw ConfigurationError.unknownConfiguration | ||
} | ||
|
||
if let severityString = configuration["severity"] as? String { | ||
try severityConfiguration.apply(configuration: severityString) | ||
} | ||
|
||
if let extraTestParentClasses = configuration["test_parent_classes"] as? [String] { | ||
self.testParentClasses.formUnion(extraTestParentClasses) | ||
} | ||
} | ||
|
||
public var severity: ViolationSeverity { | ||
return severityConfiguration.severity | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
Source/SwiftLintFramework/Rules/RuleConfigurations/EmptyXCTestMethodConfiguration.swift
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
public struct EmptyXCTestMethodConfiguration: RuleConfiguration, Equatable { | ||
public private(set) var severityConfiguration = SeverityConfiguration(.warning) | ||
public private(set) var testParentClasses: Set<String> = ["XCTestCase"] | ||
|
||
public var consoleDescription: String { | ||
return severityConfiguration.consoleDescription + | ||
", test_parent_classes: [\(testParentClasses)]" | ||
} | ||
|
||
public mutating func apply(configuration: Any) throws { | ||
guard let configuration = configuration as? [String: Any] else { | ||
throw ConfigurationError.unknownConfiguration | ||
} | ||
|
||
if let severityString = configuration["severity"] as? String { | ||
try severityConfiguration.apply(configuration: severityString) | ||
} | ||
|
||
if let extraTestParentClasses = configuration["test_parent_classes"] as? [String] { | ||
self.testParentClasses.formUnion(extraTestParentClasses) | ||
} | ||
} | ||
|
||
public var severity: ViolationSeverity { | ||
return severityConfiguration.severity | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
Source/SwiftLintFramework/Rules/RuleConfigurations/SingleTestClassConfiguration.swift
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
public struct SingleTestClassConfiguration: RuleConfiguration, Equatable { | ||
public private(set) var severityConfiguration = SeverityConfiguration(.warning) | ||
public private(set) var testParentClasses: Set<String> = ["QuickSpec", "XCTestCase"] | ||
|
||
public var consoleDescription: String { | ||
return severityConfiguration.consoleDescription + | ||
", test_parent_classes: [\(testParentClasses)]" | ||
} | ||
|
||
public mutating func apply(configuration: Any) throws { | ||
guard let configuration = configuration as? [String: Any] else { | ||
throw ConfigurationError.unknownConfiguration | ||
} | ||
|
||
if let severityString = configuration["severity"] as? String { | ||
try severityConfiguration.apply(configuration: severityString) | ||
} | ||
|
||
if let extraTestParentClasses = configuration["test_parent_classes"] as? [String] { | ||
self.testParentClasses.formUnion(extraTestParentClasses) | ||
} | ||
} | ||
|
||
public var severity: ViolationSeverity { | ||
return severityConfiguration.severity | ||
} | ||
} |
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
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.
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.
The brackets are superfluous. Sorting the set makes the output deterministic:
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.
So I added
QuickSpec
to all the defaults, and rolled the new ones up, with typealiases for the names you'd expect.But I bodged rebasing, so I just moved to a new branch and PR - #4262