From c82370842e7b4b606a763fedf5faf42d3a4e59fc Mon Sep 17 00:00:00 2001 From: Marcelo Fabri Date: Fri, 23 Dec 2016 23:23:54 -0200 Subject: [PATCH] Fixing tests on Linux --- .../ConfigurationTests.swift | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift b/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift index 51cdbfe53..f90495055 100644 --- a/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift +++ b/Tests/SwiftLintFrameworkTests/ConfigurationTests.swift @@ -89,11 +89,11 @@ class ConfigurationTests: XCTestCase { XCTAssertEqual(disabledConfig.disabledRules, ["nesting", "todo"], "initializing Configuration with valid rules in Dictionary should succeed") - let expectedIdentifiers = Array(masterRuleList.list.keys) - .filter({ !(["nesting", "todo"] + optInRules).contains($0) }) - let configuredIdentifiers = disabledConfig.rules.map { + let expectedIdentifiers = Set(masterRuleList.list.keys + .filter({ !(["nesting", "todo"] + optInRules).contains($0) })) + let configuredIdentifiers = Set(disabledConfig.rules.map { type(of: $0).description.identifier - } + }) XCTAssertEqual(expectedIdentifiers, configuredIdentifiers) // Duplicate @@ -110,11 +110,11 @@ class ConfigurationTests: XCTestCase { XCTAssertEqual(configuration.disabledRules, [validRule], "initializing Configuration with valid rules in YAML string should succeed") - let expectedIdentifiers = Array(masterRuleList.list.keys) - .filter({ !([validRule] + optInRules).contains($0) }) - let configuredIdentifiers = configuration.rules.map { + let expectedIdentifiers = Set(masterRuleList.list.keys + .filter({ !([validRule] + optInRules).contains($0) })) + let configuredIdentifiers = Set(configuration.rules.map { type(of: $0).description.identifier - } + }) XCTAssertEqual(expectedIdentifiers, configuredIdentifiers) } @@ -346,7 +346,15 @@ extension ConfigurationTests { ("testLevel2", testLevel2), ("testLevel3", testLevel3), ("testConfiguresCorrectlyFromDict", testConfiguresCorrectlyFromDict), - ("testConfigureFallsBackCorrectly", testConfigureFallsBackCorrectly) + ("testConfigureFallsBackCorrectly", testConfigureFallsBackCorrectly), + ("testConfiguresCorrectlyFromAlias", testConfiguresCorrectlyFromAlias), + ("testConfiguresCorrectlyFromDeprecatedAlias", testConfiguresCorrectlyFromDeprecatedAlias), + ("testReturnsNilWithDuplicatedConfiguration", testReturnsNilWithDuplicatedConfiguration), + ("testInitsFromDeprecatedAlias", testInitsFromDeprecatedAlias), + ("testWhitelistRulesFromDeprecatedAlias", testWhitelistRulesFromDeprecatedAlias), + ("testWhitelistRulesFromAlias", testWhitelistRulesFromAlias), + ("testDisabledRulesFromDeprecatedAlias", testDisabledRulesFromDeprecatedAlias), + ("testDisabledRulesFromAlias", testDisabledRulesFromAlias) ] } }