Fix linux tests (#1225)

* Fixed tests for Linux * uncommented tests * Adjusted stub folder for source * reverted redundant change * fixed failing tests * fixed failing test on macOS * added changelog entry [skip-ci]
krzysztofzablocki · Nov 18, 2023 · 1f727dd · 1f727dd
1 parent 1462b9b
commit 1f727dd
Show file tree

Hide file tree

Showing 13 changed files with 441 additions and 21 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,9 +7,9 @@
                 "swift"
             ],
             "name": "Debug sourcery",
-            "program": "${workspaceFolder:Sourcery}/.build/debug/sourcery",
+            "program": "${workspaceFolder:Sourcery-master}/.build/debug/sourcery",
             "args": [],
-            "cwd": "${workspaceFolder:Sourcery}",
+            "cwd": "${workspaceFolder:Sourcery-master}",
             "preLaunchTask": "swift: Build Debug sourcery"
         },
         {
@@ -19,9 +19,9 @@
                 "swift"
             ],
             "name": "Release sourcery",
-            "program": "${workspaceFolder:Sourcery}/.build/release/sourcery",
+            "program": "${workspaceFolder:Sourcery-master}/.build/release/sourcery",
             "args": [],
-            "cwd": "${workspaceFolder:Sourcery}",
+            "cwd": "${workspaceFolder:Sourcery-master}",
             "preLaunchTask": "swift: Build Release sourcery"
         }
     ]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,11 @@
 # Sourcery CHANGELOG
