split xcode test target into two

.github/workflows/ios.yaml

@@ -69,7 +69,7 @@ jobs:
       - name: 'Install dependencies'
         run: ./ci/mac_ci_setup.sh
       - name: Run iOS tests (tsan)
-        run: env -u ANDROID_NDK_HOME ./bazelw test $(./bazelw query 'kind(ios_unit_test, //test/platform/swift/unit_integration:test_tsan)') --test_tag_filters=macos_only --test_output=errors --config ci --config ios-tsan
+        run: env -u ANDROID_NDK_HOME ./bazelw test $(./bazelw query 'kind(ios_unit_test, //test/platform/swift/unit_integration/core/...)') --test_tag_filters=macos_only --test_output=errors --config ci --config ios-tsan
   verify_ios:
     runs-on: ubuntu-latest
     needs: ["macos_tsan", "macos_asan", "swift_hello_world"]

.gitignore

@@ -5,6 +5,7 @@
 
 # Bazel
 /bazel-*
+**/Bazel Generated/
 
 compile_commands.json
 .DS_Store

BUILD

@@ -192,7 +192,8 @@ xcodeproj(
             ],
         ),
         # Tests
-        "//test/platform/swift/unit_integration:test",
+        "//test/platform/swift/unit_integration/core:test",
+        "//test/platform/swift/unit_integration/integrations:test",
     ],
     xcode_configurations = {
         "Debug": {
@@ -233,7 +234,15 @@ xcodeproj(
             name = "iOS Capture Unit Integration Tests",
             test = xcschemes.test(
                 test_targets = [
-                    "//test/platform/swift/unit_integration:test",
+                    "//test/platform/swift/unit_integration/core:test",
+                ],
+            ),
+        ),
+        xcschemes.scheme(
+            name = "iOS Capture URLSession Integration Tests",
+            test = xcschemes.test(
+                test_targets = [
+                    "//test/platform/swift/unit_integration/integrations:test",
                 ],
             ),
         ),

examples/swift/benchmark/BUILD

@@ -1,5 +1,6 @@
 load("@build_bazel_rules_apple//apple:ios.bzl", "ios_application")
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load("//bazel:config.bzl", "MINIMUM_IOS_VERSION_TESTS")
 
 # App that directly imports Bitdrift as a `swift_library` for compatibility with `rules_xcodeproj`
 # and allowing building the app and all its deps in a single step.
@@ -23,7 +24,7 @@ ios_application(
     bundle_id = "io.bitdrift.example.benchmarkapp",
     families = ["iphone"],
     infoplists = ["Info.plist"],
-    minimum_os_version = "13.0",
+    minimum_os_version = MINIMUM_IOS_VERSION_TESTS,
     provisioning_profile = select({
         "//bazel:ios_device_build": "//bazel/ios:ios_provisioning_profile",
         "//conditions:default": None,

examples/swift/benchmark/ResourceProfiler.swift

@@ -34,10 +34,7 @@ final class ResourceProfiler {
         self.startNetworkProfiling(
             isRunning: isRunning,
             name: "Simple",
-            configuration: .init(
-                sessionReplayConfiguration: nil,
-                resourceReportingConfiguration: nil
-            ),
+            configuration: .init(sessionReplayConfiguration: nil),
             streamHandler: { streamID in
                 configure_benchmarking_configuration(streamID)
                 await_configuration_ack(streamID)
@@ -86,16 +83,17 @@ final class ResourceProfiler {
         let url = self.makeDirectoryURL()
         self.logger = Logger(
             withAPIKey: "foo",
-            appInstallID: "device-id",
             bufferDirectory: url,
             // swiftlint:disable:next force_unwrapping
             apiURL: URL(string: "https://localhost:\(port)")!,
             remoteErrorReporter: nil,
             configuration: configuration,
-            sessionProvider: InMemorySessionProvider(sessionIDGenerator: { UUID().uuidString }),
+            sessionStrategy: .fixed(),
             dateProvider: nil,
             fieldProviders: [],
-            enableNetwork: true
+            enableNetwork: true,
+            storageProvider: Storage.shared,
+            timeProvider: SystemTimeProvider()
         )
         self.loggerURL = url
 

test/platform/swift/unit_integration/ANRReporterTests.swift → test/platform/swift/unit_integration/core/ANRReporterTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/AppUpdateEventListenerTests.swift → test/platform/swift/unit_integration/core/AppUpdateEventListenerTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import XCTest
 
 final class AppUpdateEventListenerTests: XCTestCase {

test/platform/swift/unit_integration/core/BUILD

@@ -0,0 +1,18 @@
+load("//bazel:bitdrift_swift_test.bzl", "bitdrift_mobile_swift_test")
+
+bitdrift_mobile_swift_test(
+    name = "test",
+    srcs = glob(["**/*.swift"]),
+    repository = "@capture",
+    tags = ["macos_only"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//platform/swift/source:ios_lib",
+        "//platform/swift/source:rust_bridge",
+        "//test/platform/swift/benchmark:benchmarks",
+        "//test/platform/swift/bridging:rust_bridge",
+        "//test/platform/swift/unit_integration/mocks",
+        "@Difference//:difference",
+        "@SwiftBenchmark//:swift_benchmark",
+    ],
+)

test/platform/swift/unit_integration/ConfigurationTests.swift → test/platform/swift/unit_integration/core/ConfigurationTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/CoreLoggerTests.swift → test/platform/swift/unit_integration/core/CoreLoggerTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import CapturePassable
 import Foundation
 import XCTest

test/platform/swift/unit_integration/ErrorBridgeTest.swift → test/platform/swift/unit_integration/core/ErrorBridgeTest.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import CaptureTestBridge
 import Foundation
 import XCTest

test/platform/swift/unit_integration/mocks/Logger+Tests.swift → test/platform/swift/unit_integration/core/Logger+Tests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/LoggerIntegratorTests.swift → test/platform/swift/unit_integration/core/LoggerIntegratorTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/LoggerSharedTests.swift → test/platform/swift/unit_integration/core/LoggerSharedTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import XCTest
 
 final class LoggerSharedTests: XCTestCase {

test/platform/swift/unit_integration/LoggerTests.swift → test/platform/swift/unit_integration/core/LoggerTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import CapturePassable
 import Foundation
 import XCTest

test/platform/swift/unit_integration/MetadataProviderTests.swift → test/platform/swift/unit_integration/core/MetadataProviderTests.swift

@@ -7,6 +7,7 @@
 
 @testable import Capture
 @testable import CaptureLoggerBridge
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/core/ResourceUtilizationTargetTest.swift

@@ -0,0 +1,29 @@
+// capture-sdk - bitdrift's client SDK
+// Copyright Bitdrift, Inc. All rights reserved.
+//
+// Use of this source code is governed by a source available license that can be found in the
+// LICENSE file or at:
+// https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
+
+@testable import Capture
+import CaptureMocks
+import XCTest
+
+final class ResourceUtilizationTargetTest: XCTestCase {
+    func testTargetDoesNotCrash() {
+        let target = ResourceUtilizationTarget(
+            storageProvider: MockStorageProvider(),
+            timeProvider: MockTimeProvider()
+        )
+
+        let logger = MockCoreLogging()
+        target.logger = logger
+
+        let expectation = self.expectation(description: "resource utilization log is emitted")
+        logger.logResourceUtilizationExpectation = expectation
+
+        target.tick()
+
+        XCTAssertEqual(.completed, XCTWaiter().wait(for: [expectation], timeout: 0.5))
+    }
+}

test/platform/swift/unit_integration/bridge/EventsListenerTargetTests.swift → test/platform/swift/unit_integration/core/bridge/EventsListenerTargetTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 @testable import CaptureTestBridge
 import XCTest
 

test/platform/swift/unit_integration/bridge/ResourceUtilizationTargetTests.swift → test/platform/swift/unit_integration/core/bridge/ResourceUtilizationTargetTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 @testable import CaptureTestBridge
 import XCTest
 

test/platform/swift/unit_integration/logging/SpanTests.swift → test/platform/swift/unit_integration/core/logging/SpanTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/network/LoggerE2ETest.swift → test/platform/swift/unit_integration/core/network/LoggerE2ETest.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import CapturePassable
 import CaptureTestBridge
 import Foundation

test/platform/swift/unit_integration/network/helper/BaseNetworkingTestCase.swift → test/platform/swift/unit_integration/core/network/helper/BaseNetworkingTestCase.swift

@@ -7,6 +7,7 @@
 
 @testable import Capture
 import CaptureLoggerBridge
+import CaptureMocks
 import CaptureTestBridge
 import Foundation
 import XCTest

test/platform/swift/unit_integration/integrations/BUILD

@@ -0,0 +1,13 @@
+load("//bazel:bitdrift_swift_test.bzl", "bitdrift_mobile_swift_test")
+
+bitdrift_mobile_swift_test(
+    name = "test",
+    srcs = glob(["**/*.swift"]),
+    repository = "@capture",
+    tags = ["macos_only"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//platform/swift/source:ios_lib",
+        "//test/platform/swift/unit_integration/mocks",
+    ],
+)

test/platform/swift/unit_integration/integrations/URLSessionIntegrationTests.swift

@@ -6,6 +6,7 @@
 // https://polyformproject.org/wp-content/uploads/2020/06/PolyForm-Shield-1.0.0.txt
 
 @testable import Capture
+import CaptureMocks
 import Foundation
 import XCTest
 

test/platform/swift/unit_integration/mocks/BUILD

@@ -0,0 +1,17 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "mocks",
+    testonly = True,
+    srcs = glob(["**/*.swift"]),
+    features = [
+        "swift.enable_library_evolution",
+    ],
+    module_name = "CaptureMocks",
+    tags = ["macos_only"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//platform/swift/source:ios_lib",
+        "//platform/swift/source:rust_bridge",
+    ],
+)