gematik · sigabrtz · Jul 21, 2025 · Feb 11, 2025
diff --git a/IntegrationTests/AnyPublisher+Test.swift b/IntegrationTests/AnyPublisher+Test.swift
@@ -0,0 +1,67 @@
+//
+//  Copyright (c) 2023 gematik GmbH
+//
+//  Licensed under the Apache License, Version 2.0 (the License);
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an 'AS IS' BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+import Combine
+import Foundation
+
+extension AnyPublisher {
+    /// Convenience function for testing a Publisher's emitted values
+    func test() throws -> Self.Output {
+        try testWithTimeout(timeout: 0)
+    }
+
+    /// Convenience function for testing a Publisher's emitted values
+    func testWithTimeout(timeout millis: Int = 3000, sleep interval: TimeInterval = 0.1) throws -> Self.Output {
+        var done = false
+        var output: Self.Output?
+        var error: Self.Failure?
+        let timeoutTime = DispatchTime.now() + DispatchTimeInterval.milliseconds(millis)
+        let cancellable = sink(
+            receiveCompletion: { completion in
+                switch completion {
+                case .finished: done = true
+                case let .failure(failure):
+                    error = failure
+                    done = true
+                }
+            },
+            receiveValue: { receivedValue in
+                output = receivedValue
+            }
+        )
+
+        while !done && (timeoutTime > DispatchTime.now() || millis <= 0) {
+            RunLoop.current.run(mode: .default, before: Date(timeIntervalSinceNow: interval))
+        }
+        if !done {
+            cancellable.cancel()
+            throw AnyPublisherTestError.timeoutError
+        }
+
+        if let output = output {
+            return output
+        } else if let error = error {
+            throw error
+        } else {
+            throw AnyPublisherTestError.noValuesPublished
+        }
+    }
+}
+
+enum AnyPublisherTestError: Error {
+    case noValuesPublished
+    case timeoutError
+}
diff --git a/IntegrationTests/HealthCardControl/AuthenticateChallengeE256Test.swift b/IntegrationTests/HealthCardControl/AuthenticateChallengeE256Test.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class AuthenticateChallengeE256Test: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/AuthenticateChallengeR2048Test.swift b/IntegrationTests/HealthCardControl/AuthenticateChallengeR2048Test.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class AuthenticateChallengeR2048Test: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/CardChannelTypeExtVersionIntegrationTest.swift b/IntegrationTests/HealthCardControl/CardChannelTypeExtVersionIntegrationTest.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class CardChannelTypeExtVersionIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/DetermineCardAidIntegrationTest.swift b/IntegrationTests/HealthCardControl/DetermineCardAidIntegrationTest.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class DetermineCardAidIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/HealthCardTypeExtChangeReferenceDataIntegrationTest.swift b/IntegrationTests/HealthCardControl/HealthCardTypeExtChangeReferenceDataIntegrationTest.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class HealthCardTypeExtChangeReferenceDataIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/...tionTests/HealthCardControl/HealthCardTypeExtChangeReferenceDataIntegrationTestCont.swift b/...tionTests/HealthCardControl/HealthCardTypeExtChangeReferenceDataIntegrationTestCont.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 // Note: This continuation of `HealthCardTypeExtChangeReferenceDataIntegrationTest` exists to separate

diff --git a/IntegrationTests/HealthCardControl/HealthCardTypeExtESIGNIntegrationTest.swift b/IntegrationTests/HealthCardControl/HealthCardTypeExtESIGNIntegrationTest.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class HealthCardTypeExtESIGNIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/HealthCardTypeExtEfCardAccessIntTest.swift b/IntegrationTests/HealthCardControl/HealthCardTypeExtEfCardAccessIntTest.swift
@@ -18,7 +18,6 @@ import CardReaderProviderApi
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class HealthCardTypeExtEfCardAccessIntTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/HealthCardTypeExtResetRetryCounterIntegrationTest.swift b/IntegrationTests/HealthCardControl/HealthCardTypeExtResetRetryCounterIntegrationTest.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class HealthCardTypeExtResetRetryCounterIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/...rationTests/HealthCardControl/HealthCardTypeExtResetRetryCounterIntegrationTestCont.swift b/...rationTests/HealthCardControl/HealthCardTypeExtResetRetryCounterIntegrationTestCont.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 // Note: This continuation of `HealthCardTypeExtResetRetryCounterIntegrationTest` exists to separate the count dependent