-## Master
+## 2.1.3
 ## Changes
 - Add support for `typealias`es in EJS templates. ([#1208](https://github.com/krzysztofzablocki/Sourcery/pull/1208)
 - Add support for existential to Automockable Protocol with generic types. ([#1220](https://github.com/krzysztofzablocki/Sourcery/pull/1220)
 - Throw throwable error after updating mocks's calls counts and received parameters/invocations.
     ([#1224](https://github.com/krzysztofzablocki/Sourcery/pull/1224)
+- Fix unit tests on Linux ([#1225](https://github.com/krzysztofzablocki/Sourcery/pull/1225))
 
 ## 2.1.2
 ## Changes

diff --git a/Package.swift b/Package.swift
@@ -17,6 +17,9 @@ var sourceryLibDependencies: [Target.Dependency] = [
                 "XcodeProj",
                 .product(name: "SwiftPM-auto", package: "swift-package-manager"),
             ]
+
+// Note: when Swift Linux doesn't bug out on [String: String], add a test back for it
+// See https://github.com/krzysztofzablocki/Sourcery/pull/1208#issuecomment-1752185381
 #if canImport(ObjectiveC)
 sourceryLibDependencies.append("TryCatch")
 let templatesTestsResourcesCopy: [Resource] = [
@@ -33,6 +36,34 @@ let templatesTestsResourcesCopy: [Resource] = [
 ]
 #endif
 
+// Note: when Swift Linux doesn't bug out on [String: String], add a test back for it
+// See https://github.com/krzysztofzablocki/Sourcery/pull/1208#issuecomment-1752185381
+#if canImport(ObjectiveC)
+let sourceryLibTestsResources: [Resource] = [
+    .copy("Stub/Configs"),
+    .copy("Stub/Errors"),
+    .copy("Stub/JavaScriptTemplates"),
+    .copy("Stub/SwiftTemplates"),
+    .copy("Stub/Performance-Code"),
+    .copy("Stub/DryRun-Code"),
+    .copy("Stub/Result"),
+    .copy("Stub/Templates"),
+    .copy("Stub/Source")
+]
+#else
+let sourceryLibTestsResources: [Resource] = [
+    .copy("Stub/Configs"),
+    .copy("Stub/Errors"),
+    .copy("Stub/JavaScriptTemplates"),
+    .copy("Stub/SwiftTemplates"),
+    .copy("Stub/Performance-Code"),
+    .copy("Stub/DryRun-Code"),
+    .copy("Stub/Result"),
+    .copy("Stub/Templates"),
+    .copy("Stub/Source_Linux")
+]
+#endif
+
 var targets: [Target] = [
         .executableTarget(
             name: "SourceryExecutable",
@@ -147,17 +178,7 @@ var targets: [Target] = [
             exclude: [
                 "Info.plist"
             ],
-            resources: [
-                .copy("Stub/Configs"),
-                .copy("Stub/Errors"),
-                .copy("Stub/JavaScriptTemplates"),
-                .copy("Stub/SwiftTemplates"),
-                .copy("Stub/Performance-Code"),
-                .copy("Stub/DryRun-Code"),
-                .copy("Stub/Result"),
-                .copy("Stub/Templates"),
-                .copy("Stub/Source")
-            ],
+            resources: sourceryLibTestsResources,
             swiftSettings: [.unsafeFlags(["-enable-testing"])]
         ),
         .testTarget(

diff --git a/SourceryTests/Generating/SwiftTemplateSpecs.swift b/SourceryTests/Generating/SwiftTemplateSpecs.swift
@@ -89,7 +89,6 @@ class SwiftTemplateTests: QuickSpec {
                 expect(result).to(equal(expectedResult))
             }
 
-// crashing test
             it("handles file includes") {
                 let templatePath = Stubs.swiftTemplates + Path("IncludeFile.swifttemplate")
                 let expectedResult = try? (Stubs.resultDirectory + Path("Basic.swift")).read(.utf8)
@@ -205,7 +204,9 @@ class SwiftTemplateTests: QuickSpec {
                 // }
 
                 context("and missing build dir") {
+#if canImport(ObjectiveC)
                     expect { try Sourcery(cacheDisabled: false).processFiles(.sources(Paths(include: [Stubs.sourceDirectory])), usingTemplates: Paths(include: [templatePath]), output: output, baseIndentation: 0) }.toNot(throwError())
+#endif
                     expect((try? (outputDir + Sourcery().generatedPath(for: templatePath)).read(.utf8))).to(equal(expectedResult))
                     guard let buildDir = NSURL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent("SwiftTemplate").map({ Path($0.path) }) else {
                         fail("Could not create buildDir path")

diff --git a/SourceryTests/Stub/Result/Typealiases.swift b/SourceryTests/Stub/Result/Typealiases.swift
@@ -3,5 +3,5 @@
 // Typealiases in BarBaz
 // - name 'List', type '[FooBarBaz]'
 // Typealiases in FooBarBaz
-// - name 'Name', type 'String'
+// - name 'Name', type '[String: String]'
 // Typealiases in FooSubclass
diff --git a/SourceryTests/Stub/Source/Foo.swift b/SourceryTests/Stub/Source/Foo.swift
@@ -1,9 +1,7 @@
 import Foundation
 
 class FooBarBaz {
-	// Note: when Swift Linux doesn't bug out on [String: String], add a test back for it
-	// See https://github.com/krzysztofzablocki/Sourcery/pull/1208#issuecomment-1752185381
-    typealias Name = String
+    typealias Name = [String: String]
 
     var name: String = ""
     var value: Int = 0

diff --git a/SourceryTests/Stub/Source_Linux/Bar.swift b/SourceryTests/Stub/Source_Linux/Bar.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+// sourcery: this will not appear under FooBarBaz
+
+/// Documentation for bar
+// sourcery: showComment
+/// other documentation
+class BarBaz: FooBarBaz, AutoEquatable {
+    // Note: when Swift Linux doesn't bug out on [String: String], add a test back for it
+	// See https://github.com/krzysztofzablocki/Sourcery/pull/1208#issuecomment-1752185381
+    // typealias List = [FooBarBaz]
+    var parent: FooBarBaz? = nil
+    var otherVariable: Int = 0
+}
diff --git a/SourceryTests/Stub/Source_Linux/Foo.swift b/SourceryTests/Stub/Source_Linux/Foo.swift
@@ -0,0 +1,20 @@
+import Foundation
+
+class FooBarBaz {
+	// Note: when Swift Linux doesn't bug out on [String: String], add a test back for it
+	// See https://github.com/krzysztofzablocki/Sourcery/pull/1208#issuecomment-1752185381
+    // typealias Name = String
+
+    var name: String = ""
+    var value: Int = 0
+}
+
+protocol AutoEquatable {}
+
+class FooSubclass: FooBarBaz, AutoEquatable {
+    var other: String = ""
+}
+
+func performFoo(value: FooBarBaz) {
+
+}
diff --git a/SourceryTests/Stub/Source_Linux/FooBar.swift b/SourceryTests/Stub/Source_Linux/FooBar.swift
@@ -0,0 +1,11 @@
+import Foundation
+
+protocol HasFoo {
+    var foo: FooBarBaz { get }
+}
+protocol HasBar {
+    var bar: BarBaz { get }
+}
+
+// sourcery: AutoStruct
+typealias FooBar = HasFoo & HasBar