More refactoring for more meaningful naming

a7ex · Dec 2, 2024 · e15e940 · e15e940
1 parent 6bba6a0
commit e15e940
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/Sources/xcresultparser/JunitXML.swift b/Sources/xcresultparser/JunitXML.swift
@@ -76,7 +76,7 @@ public struct JunitXML: XmlSerializable {
         }
 
         var isDirectory: ObjCBool = false
-        if DependencyFactory.createFileManager().fileExists(atPath: projectRoot, isDirectory: &isDirectory),
+        if SharedInstances.fileManager.fileExists(atPath: projectRoot, isDirectory: &isDirectory),
               isDirectory.boolValue == true {
             self.projectRoot = URL(fileURLWithPath: projectRoot)
         } else {

diff --git a/...ltparser/Services/DependencyFactory.swift → ...arser/SharedTypes/DependencyFactory.swift b/...ltparser/Services/DependencyFactory.swift → ...arser/SharedTypes/DependencyFactory.swift
@@ -5,13 +5,8 @@
 //  Created by Alex da Franca on 01.12.24.
 //
 
-import Foundation
-
 class DependencyFactory {
     static var createShell: () -> Commandline = {
         Shell()
     }
-    static var createFileManager: () -> FileManaging = {
-        FileManager.default
-    }
 }
diff --git a/...cresultparser/Services/FileManaging.swift → ...r/SharedTypes/Services/FileManaging.swift b/...cresultparser/Services/FileManaging.swift → ...r/SharedTypes/Services/FileManaging.swift
diff --git a/Sources/xcresultparser/Services/Shell.swift → ...ltparser/SharedTypes/Services/Shell.swift b/Sources/xcresultparser/Services/Shell.swift → ...ltparser/SharedTypes/Services/Shell.swift
diff --git a/Sources/xcresultparser/SharedTypes/SharedInstances.swift b/Sources/xcresultparser/SharedTypes/SharedInstances.swift
@@ -0,0 +1,12 @@
+//
+//  SharedInstances.swift
+//  Xcresultparser
+//
+//  Created by Alex da Franca on 02.12.24.
+//
+
+import Foundation
+
+class SharedInstances {
+    static var fileManager: FileManaging = FileManager.default
+}
diff --git a/Tests/XcresultparserTests/XcresultparserTests.swift b/Tests/XcresultparserTests/XcresultparserTests.swift
@@ -343,12 +343,11 @@ final class XcresultparserTests: XCTestCase {
         let cliResult = """
 ./Tests/XcresultparserTests.swift:class XcresultparserTests
 """
-        let savedFilemangerFactory = DependencyFactory.createFileManager
+        let savedFilemanger = SharedInstances.fileManager
         let savedShellFactory = DependencyFactory.createShell
 
-        DependencyFactory.createFileManager = {
-            MockedFileManager(fileExists: true , isPathDirectory: true)
-        }
+        SharedInstances.fileManager = MockedFileManager(fileExists: true , isPathDirectory: true)
+
         let mockedShell = MockedShell(response: Data(cliResult.utf8), error: nil)
         DependencyFactory.createShell = {
             mockedShell
@@ -370,7 +369,7 @@ final class XcresultparserTests: XCTestCase {
         }
         try assertXmlTestReportsAreEqual(expectedFileName: "sonarTestExecutionWithProjectRootRelative", actual: junitXML)
 
-        DependencyFactory.createFileManager = savedFilemangerFactory
+        SharedInstances.fileManager = savedFilemanger
         DependencyFactory.createShell = savedShellFactory
     }
 
@@ -380,12 +379,11 @@ final class XcresultparserTests: XCTestCase {
 /Users/actual/project/Tests/XcresultparserTests.swift:class XcresultparserTests
 """
 
-        let savedFilemangerFactory = DependencyFactory.createFileManager
+        let savedFilemanger = SharedInstances.fileManager
         let savedShellFactory = DependencyFactory.createShell
 
-        DependencyFactory.createFileManager = {
-            MockedFileManager(fileExists: true , isPathDirectory: true)
-        }
+        SharedInstances.fileManager = MockedFileManager(fileExists: true , isPathDirectory: true)
+
         let mockedShell = MockedShell(response: Data(cliResult.utf8), error: nil)
         DependencyFactory.createShell = {
             mockedShell
@@ -407,7 +405,7 @@ final class XcresultparserTests: XCTestCase {
         }
         try assertXmlTestReportsAreEqual(expectedFileName: "sonarTestExecutionWithProjectRootAbsolute", actual: junitXML)
 
-        DependencyFactory.createFileManager = savedFilemangerFactory
+        SharedInstances.fileManager = savedFilemanger
         DependencyFactory.createShell = savedShellFactory
     }