diff --git a/...onTests/HealthCardControl/HealthCardTypeExtResetRetryCounterIntegrationTestContCont.swift b/...onTests/HealthCardControl/HealthCardTypeExtResetRetryCounterIntegrationTestContCont.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 // Note: This continuation of `HealthCardTypeExtResetRetryCounterIntegrationTest` exists to separate the count dependent

diff --git a/IntegrationTests/HealthCardControl/HealthCardTypeExtVerifyPinTest.swift b/IntegrationTests/HealthCardControl/HealthCardTypeExtVerifyPinTest.swift
@@ -18,7 +18,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class HealthCardTypeExtVerifyPinTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/KeyAgreementIntegrationTest.swift b/IntegrationTests/HealthCardControl/KeyAgreementIntegrationTest.swift
@@ -19,7 +19,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class KeyAgreementIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/OpenSecureSessionIntegrationTest.swift b/IntegrationTests/HealthCardControl/OpenSecureSessionIntegrationTest.swift
@@ -20,7 +20,6 @@ import Foundation
 import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
-import Util
 import XCTest
 
 final class OpenSecureSessionIntegrationTest: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/HealthCardControl/ReadAutCertificateE256Test.swift b/IntegrationTests/HealthCardControl/ReadAutCertificateE256Test.swift
@@ -19,7 +19,6 @@ import HealthCardAccess
 @testable import HealthCardControl
 import Nimble
 import OSLog
