Merge pull request #5 from novasamatech/feature/package-update

sergkononenko · web-flow · commit fd512cd2186b · 2025-01-25T12:53:40.000+01:00
SPM update
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,69 @@
+// swift-tools-version: 5.9
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let name = "Operation-iOS"
+let package = Package(
+    name: name,
+    platforms: [.iOS(.v14)],
+    products: [
+        // Products define the executables and libraries a package produces, making them visible to other packages.
+        .library(
+            name: name,
+            targets: [name]),
+    ],
+    targets: [
+        .target(
+            name: name,
+            path: "Operation-iOS/Classes"
+        ),
+        .testTarget(
+            name: "CoreDataTests",
+            dependencies: [
+                "Operation-iOS",
+                "Helpers"
+            ],
+            path: "Tests/CoreData"
+        ),
+        .testTarget(
+            name: "DataProviderTests",
+            dependencies: [
+                "Operation-iOS",
+                "Helpers"
+            ],
+            path: "Tests/DataProvider"
+        ),
+        // Operation-iOS uses FireMock which supports only Cocoapods
+        // SPM NetworkTests are disabled for now
+//        .testTarget(
+//            name: "NetworkTests",
+//            dependencies: [
+//                "Operation-iOS",
+//                "Helpers"
+//            ],
+//            path: "Tests/Network"
+//        ),
+        .testTarget(
+            name: "OperationTests",
+            dependencies: [
+                "Operation-iOS",
+                "Helpers"
+            ],
+            path: "Tests/Operation"
+        ),
+        .target(
+            name: "Helpers",
+            dependencies: [
+                "Operation-iOS"
+            ],
+            path: "Tests/Helpers",
+            exclude: ["Network"],
+            resources: [
+                .process("CoreData/Model/IEntities.xcdatamodeld"),
+                .process("CoreData/Model/Entities.xcdatamodeld")
+            ]
+        )
+    ],
+    swiftLanguageVersions: [.v5]
+)
diff --git a/Tests/CoreData/CoreDataCompatibilityTests.swift b/Tests/CoreData/CoreDataCompatibilityTests.swift
@@ -1,6 +1,9 @@
 import XCTest
 import Operation_iOS
 import CoreData
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class CoreDataCompatibilityTests: XCTestCase {
     let defaultCoreDataService: CoreDataServiceProtocol = {
diff --git a/Tests/CoreData/CoreDataRepositoryDomainTests.swift b/Tests/CoreData/CoreDataRepositoryDomainTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class CoreDataRepositoryDomainTests: XCTestCase {
     var defaultDomainRepository: CoreDataRepository<FeedData, CDFeed> = {
diff --git a/Tests/CoreData/CoreDataRepositoryTests.swift b/Tests/CoreData/CoreDataRepositoryTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class CoreDataRepositoryTests: XCTestCase {
     override func setUp() {
diff --git a/Tests/CoreData/CoreDataServiceTests.swift b/Tests/CoreData/CoreDataServiceTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class CoreDataServiceTests: XCTestCase {
     let databaseService: CoreDataService = {
diff --git a/Tests/CoreData/NestedEntitiesTests.swift b/Tests/CoreData/NestedEntitiesTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class NestedEntitiesTests: XCTestCase {
 
diff --git a/Tests/DataProvider/CoreDataContextObserverNestedTests.swift b/Tests/DataProvider/CoreDataContextObserverNestedTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class CoreDataContextObserverNestedTests: XCTestCase {
     func testNotificationDeliveredWhenSeveralItemsUpdated() {
diff --git a/Tests/DataProvider/CoreDataContextObserverTests.swift b/Tests/DataProvider/CoreDataContextObserverTests.swift
@@ -1,6 +1,9 @@
 import XCTest
 import CoreData
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class CoreDataContextObserverTests: XCTestCase {
     let repository: CoreDataRepository<FeedData, CDFeed> = {
diff --git a/Tests/DataProvider/DataProvider/DataProviderBaseTests.swift b/Tests/DataProvider/DataProvider/DataProviderBaseTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class DataProviderBaseTests: XCTestCase {
 
diff --git a/Tests/DataProvider/DataProvider/DataProviderInterfaceTests.swift b/Tests/DataProvider/DataProvider/DataProviderInterfaceTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class DataProviderTests: DataProviderBaseTests {
     let repository: CoreDataRepository<FeedData, CDFeed> = CoreDataRepositoryFacade.shared.createCoreDataRepository()
diff --git a/Tests/DataProvider/DataProvider/DataProviderObserverTests.swift b/Tests/DataProvider/DataProvider/DataProviderObserverTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class DataProviderObserverTests: XCTestCase {
     func testAddObserverWaitInitAndRemove() {
diff --git a/Tests/DataProvider/ListDifferenceCalculator/ListDifferenceCalculatorTests.swift b/Tests/DataProvider/ListDifferenceCalculator/ListDifferenceCalculatorTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class ListDifferenceCalculatorTests: XCTestCase {
     let sortBlock: (FeedData, FeedData) -> Bool = { (object1, object2) -> Bool in
diff --git a/Tests/DataProvider/ListDifferenceCalculator/ListDifferenceLimitTests.swift b/Tests/DataProvider/ListDifferenceCalculator/ListDifferenceLimitTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class ListDifferenceLimitTests: XCTestCase {
     let sortBlock: (FeedData, FeedData) -> Bool = { (object1, object2) -> Bool in
diff --git a/Tests/DataProvider/SingleDataProvider/SingleValueProviderBaseTests.swift b/Tests/DataProvider/SingleDataProvider/SingleValueProviderBaseTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class SingleValueProviderBaseTests: XCTestCase {
     func fetch<T>(from dataProvider: SingleValueProvider<T>) -> Result<T?, Error>? {
diff --git a/Tests/DataProvider/SingleDataProvider/SingleValueProviderInterfaceTests.swift b/Tests/DataProvider/SingleDataProvider/SingleValueProviderInterfaceTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class SingleValueProviderInterfaceTests: SingleValueProviderBaseTests {
     let repository: CoreDataRepository<SingleValueProviderObject, CDSingleValue> = CoreDataRepositoryFacade.shared.createCoreDataRepository()
diff --git a/Tests/DataProvider/SingleDataProvider/SingleValueProviderObserverTests.swift b/Tests/DataProvider/SingleDataProvider/SingleValueProviderObserverTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class SingleValueProviderObserverTests: XCTestCase {
     func testAddObserverWaitInitAndRemove() {
diff --git a/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderFetchTests.swift b/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderFetchTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class StreamableDataProviderFetchTests: XCTestCase {
     struct TestResult<T> {
diff --git a/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderInitTests.swift b/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderInitTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class StreamableDataProviderInitTests: XCTestCase {
     let repository: CoreDataRepository<FeedData, CDFeed> = {
diff --git a/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderObserverTests.swift b/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderObserverTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 @testable import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class StreamableDataProviderObserverTests: XCTestCase {
     func testAddObserverWaitInitAndRemove() {
diff --git a/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderRefreshTests.swift b/Tests/DataProvider/StreamableDataProvider/StreamableDataProviderRefreshTests.swift
@@ -1,5 +1,8 @@
 import XCTest
 import Operation_iOS
+#if SWIFT_PACKAGE
+import Helpers
+#endif
 
 class StreamableDataProviderRefreshTests: XCTestCase {
     struct TestResult<T> {
diff --git a/Tests/Helpers/Constants.swift b/Tests/Helpers/Constants.swift
@@ -1,10 +1,10 @@
 import Foundation
 
-struct Constants {
-    static let defaultCoreDataModelName = "Entities"
-    static let incompatibleCoreDataModelName = "IEntities"
-    static let repositoryDomain = "io.novasama.test.repository"
-    static let expectationDuration: TimeInterval = 60.0
-    static let dummyNetworkURL: URL = URL(string: "https://google.com")!
-    static let networkRequestTimeout: TimeInterval = 60.0
+public struct Constants {
+    public static let defaultCoreDataModelName = "Entities"
+    public static let incompatibleCoreDataModelName = "IEntities"
+    public static let repositoryDomain = "io.novasama.test.repository"
+    public static let expectationDuration: TimeInterval = 60.0
+    public static let dummyNetworkURL: URL = URL(string: "https://google.com")!
+    public static let networkRequestTimeout: TimeInterval = 60.0
 }
diff --git a/Tests/Helpers/CoreData/CoreDataConfiguration+Common.swift b/Tests/Helpers/CoreData/CoreDataConfiguration+Common.swift
@@ -8,10 +8,18 @@ extension CoreDataServiceConfiguration {
                                           incompatibleModelStrategy: .ignore)
     }
 
-    public static func createDefaultConfigutation(with modelName: String,
-                                                  databaseName: String,
-                                                  incompatibleModelStrategy: IncompatibleModelHandlingStrategy) -> CoreDataServiceConfiguration {
-        let bundle = Bundle(for: LoadableBundleClass.self)
+    public static func createDefaultConfigutation(
+        with modelName: String,
+        databaseName: String,
+        incompatibleModelStrategy: IncompatibleModelHandlingStrategy
+    ) -> CoreDataServiceConfiguration {
+        let bundle: Bundle
+#if SWIFT_PACKAGE
+        bundle = Bundle.module
+#else
+        bundle = Bundle(for: LoadableBundleClass.self)
+#endif
+        
         let modelURL = bundle.url(forResource: modelName, withExtension: "momd")
         let databaseName = "\(databaseName).sqlite"
 
diff --git a/Tests/Helpers/CoreDataCacheHelpers.swift b/Tests/Helpers/CoreDataCacheHelpers.swift
@@ -2,22 +2,22 @@ import Foundation
 import Operation_iOS
 import CoreData
 
-func clear(databaseService: CoreDataServiceProtocol) throws {
+public func clear(databaseService: CoreDataServiceProtocol) throws {
     try databaseService.close()
     try databaseService.drop()
 }
 
-final class CoreDataRepositoryFacade {
-    static let shared = CoreDataRepositoryFacade()
+public final class CoreDataRepositoryFacade {
+    public static let shared = CoreDataRepositoryFacade()
 
-    let databaseService: CoreDataServiceProtocol
+    public let databaseService: CoreDataServiceProtocol
 
     private init() {
         let configuration = CoreDataServiceConfiguration.createDefaultConfigutation()
         databaseService = CoreDataService(configuration: configuration)
     }
 
-    func createCoreDataRepository<T, U>(filter: NSPredicate? = nil,
+    public func createCoreDataRepository<T, U>(filter: NSPredicate? = nil,
                                         sortDescriptors: [NSSortDescriptor] = []) -> CoreDataRepository<T, U>
         where T: Identifiable & Codable, U: NSManagedObject & CoreDataCodable  {
 
@@ -28,7 +28,7 @@ final class CoreDataRepositoryFacade {
                                       sortDescriptors: sortDescriptors)
     }
 
-    func clearDatabase() throws {
+    public func clearDatabase() throws {
         try clear(databaseService: databaseService)
     }
 }
diff --git a/Tests/Helpers/CoreDataOperationHelper.swift b/Tests/Helpers/CoreDataOperationHelper.swift
@@ -2,9 +2,9 @@ import Foundation
 import Operation_iOS
 import XCTest
 
-typealias OperationEnqueuClosure = ([Operation]) -> Void
+public typealias OperationEnqueuClosure = ([Operation]) -> Void
 
-func modifyRepository<T: Identifiable>(_ repository: AnyDataProviderRepository<T>,
+public func modifyRepository<T: Identifiable>(_ repository: AnyDataProviderRepository<T>,
                                        handler: XCTestCase,
                                        saving: @escaping () throws -> [T],
                                        deleting: @escaping () throws -> [String],
@@ -13,7 +13,7 @@ func modifyRepository<T: Identifiable>(_ repository: AnyDataProviderRepository<T
     try handleOperation(operation, handler: handler, enqueueClosure: enqueueClosure)
 }
 
-func deleteAllFromRepository<T: Identifiable>(_ repository: AnyDataProviderRepository<T>,
+public func deleteAllFromRepository<T: Identifiable>(_ repository: AnyDataProviderRepository<T>,
                                               handler: XCTestCase,
                                               enqueueClosure: OperationEnqueuClosure? = nil) throws {
     let operation = repository.deleteAllOperation()
diff --git a/Tests/Helpers/Data/ChatData.swift b/Tests/Helpers/Data/ChatData.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-struct ChatData: Equatable, Codable {
-    var identifier: String
+public struct ChatData: Equatable, Codable {
+    public var identifier: String
     var title: String
 }
diff --git a/Tests/Helpers/Data/FeedData.swift b/Tests/Helpers/Data/FeedData.swift
diff --git a/Tests/Helpers/Data/MessageData.swift b/Tests/Helpers/Data/MessageData.swift
diff --git a/Tests/Helpers/Data/Pagination.swift b/Tests/Helpers/Data/Pagination.swift
diff --git a/Tests/Helpers/DataGenerators/DataProviderGenerator.swift b/Tests/Helpers/DataGenerators/DataProviderGenerator.swift
diff --git a/Tests/Helpers/DataGenerators/FeedDataGenerator.swift b/Tests/Helpers/DataGenerators/FeedDataGenerator.swift
diff --git a/Tests/Helpers/DataGenerators/MessageDataGenerator.swift b/Tests/Helpers/DataGenerators/MessageDataGenerator.swift
diff --git a/Tests/Operation/CompoundOperationWrapperTests.swift b/Tests/Operation/CompoundOperationWrapperTests.swift
