Remove Test Helpers from Package.swift (#2828)

GetStream · Oct 9, 2023 · 8427a49 · 8427a49
1 parent 1eab69a
commit 8427a49
Show file tree

Hide file tree

Showing 110 changed files with 302 additions and 528 deletions.
diff --git a/Package.swift b/Package.swift
@@ -27,10 +27,6 @@ let package = Package(
             targets: ["StreamChatTestMockServer"]
         ),
     ],
-    dependencies: [
-        .package(name: "StreamChatTestHelpers", url: "https://github.com/GetStream/stream-chat-swift-test-helpers.git", .exact("0.2.11")),
-        .package(name: "Swifter", url: "https://github.com/httpswift/swifter", .exact("1.5.0"))
-    ],
     targets: [
         .target(
             name: "StreamChat",
@@ -43,21 +39,16 @@ let package = Package(
             exclude: ["Info.plist", "Generated/L10n_template.stencil"],
             resources: [.process("Resources")]
         ),
-        .target(name: "StreamChatTestTools",
-            dependencies: [
-                .target(name: "StreamChat"),
-                .product(name: "StreamChatTestHelpers", package: "StreamChatTestHelpers"),
-            ],
+        .target(
+            name: "StreamChatTestTools",
+            dependencies: ["StreamChat"],
             path: "TestTools/StreamChatTestTools",
             exclude: ["Info.plist"],
             resources: [.process("Fixtures")]
         ),
-        .target(name: "StreamChatTestMockServer",
-            dependencies: [
-                .target(name: "StreamChat"),
-                .product(name: "StreamChatTestHelpers", package: "StreamChatTestHelpers"),
-                .product(name: "Swifter", package: "Swifter")
-            ],
+        .target(
+            name: "StreamChatTestMockServer",
+            dependencies: ["StreamChat"],
             path: "TestTools/StreamChatTestMockServer",
             exclude: ["Info.plist"],
             resources: [.process("Fixtures")]

diff --git a/StreamChat.xcodeproj/project.pbxproj b/StreamChat.xcodeproj/project.pbxproj
diff --git a/StreamChatUITestsAppUITests/StreamChatUITests.swift b/StreamChatUITestsAppUITests/StreamChatUITests.swift
@@ -2,8 +2,8 @@
 // Copyright © 2023 Stream.io Inc. All rights reserved.
 //
 
-@_exported import StreamChatTestHelpers
 @_exported import StreamChatTestMockServer
+@_exported import StreamSwiftTestHelpers
 import Foundation
 
 final class StreamChatUITests {}
diff --git a/TestTools/StreamChatTestMockServer/Extensions/Dictionary.swift b/TestTools/StreamChatTestMockServer/Extensions/Dictionary.swift
@@ -0,0 +1,26 @@
+//
+// Copyright © 2022 Stream.io Inc. All rights reserved.
+//
+
+import Foundation
+
+public extension Dictionary {
+
+    func jsonToString(prettyPrinted: Bool = false) -> String {
+        var options: JSONSerialization.WritingOptions = []
+        if prettyPrinted {
+          options = JSONSerialization.WritingOptions.prettyPrinted
+        }
+
+        do {
+          let data = try JSONSerialization.data(withJSONObject: self, options: options)
+          if let string = String(data: data, encoding: String.Encoding.utf8) {
+            return string
+          }
+        } catch {
+          print(error)
+        }
+
+        return ""
+    }
+}
diff --git a/TestTools/StreamChatTestMockServer/Extensions/String.swift b/TestTools/StreamChatTestMockServer/Extensions/String.swift
@@ -0,0 +1,35 @@
+//
+// Copyright © 2022 Stream.io Inc. All rights reserved.
+//
+
+import XCTest
+
+public extension String {
+
+    var json: [String: Any] {
+        try! JSONSerialization.jsonObject(with: Data(self.utf8),
+                                          options: .mutableContainers) as! [String: Any]
+    }
+
+    func replace(_ target: String, to: String) -> String {
+        replacingOccurrences(of: target,
+                             with: to,
+                             options: NSString.CompareOptions.literal,
+                             range: nil)
+    }
+
+    var html: Self {
+        self.isEmpty ? "" : "<p>\(self)</p>\n"
+    }
+
+}
+
+public extension Substring {
+    func capitalizingFirstLetter() -> Substring {
+        prefix(1).capitalized + dropFirst()
+    }
+
+    mutating func capitalizeFirstLetter() {
+        self = self.capitalizingFirstLetter()
+    }
+}
diff --git a/TestTools/StreamChatTestMockServer/MockServer/WebsocketResponses.swift b/TestTools/StreamChatTestMockServer/MockServer/WebsocketResponses.swift
@@ -5,7 +5,6 @@
 @testable import StreamChat
 import Foundation
 import Swifter
-import StreamChatTestHelpers
 
 public extension StreamMockServer {
 

diff --git a/TestTools/StreamChatTestMockServer/Utilities/TestData.swift b/TestTools/StreamChatTestMockServer/Utilities/TestData.swift
@@ -5,7 +5,6 @@
 @testable import StreamChat
 import Swifter
 import XCTest
-import StreamChatTestHelpers
 
 public enum TestData {
 
@@ -50,5 +49,20 @@ public enum TestData {
         case sad
         case like
     }
+}
 
+extension XCTestCase {
+    /// Loads a data from a file.
+    /// - Parameters:
+    ///   - name: a file name.
+    ///   - extension: a file extension. JSON by default.
+    /// - Returns: a file data.
+    public static func mockData(fromFile name: String, bundle: Bundle, extension: String = "json") -> Data {
+        guard let url = bundle.url(forResource: name, withExtension: `extension`) else {
+            XCTFail("\n❌ Mock file \"\(name).json\" not found in bundle \(bundle.bundleURL.lastPathComponent)")
+            return .init()
+        }
+
+        return try! Data(contentsOf: url)
+    }
 }
diff --git a/...atTestTools/Mocks/StreamChat/Controllers/Controllers/ChatChannelListController_Mock.swift b/...atTestTools/Mocks/StreamChat/Controllers/Controllers/ChatChannelListController_Mock.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 @testable import StreamChat
-import StreamChatTestHelpers
+@testable import StreamSwiftTestHelpers
 
 public class ChatChannelListController_Mock: ChatChannelListController, Spy {
     public var recordedFunctions: [String] = []

diff --git a/...ols/StreamChatTestTools/Mocks/StreamChat/Repositories/AuthenticationRepository_Mock.swift b/...ols/StreamChatTestTools/Mocks/StreamChat/Repositories/AuthenticationRepository_Mock.swift
@@ -3,8 +3,8 @@
 //
 
 import Foundation
-import StreamChatTestHelpers
 @testable import StreamChat
+@testable import StreamSwiftTestHelpers
 
 class AuthenticationRepository_Mock: AuthenticationRepository, Spy {
     enum Signature {

diff --git a/TestTools/StreamChatTestTools/StreamChatTestTools.swift b/TestTools/StreamChatTestTools/StreamChatTestTools.swift
@@ -3,7 +3,7 @@
 //
 
 import Foundation
-@_exported import StreamChatTestHelpers
+@_exported import StreamSwiftTestHelpers
 import XCTest
 
 extension Bundle {

diff --git a/Tests/StreamChatTests/APIClient/Endpoints/Payloads/CreateCallPayload_Tests.swift b/Tests/StreamChatTests/APIClient/Endpoints/Payloads/CreateCallPayload_Tests.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 @testable import StreamChat
-import StreamChatTestHelpers
+@testable import StreamSwiftTestHelpers
 import XCTest
 
 final class CreateCallPayload_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/APIClient/Endpoints/Requests/CallRequestBody_Tests.swift b/Tests/StreamChatTests/APIClient/Endpoints/Requests/CallRequestBody_Tests.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 @testable import StreamChat
-import StreamChatTestHelpers
+@testable import StreamSwiftTestHelpers
 import XCTest
 
 final class CallRequestBody_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/AudioAnalysisEngine_Tests.swift b/Tests/StreamChatTests/Audio/AudioAnalysisEngine_Tests.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class AudioAnalysisEngine_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/StreamAssetPropertyLoader_Tests.swift b/Tests/StreamChatTests/Audio/StreamAssetPropertyLoader_Tests.swift
@@ -5,7 +5,7 @@
 import AVFoundation
 import Foundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class StreamAssetPropertyLoader_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/StreamAudioPlayer_Tests.swift b/Tests/StreamChatTests/Audio/StreamAudioPlayer_Tests.swift
@@ -5,7 +5,7 @@
 import AVFoundation
 import Foundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class StreamAudioPlayer_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/StreamAudioQueuePlayer_Tests.swift b/Tests/StreamChatTests/Audio/StreamAudioQueuePlayer_Tests.swift
@@ -4,7 +4,7 @@
 
 import AVFoundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class StreamAudioQueuePlayer_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/StreamAudioRecorder_Tests.swift b/Tests/StreamChatTests/Audio/StreamAudioRecorder_Tests.swift
@@ -5,7 +5,7 @@
 import AVFoundation
 import Foundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class StreamAudioRecorder_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/StreamAudioSessionConfigurator_Tests.swift b/Tests/StreamChatTests/Audio/StreamAudioSessionConfigurator_Tests.swift
@@ -4,7 +4,7 @@
 
 import AVFoundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class StreamAudioSessionConfigurator_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Audio/StreamAudioWaveformAnalyser_Tests.swift b/Tests/StreamChatTests/Audio/StreamAudioWaveformAnalyser_Tests.swift
@@ -4,7 +4,7 @@
 
 import AVFoundation
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class StreamAudioWaveformAnalyser_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Models/Attachments/AnyAttachmentPayload_Tests.swift b/Tests/StreamChatTests/Models/Attachments/AnyAttachmentPayload_Tests.swift
@@ -3,7 +3,7 @@
 //
 
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class AnyAttachmentPayload_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/StreamChatTests.swift b/Tests/StreamChatTests/StreamChatTests.swift
@@ -4,6 +4,6 @@
 
 import Foundation
 
-@_exported import StreamChatTestHelpers
+@_exported import StreamSwiftTestHelpers
 
 final class StreamChatTests {}
diff --git a/Tests/StreamChatTests/Utils/CooldownTracker_Tests.swift b/Tests/StreamChatTests/Utils/CooldownTracker_Tests.swift
@@ -3,8 +3,8 @@
 //
 
 @testable import StreamChat
-import StreamChatTestHelpers
-import StreamChatTestTools
+@testable import StreamChatTestTools
+@testable import StreamSwiftTestHelpers
 import XCTest
 
 final class CooldownTracker_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Utils/Debouncer_Tests.swift b/Tests/StreamChatTests/Utils/Debouncer_Tests.swift
@@ -4,8 +4,8 @@
 
 import Foundation
 @testable import StreamChat
-import StreamChatTestHelpers
-import StreamChatTestTools
+@testable import StreamChatTestTools
+@testable import StreamSwiftTestHelpers
 import XCTest
 
 final class Debouncer_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Utils/LazyCachedMapCollection_Tests.swift b/Tests/StreamChatTests/Utils/LazyCachedMapCollection_Tests.swift
@@ -3,7 +3,7 @@
 //
 
 @testable import StreamChat
-import StreamChatTestTools
+@testable import StreamChatTestTools
 import XCTest
 
 final class LazyCachedMapCollection_Tests: XCTestCase {

diff --git a/Tests/StreamChatTests/Utils/MulticastDelegate_Tests.swift b/Tests/StreamChatTests/Utils/MulticastDelegate_Tests.swift
@@ -3,7 +3,7 @@
 //
 
 @testable import StreamChat
-import StreamChatTestHelpers
+@testable import StreamSwiftTestHelpers
 import XCTest
 
 final class MulticastDelegate_Tests: XCTestCase {