-import Util
 import XCTest
 
 final class ReadAutCertificateE256Test: CardSimulationTerminalTestCase {

diff --git a/IntegrationTests/project.yml b/IntegrationTests/project.yml
@@ -30,12 +30,15 @@ targets:
     sources:
       - path: IntegrationTests
     dependencies:
-      - target: CardReaderAccess_macOS
-      - target: CardReaderProviderApi_macOS
-      - target: HealthCardAccess_macOS
-      - target: HealthCardControl_macOS
-      - target: Util_macOS
-      - framework: Carthage/Build/Nimble.xcframework
+      - package: Openhealthcardkit
+        product: CardReaderAccess
+      - package: Openhealthcardkit
+        product: CardReaderProviderApi 
+      - package: Openhealthcardkit
+        product: HealthCardAccess
+      - package: Openhealthcardkit
+        product: HealthCardControl
+      - package: Nimble
       - target: CardSimulationCardReaderProvider
       - target: CardSimulationLoader
       - package: AEXML
@@ -123,8 +126,10 @@ targets:
     dependencies:
       - target: CardSimulationLoader
       - package: ASN1Kit
-      - target: CardReaderProviderApi_macOS
-      - target: CardReaderAccess_macOS
+      - package: Openhealthcardkit
+        product: CardReaderProviderApi 
+      - package: Openhealthcardkit
+        product: CardReaderAccess
       - framework: Carthage/Build/SwiftSocket.xcframework
     transitivelyLinkDependencies: true
   CardSimulationLoaderTests:
@@ -140,18 +145,21 @@ targets:
       - package: AEXML
       - target: AEXMLExt
       - target: CardSimulationLoader
-      - framework: Carthage/Build/Nimble.xcframework
+      - package: Nimble
     gatherCoverageData: true
   AEXMLExtTests:
     type: bundle.unit-test
     platform: macOS
     bundleIdPrefix: de.gematik.ti.openhealthcard.cardsimulation
+    settings:
+      base:
+        OTHER_SWIFT_FLAGS: -no-verify-emitted-module-interface
     sources:
       - CardSimulationTestKit/Tests/AEXMLExtTests
     dependencies:
       - target: AEXMLExt
       - package: AEXML
-      - framework: Carthage/Build/Nimble.xcframework
+      - package: Nimble
     gatherCoverageData: true
   CardSimulationCardReaderProviderTests:
     type: bundle.unit-test
@@ -165,5 +173,7 @@ targets:
     dependencies:
       - target: CardSimulationCardReaderProvider
       - target: AEXMLExt
-      - framework: Carthage/Build/Nimble.xcframework
+      - package: Openhealthcardkit
+        product: CardReaderAccess
+      - package: Nimble
     gatherCoverageData: true
diff --git a/Mintfile b/Mintfile
@@ -1,4 +1,4 @@
 realm/SwiftLint@0.44.0
-yonaskolb/xcodegen@2.38.0
+yonaskolb/xcodegen@2.42.0
 Carthage/Carthage@0.40.0
 nicklockwood/SwiftFormat@0.48.7
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -9,26 +9,19 @@ let package = Package(
         .macOS(.v12)
     ],
     products: [
-        .library(
-            name: "HealthCardControl",
-            targets: ["HealthCardControl"]),
-        .library(
-            name: "NFCCardReaderProvider",
-            targets: ["NFCCardReaderProvider"]),
-        .library(
-            name: "HealthCardAccess",
-            targets: ["HealthCardAccess"]),
-        .library(
-            name: "CardReaderProviderApi",
-            targets: ["CardReaderProviderApi"]),
-        .library(
-            name: "Helper",
-            targets: ["Helper"]),    
+        .library(name: "HealthCardControl", targets: ["HealthCardControl"]),
+        .library(name: "NFCCardReaderProvider", targets: ["NFCCardReaderProvider"]),
+        .library(name: "HealthCardAccess", targets: ["HealthCardAccess"]),
+        .library(name: "CardReaderProviderApi", targets: ["CardReaderProviderApi"]),
+        .library(name: "Helper", targets: ["Helper"]),    
+        // TODO: Remove this (and the .target) at a later time. For now it's only needed for the CardSimulationTests
+        .library(name: "CardReaderAccess", targets: ["CardReaderAccess"]),
     ],
     dependencies: [
         .package(url: "https://github.com/gematik/ASN1Kit.git", from: "1.2.0"),
         .package(url: "https://github.com/gematik/OpenSSL-Swift", from: "4.2.0"),
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
+        .package(url: "https://github.com/Quick/Nimble", from: "12.0.0"),
     ],
     targets: [
         .target(
@@ -49,7 +42,7 @@ let package = Package(
         ),
         .target(
             name: "HealthCardAccess",
-            dependencies: ["CardReaderAccess", "CardReaderProviderApi", "ASN1Kit"]
+            dependencies: ["CardReaderProviderApi", "ASN1Kit"]
         ),
         .target(
             name: "CardReaderAccess",
@@ -62,5 +55,27 @@ let package = Package(
         .target(
             name: "Helper"
         ),
+        .testTarget(
+            name: "HealthCardControlTests",
+            dependencies: ["HealthCardControl", "Nimble"],
+            resources: [
+                .process("Resources.bundle")
+            ]
+        ),
+        .testTarget(
+            name: "HealthCardAccessTests",
+            dependencies: ["HealthCardAccess", "Nimble"],
+            resources: [
+                .process("Resources.bundle")
+            ]
+        ),
+        .testTarget(
+            name: "CardReaderAccessTests",
+            dependencies: ["CardReaderAccess", "Nimble"]
+        ),
+        .testTarget(
+            name: "CardReaderProviderApiTests",
+            dependencies: ["CardReaderProviderApi", "Nimble"]
+        ),
     ]
 )
diff --git a/Sources/NFCCardReaderProvider/Reader/NFCTagReaderSession+Publisher.swift b/Sources/NFCCardReaderProvider/Reader/NFCTagReaderSession+Publisher.swift
@@ -266,8 +266,6 @@ extension NFCTagReaderSession.Publisher {
     }
 }
 
-#endif
-
 @propertyWrapper
 struct Synchronized<T> {
     private let backing: SynchronizedVar<T>
@@ -333,3 +331,4 @@ class SynchronizedVar<T> {
         mutex.unlock()
     }
 }
+#endif