From 5caeb0734231d177ff2d6f970d03fa3eee23c404 Mon Sep 17 00:00:00 2001 From: Norio Nomura Date: Fri, 18 Mar 2016 00:09:32 +0900 Subject: [PATCH] [SPM] Move `Source/SwiftLintFrameworkTests` to `Tests/SwiftLintFramework` --- Source/SwiftLintFrameworkTests/main.swift | 23 ------------------- SwiftLint.xcodeproj/project.pbxproj | 12 ++++------ .../ConfigurationTests.swift | 0 .../CustomRulesTests.swift | 0 .../ExtendedNSStringTests.swift | 0 .../FunctionBodyLengthRuleTests.swift | 0 .../IntegrationTests.swift | 0 .../SwiftLintFramework}/ReporterTests.swift | 0 .../Resources/ProjectMock/.swiftlint.yml | 0 .../Resources/ProjectMock/Level0.swift | 0 .../Resources/ProjectMock/Level1/Level1.swift | 0 .../ProjectMock/Level1/Level2/.swiftlint.yml | 0 .../ProjectMock/Level1/Level2/Level2.swift | 0 .../Level1/Level2/Level3/Level3.swift | 0 .../SwiftLintFramework}/Resources/test.yml | 0 .../RuleConfigurationTests.swift | 0 .../SwiftLintFramework}/RuleTests.swift | 0 .../SwiftLintFramework}/RulesTests.swift | 0 .../Supporting Files/Info.plist | 0 .../SwiftLintFramework}/TestHelpers.swift | 0 .../Yaml+SwiftLintTests.swift | 0 .../SwiftLintFramework}/YamlParserTests.swift | 0 22 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 Source/SwiftLintFrameworkTests/main.swift rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/ConfigurationTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/CustomRulesTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/ExtendedNSStringTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/FunctionBodyLengthRuleTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/IntegrationTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/ReporterTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/ProjectMock/.swiftlint.yml (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/ProjectMock/Level0.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/ProjectMock/Level1/Level1.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/ProjectMock/Level1/Level2/.swiftlint.yml (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/ProjectMock/Level1/Level2/Level2.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/ProjectMock/Level1/Level2/Level3/Level3.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Resources/test.yml (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/RuleConfigurationTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/RuleTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/RulesTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Supporting Files/Info.plist (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/TestHelpers.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/Yaml+SwiftLintTests.swift (100%) rename {Source/SwiftLintFrameworkTests => Tests/SwiftLintFramework}/YamlParserTests.swift (100%) diff --git a/Source/SwiftLintFrameworkTests/main.swift b/Source/SwiftLintFrameworkTests/main.swift deleted file mode 100644 index f7cd3479a..000000000 --- a/Source/SwiftLintFrameworkTests/main.swift +++ /dev/null @@ -1,23 +0,0 @@ -// -// main.swift -// SwiftLint -// -// Created by 野村 憲男 on 2/3/16. -// Copyright © 2016 Realm. All rights reserved. -// - -import XCTest - -XCTMain([ - ConfigurationTests(), - CustomRulesTests(), - ExtendedNSStringTests(), - FunctionBodyLengthRuleTests(), - IntegrationTests(), - ReporterTests(), - RuleConfigurationsTests(), - RulesTests(), - RuleTests(), - YamlSwiftLintTests(), - YamlParserTests(), - ]) diff --git a/SwiftLint.xcodeproj/project.pbxproj b/SwiftLint.xcodeproj/project.pbxproj index 6dc89149b..9f1d49b1a 100644 --- a/SwiftLint.xcodeproj/project.pbxproj +++ b/SwiftLint.xcodeproj/project.pbxproj @@ -200,7 +200,6 @@ 695BE9CE1BDFD92B0071E985 /* CommaRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CommaRule.swift; sourceTree = ""; }; 6CB514E81C760C6900FA02C4 /* Structure+SwiftLint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Structure+SwiftLint.swift"; sourceTree = ""; }; 6CC4259A1C77046200AEA885 /* SyntaxMap+SwiftLint.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SyntaxMap+SwiftLint.swift"; sourceTree = ""; }; - 6CDD62CE1C6193300094A198 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; 83894F211B0C928A006214E1 /* RulesCommand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulesCommand.swift; sourceTree = ""; }; 83D71E261B131EB5000395DE /* RuleDescription.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RuleDescription.swift; sourceTree = ""; }; B58AEED51C492C7B00E901FD /* ForceUnwrappingRule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForceUnwrappingRule.swift; sourceTree = ""; }; @@ -490,7 +489,6 @@ D0D1212219E878CC005E4BAA /* Configuration */, D0D1217C19E87B05005E4BAA /* Supporting Files */, 3B12C9BE1C3209AC000B423F /* Resources */, - 6CDD62CE1C6193300094A198 /* main.swift */, E809EDA21B8A73FB00399043 /* ConfigurationTests.swift */, D4348EE91C46122C007707FB /* FunctionBodyLengthRuleTests.swift */, E832F10C1B17E725003F265F /* IntegrationTests.swift */, @@ -505,7 +503,7 @@ 3BB47D861C51DE6E00AE6A10 /* CustomRulesTests.swift */, ); name = SwiftLintFrameworkTests; - path = Source/SwiftLintFrameworkTests; + path = Tests/SwiftLintFramework; sourceTree = ""; }; D0D1217C19E87B05005E4BAA /* Supporting Files */ = { @@ -1018,7 +1016,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */; buildSettings = { - INFOPLIST_FILE = "Source/SwiftLintFrameworkTests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwiftLintFramework/Supporting Files/Info.plist"; OTHER_SWIFT_FLAGS = "-D SWIFTLINT_XCODE_VERSION_$(XCODE_VERSION_MINOR)"; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftLintFrameworkTests; @@ -1029,7 +1027,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */; buildSettings = { - INFOPLIST_FILE = "Source/SwiftLintFrameworkTests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwiftLintFramework/Supporting Files/Info.plist"; OTHER_SWIFT_FLAGS = "-D SWIFTLINT_XCODE_VERSION_$(XCODE_VERSION_MINOR)"; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftLintFrameworkTests; @@ -1074,7 +1072,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */; buildSettings = { - INFOPLIST_FILE = "Source/SwiftLintFrameworkTests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwiftLintFramework/Supporting Files/Info.plist"; OTHER_SWIFT_FLAGS = "-D SWIFTLINT_XCODE_VERSION_$(XCODE_VERSION_MINOR)"; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftLintFrameworkTests; @@ -1119,7 +1117,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = D0D1213419E878CC005E4BAA /* Mac-Application.xcconfig */; buildSettings = { - INFOPLIST_FILE = "Source/SwiftLintFrameworkTests/Supporting Files/Info.plist"; + INFOPLIST_FILE = "Tests/SwiftLintFramework/Supporting Files/Info.plist"; OTHER_SWIFT_FLAGS = "-D SWIFTLINT_XCODE_VERSION_$(XCODE_VERSION_MINOR)"; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SwiftLintFrameworkTests; diff --git a/Source/SwiftLintFrameworkTests/ConfigurationTests.swift b/Tests/SwiftLintFramework/ConfigurationTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/ConfigurationTests.swift rename to Tests/SwiftLintFramework/ConfigurationTests.swift diff --git a/Source/SwiftLintFrameworkTests/CustomRulesTests.swift b/Tests/SwiftLintFramework/CustomRulesTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/CustomRulesTests.swift rename to Tests/SwiftLintFramework/CustomRulesTests.swift diff --git a/Source/SwiftLintFrameworkTests/ExtendedNSStringTests.swift b/Tests/SwiftLintFramework/ExtendedNSStringTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/ExtendedNSStringTests.swift rename to Tests/SwiftLintFramework/ExtendedNSStringTests.swift diff --git a/Source/SwiftLintFrameworkTests/FunctionBodyLengthRuleTests.swift b/Tests/SwiftLintFramework/FunctionBodyLengthRuleTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/FunctionBodyLengthRuleTests.swift rename to Tests/SwiftLintFramework/FunctionBodyLengthRuleTests.swift diff --git a/Source/SwiftLintFrameworkTests/IntegrationTests.swift b/Tests/SwiftLintFramework/IntegrationTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/IntegrationTests.swift rename to Tests/SwiftLintFramework/IntegrationTests.swift diff --git a/Source/SwiftLintFrameworkTests/ReporterTests.swift b/Tests/SwiftLintFramework/ReporterTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/ReporterTests.swift rename to Tests/SwiftLintFramework/ReporterTests.swift diff --git a/Source/SwiftLintFrameworkTests/Resources/ProjectMock/.swiftlint.yml b/Tests/SwiftLintFramework/Resources/ProjectMock/.swiftlint.yml similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/ProjectMock/.swiftlint.yml rename to Tests/SwiftLintFramework/Resources/ProjectMock/.swiftlint.yml diff --git a/Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level0.swift b/Tests/SwiftLintFramework/Resources/ProjectMock/Level0.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level0.swift rename to Tests/SwiftLintFramework/Resources/ProjectMock/Level0.swift diff --git a/Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level1.swift b/Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level1.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level1.swift rename to Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level1.swift diff --git a/Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level2/.swiftlint.yml b/Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level2/.swiftlint.yml similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level2/.swiftlint.yml rename to Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level2/.swiftlint.yml diff --git a/Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level2/Level2.swift b/Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level2/Level2.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level2/Level2.swift rename to Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level2/Level2.swift diff --git a/Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level2/Level3/Level3.swift b/Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level2/Level3/Level3.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/ProjectMock/Level1/Level2/Level3/Level3.swift rename to Tests/SwiftLintFramework/Resources/ProjectMock/Level1/Level2/Level3/Level3.swift diff --git a/Source/SwiftLintFrameworkTests/Resources/test.yml b/Tests/SwiftLintFramework/Resources/test.yml similarity index 100% rename from Source/SwiftLintFrameworkTests/Resources/test.yml rename to Tests/SwiftLintFramework/Resources/test.yml diff --git a/Source/SwiftLintFrameworkTests/RuleConfigurationTests.swift b/Tests/SwiftLintFramework/RuleConfigurationTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/RuleConfigurationTests.swift rename to Tests/SwiftLintFramework/RuleConfigurationTests.swift diff --git a/Source/SwiftLintFrameworkTests/RuleTests.swift b/Tests/SwiftLintFramework/RuleTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/RuleTests.swift rename to Tests/SwiftLintFramework/RuleTests.swift diff --git a/Source/SwiftLintFrameworkTests/RulesTests.swift b/Tests/SwiftLintFramework/RulesTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/RulesTests.swift rename to Tests/SwiftLintFramework/RulesTests.swift diff --git a/Source/SwiftLintFrameworkTests/Supporting Files/Info.plist b/Tests/SwiftLintFramework/Supporting Files/Info.plist similarity index 100% rename from Source/SwiftLintFrameworkTests/Supporting Files/Info.plist rename to Tests/SwiftLintFramework/Supporting Files/Info.plist diff --git a/Source/SwiftLintFrameworkTests/TestHelpers.swift b/Tests/SwiftLintFramework/TestHelpers.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/TestHelpers.swift rename to Tests/SwiftLintFramework/TestHelpers.swift diff --git a/Source/SwiftLintFrameworkTests/Yaml+SwiftLintTests.swift b/Tests/SwiftLintFramework/Yaml+SwiftLintTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/Yaml+SwiftLintTests.swift rename to Tests/SwiftLintFramework/Yaml+SwiftLintTests.swift diff --git a/Source/SwiftLintFrameworkTests/YamlParserTests.swift b/Tests/SwiftLintFramework/YamlParserTests.swift similarity index 100% rename from Source/SwiftLintFrameworkTests/YamlParserTests.swift rename to Tests/SwiftLintFramework/YamlParserTests.swift