From 2fbad45f3c6072d1102e41c791336e23a3bbe6fc Mon Sep 17 00:00:00 2001 From: Garric Nahapetian Date: Mon, 7 Oct 2024 16:30:12 -0700 Subject: [PATCH 1/2] Compare imports as sorted array --- .../StencilTemplateTests.swift | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/Tests/NodesGeneratorTests/StencilTemplateTests.swift b/Tests/NodesGeneratorTests/StencilTemplateTests.swift index 33243ff04..0dcb09d87 100644 --- a/Tests/NodesGeneratorTests/StencilTemplateTests.swift +++ b/Tests/NodesGeneratorTests/StencilTemplateTests.swift @@ -251,7 +251,7 @@ final class StencilTemplateTests: XCTestCase, TestFactories { let config: Config = givenConfig() for stencilTemplate in StencilTemplate.allCases { for uiFramework in config.uiFrameworks { - let imports: Set = stencilTemplate.imports(with: config, including: uiFramework) + let imports: [String] = Array(stencilTemplate.imports(with: config, including: uiFramework)).sorted() let uiFrameworkImport: String switch uiFramework.kind { case .appKit: @@ -276,34 +276,34 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .builder: expect(imports) == [ - "Nodes", "", - "", + "", "", - "" + "", + "Nodes" ] case .builderTests: expect(imports) == [ - "NodesTesting", - "" + "", + "NodesTesting" ] case .context: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .contextTests: expect(imports) == [ - "Nodes", "", + "Nodes", "NodesTesting" ] case .flow: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .flowTests: expect(imports) == [ @@ -311,26 +311,26 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .plugin: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .pluginTests: expect(imports) == [ - "NodesTesting", - "" + "", + "NodesTesting" ] case .pluginList: expect(imports) == [ - "Nodes", "", "", - "" + "", + "Nodes" ] case .pluginListTests: expect(imports) == [ - "NodesTesting", - "" + "", + "NodesTesting" ] case .state: expect(imports) == [ @@ -338,12 +338,12 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .viewController: expect(imports) == [ - "Nodes", "", "", "", + "Nodes", uiFrameworkImport - ] + ].sorted() case .viewControllerTests: expect(imports) == [ "", @@ -351,8 +351,8 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .viewState: expect(imports) == [ - "Nodes", - "" + "", + "Nodes" ] case .viewStateFactoryTests: expect(imports) == [ @@ -360,9 +360,9 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .worker: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .workerTests: expect(imports) == [ @@ -377,7 +377,7 @@ final class StencilTemplateTests: XCTestCase, TestFactories { func testImportsWithConfig() { let config: Config = givenConfig() for stencilTemplate in StencilTemplate.allCases { - let imports: Set = stencilTemplate.imports(with: config) + let imports: [String] = Array(stencilTemplate.imports(with: config)).sorted() switch stencilTemplate { case .analytics: expect(imports) == [ @@ -389,33 +389,33 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .builder: expect(imports) == [ - "Nodes", "", - "", + "", "", - "" + "", + "Nodes" ] case .builderTests: expect(imports) == [ - "NodesTesting", - "" + "", + "NodesTesting" ] case .context: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .contextTests: expect(imports) == [ - "Nodes", - "" + "", + "Nodes" ] case .flow: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .flowTests: expect(imports) == [ @@ -423,26 +423,26 @@ final class StencilTemplateTests: XCTestCase, TestFactories { ] case .plugin: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .pluginTests: expect(imports) == [ - "NodesTesting", - "" + "", + "NodesTesting" ] case .pluginList: expect(imports) == [ - "Nodes", "", "", - "" + "", + "Nodes" ] case .pluginListTests: expect(imports) == [ - "NodesTesting", - "" + "", + "NodesTesting" ] case .state: expect(imports) == [ @@ -458,9 +458,9 @@ final class StencilTemplateTests: XCTestCase, TestFactories { expect(imports).to(beEmpty()) case .worker: expect(imports) == [ - "Nodes", "", - "" + "", + "Nodes" ] case .workerTests: expect(imports) == [ From 0b32fa82cb9a6f9bfdf2ba9edda9230cdadd2ee6 Mon Sep 17 00:00:00 2001 From: Garric Nahapetian Date: Mon, 7 Oct 2024 16:37:50 -0700 Subject: [PATCH 2/2] Use sortedImports --- Tests/NodesGeneratorTests/StencilTemplateTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/NodesGeneratorTests/StencilTemplateTests.swift b/Tests/NodesGeneratorTests/StencilTemplateTests.swift index 0dcb09d87..d6713f614 100644 --- a/Tests/NodesGeneratorTests/StencilTemplateTests.swift +++ b/Tests/NodesGeneratorTests/StencilTemplateTests.swift @@ -251,7 +251,7 @@ final class StencilTemplateTests: XCTestCase, TestFactories { let config: Config = givenConfig() for stencilTemplate in StencilTemplate.allCases { for uiFramework in config.uiFrameworks { - let imports: [String] = Array(stencilTemplate.imports(with: config, including: uiFramework)).sorted() + let imports: [String] = stencilTemplate.imports(with: config, including: uiFramework).sortedImports() let uiFrameworkImport: String switch uiFramework.kind { case .appKit: @@ -377,7 +377,7 @@ final class StencilTemplateTests: XCTestCase, TestFactories { func testImportsWithConfig() { let config: Config = givenConfig() for stencilTemplate in StencilTemplate.allCases { - let imports: [String] = Array(stencilTemplate.imports(with: config)).sorted() + let imports: [String] = stencilTemplate.imports(with: config).sortedImports() switch stencilTemplate { case .analytics: expect(imports) == [