Better naming

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

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/Sources/xcresultparser/CoverageConverter.swift b/Sources/xcresultparser/CoverageConverter.swift
@@ -33,7 +33,7 @@ public class CoverageConverter {
 
     // MARK: - Dependencies
 
-    let shell = DependencyFactory.shell()
+    let shell = DependencyFactory.createShell()
 
     public init?(
         with url: URL,

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.fileManager().fileExists(atPath: projectRoot, isDirectory: &isDirectory),
+        if DependencyFactory.createFileManager().fileExists(atPath: projectRoot, isDirectory: &isDirectory),
               isDirectory.boolValue == true {
             self.projectRoot = URL(fileURLWithPath: projectRoot)
         } else {
@@ -387,7 +387,7 @@ private extension ActionTestSummaryGroup {
             "^(?:public )?(?:final )?(?:public )?(?:(class|\\@implementation) )[a-zA-Z0-9_]+",
             grepPathArgument
         ]
-        guard let filelistData = try? DependencyFactory.shell().execute(program: program, with: arguments, at: projectRootUrl) else {
+        guard let filelistData = try? DependencyFactory.createShell().execute(program: program, with: arguments, at: projectRootUrl) else {
             return
         }
         let trimCharacterSet = CharacterSet.whitespacesAndNewlines.union(CharacterSet(charactersIn: ":"))

diff --git a/Sources/xcresultparser/Services/DependencyFactory.swift b/Sources/xcresultparser/Services/DependencyFactory.swift
@@ -8,10 +8,10 @@
 import Foundation
 
 class DependencyFactory {
-    static var shell: () -> Commandline = {
+    static var createShell: () -> Commandline = {
         Shell()
     }
-    static var fileManager: () -> FileManaging = {
+    static var createFileManager: () -> FileManaging = {
         FileManager.default
     }
 }
diff --git a/Tests/XcresultparserTests/XcresultparserTests.swift b/Tests/XcresultparserTests/XcresultparserTests.swift
@@ -343,14 +343,14 @@ final class XcresultparserTests: XCTestCase {
         let cliResult = """
 ./Tests/XcresultparserTests.swift:class XcresultparserTests
 """
-        let savedFilemangerFactory = DependencyFactory.fileManager
-        let savedShellFactory = DependencyFactory.shell
+        let savedFilemangerFactory = DependencyFactory.createFileManager
+        let savedShellFactory = DependencyFactory.createShell
 
-        DependencyFactory.fileManager = {
+        DependencyFactory.createFileManager = {
             MockedFileManager(fileExists: true , isPathDirectory: true)
         }
         let mockedShell = MockedShell(response: Data(cliResult.utf8), error: nil)
-        DependencyFactory.shell = {
+        DependencyFactory.createShell = {
             mockedShell
         }
         mockedShell.argumentValidation = { arguments in
@@ -370,8 +370,8 @@ final class XcresultparserTests: XCTestCase {
         }
         try assertXmlTestReportsAreEqual(expectedFileName: "sonarTestExecutionWithProjectRootRelative", actual: junitXML)
 
-        DependencyFactory.fileManager = savedFilemangerFactory
-        DependencyFactory.shell = savedShellFactory
+        DependencyFactory.createFileManager = savedFilemangerFactory
+        DependencyFactory.createShell = savedShellFactory
     }
 
     func testJunitXMLSonarAbsolutePaths() throws {
@@ -380,14 +380,14 @@ final class XcresultparserTests: XCTestCase {
 /Users/actual/project/Tests/XcresultparserTests.swift:class XcresultparserTests
 """
 
-        let savedFilemangerFactory = DependencyFactory.fileManager
-        let savedShellFactory = DependencyFactory.shell
+        let savedFilemangerFactory = DependencyFactory.createFileManager
+        let savedShellFactory = DependencyFactory.createShell
 
-        DependencyFactory.fileManager = {
+        DependencyFactory.createFileManager = {
             MockedFileManager(fileExists: true , isPathDirectory: true)
         }
         let mockedShell = MockedShell(response: Data(cliResult.utf8), error: nil)
-        DependencyFactory.shell = {
+        DependencyFactory.createShell = {
             mockedShell
         }
         mockedShell.argumentValidation = { arguments in
@@ -407,8 +407,8 @@ final class XcresultparserTests: XCTestCase {
         }
         try assertXmlTestReportsAreEqual(expectedFileName: "sonarTestExecutionWithProjectRootAbsolute", actual: junitXML)
 
-        DependencyFactory.fileManager = savedFilemangerFactory
-        DependencyFactory.shell = savedShellFactory
+        DependencyFactory.createFileManager = savedFilemangerFactory
+        DependencyFactory.createShell = savedShellFactory
     }
 
     func testJunitXMLJunit() throws {