From 4f652a68e73f273b6c703a61ba97dd2e481fe5bc Mon Sep 17 00:00:00 2001 From: JP Simard Date: Wed, 16 Nov 2022 14:31:00 -0500 Subject: [PATCH] Move XCTestHelpers to TestCaseAccessibilityRule.swift (#4552) it's only used in that file --- .../Helpers/XCTestHelpers.swift | 29 ------------------- .../Lint/TestCaseAccessibilityRule.swift | 28 ++++++++++++++++++ 2 files changed, 28 insertions(+), 29 deletions(-) delete mode 100644 Source/SwiftLintFramework/Helpers/XCTestHelpers.swift diff --git a/Source/SwiftLintFramework/Helpers/XCTestHelpers.swift b/Source/SwiftLintFramework/Helpers/XCTestHelpers.swift deleted file mode 100644 index 0e9896af7..000000000 --- a/Source/SwiftLintFramework/Helpers/XCTestHelpers.swift +++ /dev/null @@ -1,29 +0,0 @@ -import SwiftSyntax - -enum XCTestHelpers { - private static let testVariableNames: Set = [ - "allTests" - ] - - static func isXCTestFunction(_ function: FunctionDeclSyntax) -> Bool { - guard !function.modifiers.containsOverride else { - return true - } - - return !function.modifiers.containsStaticOrClass && - function.identifier.text.hasPrefix("test") && - function.signature.input.parameterList.isEmpty - } - - static func isXCTestVariable(_ variable: VariableDeclSyntax) -> Bool { - guard !variable.modifiers.containsOverride else { - return true - } - - return - variable.modifiers.containsStaticOrClass && - variable.bindings - .compactMap { $0.pattern.as(IdentifierPatternSyntax.self)?.identifier.text } - .allSatisfy(testVariableNames.contains) - } -} diff --git a/Source/SwiftLintFramework/Rules/Lint/TestCaseAccessibilityRule.swift b/Source/SwiftLintFramework/Rules/Lint/TestCaseAccessibilityRule.swift index 6828147fd..7d7bfbd56 100644 --- a/Source/SwiftLintFramework/Rules/Lint/TestCaseAccessibilityRule.swift +++ b/Source/SwiftLintFramework/Rules/Lint/TestCaseAccessibilityRule.swift @@ -143,3 +143,31 @@ private extension ClassDeclSyntax { } ?? [] } } + +private enum XCTestHelpers { + private static let testVariableNames: Set = [ + "allTests" + ] + + static func isXCTestFunction(_ function: FunctionDeclSyntax) -> Bool { + guard !function.modifiers.containsOverride else { + return true + } + + return !function.modifiers.containsStaticOrClass && + function.identifier.text.hasPrefix("test") && + function.signature.input.parameterList.isEmpty + } + + static func isXCTestVariable(_ variable: VariableDeclSyntax) -> Bool { + guard !variable.modifiers.containsOverride else { + return true + } + + return + variable.modifiers.containsStaticOrClass && + variable.bindings + .compactMap { $0.pattern.as(IdentifierPatternSyntax.self)?.identifier.text } + .allSatisfy(testVariableNames.contains) + } +}