GitHub/SwiftLint
1
0
Fork 0
mirror of https://github.com/realm/SwiftLint.git synced 2026-06-06 20:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prepare for SR-5717 apple/swift#11542

Browse Source
This commit is contained in:
Ornithologist Coder
2018-12-24 01:01:11 -08:00
committed by Marcelo Fabri
parent fb179a9760
commit 488488ef0d
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SwiftLintFramework/Rules/XCTSpecificMatcherRule.swift
+10 -9
View File
@@ -34,7 +34,7 @@ public struct XCTSpecificMatcherRule: ASTRule, OptInRule, ConfigurationProviderR
/*
* - Get the first two arguments and creates an array where the protected
* word is the first one (if any).
* word is the first one (if any).
*/
let arguments = dictionary.substructure
.filter { $0.offset != nil }
@@ -60,15 +60,16 @@ public struct XCTSpecificMatcherRule: ASTRule, OptInRule, ConfigurationProviderR
}
/*
* - Check if the first one is a protected word, otherwise there's not need to continue.
* - Retrieve the suggestion for the protected word, making sure that optional arguments are considered.
*
* Note that optional arguments don't show on dictionary.substructure, therefore arguments.count == 1 implies
* it contains an optional argument.
* - Check if the number of arguments is two (otherwise there's no need to continue)
* - Check if the first argument is a protected word (otherwise there's no need to continue)
* - Get the suggestion for the given protected word (taking in consideration the presence of
* optionals
*/
guard
arguments.count == 2,
let argument = arguments.first, protectedArguments.contains(argument),
let suggestedMatcher = matcher.suggestion(for: argument, containsOptionalArgument: arguments.count == 1)
let hasOptional = arguments.last?.contains("?"),
let suggestedMatcher = matcher.suggestion(for: argument, hasOptional: hasOptional)
else { return [] }
return [
@@ -88,8 +89,8 @@ private enum XCTestMatcher: String {
case equal = "XCTAssertEqual"
case notEqual = "XCTAssertNotEqual"
func suggestion(for protectedArgument: String, containsOptionalArgument: Bool) -> String? {
switch (self, protectedArgument, containsOptionalArgument) {
func suggestion(for protectedArgument: String, hasOptional: Bool) -> String? {
switch (self, protectedArgument, hasOptional) {
case (.equal, "true", false): return "XCTAssertTrue"
case (.equal, "false", false): return "XCTAssertFalse"
case (.equal, "nil", _): return "XCTAssertNil"
Tests/SwiftLintFrameworkTests/XCTSpecificMatcherRuleTests.swift
-8
View File
@@ -82,14 +82,6 @@ class XCTSpecificMatcherRuleTests: XCTestCase {
XCTAssertEqual(violations.first?.reason, "Prefer the specific matcher 'XCTAssertFalse' instead.")
}
func testEqualUnwrappedOptionalTrue() {
let string = "XCTAssertEqual((a?.b)!, true)"
let violations = self.violations(string)
XCTAssertEqual(violations.count, 1)
XCTAssertEqual(violations.first?.reason, "Prefer the specific matcher 'XCTAssertTrue' instead.")
}
func testEqualNilNil() {
let string = "XCTAssertEqual(nil, nil)"
let violations = self.violations(string)