add test

Author: tomerd

Sources/Basics/Observability.swift

@@ -460,13 +460,9 @@ extension ObservabilityScope {
 //@available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
 extension Diagnostic {
     init?(_ diagnostic: TSCDiagnostic) {
-        var metadata: ObservabilityMetadata?
-        if diagnostic.location is UnknownLocation {
-            metadata = .none
-        } else {
-            metadata = ObservabilityMetadata()
-            metadata?.legacyDiagnosticLocation = .init(diagnostic.location)
-        }
+        var metadata = ObservabilityMetadata()
+        metadata.legacyDiagnosticLocation = .init(diagnostic.location)
+        metadata.legacyDiagnosticData = .init(diagnostic.data)
 
         switch diagnostic.behavior {
         case .error:
@@ -560,7 +556,7 @@ extension ObservabilityMetadata {
 
 //@available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
 extension ObservabilityMetadata {
-    fileprivate var legacyDiagnosticData: DiagnosticDataWrapper? {
+    var legacyDiagnosticData: DiagnosticDataWrapper? {
         get {
             self[LegacyDataKey.self]
         }
@@ -569,11 +565,11 @@ extension ObservabilityMetadata {
         }
     }
 
-    fileprivate enum LegacyDataKey: Key {
+    enum LegacyDataKey: Key {
         typealias Value = DiagnosticDataWrapper
     }
 
-    fileprivate struct DiagnosticDataWrapper: CustomStringConvertible {
+    struct DiagnosticDataWrapper: CustomStringConvertible {
         let underlying: DiagnosticData
 
         public init (_ underlying: DiagnosticData) {

Tests/BasicsTests/ObservabilitySystemTests.swift

@@ -160,6 +160,52 @@ final class ObservabilitySystemTest: XCTestCase {
         }
     }
 
+    @available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
+    func testBridging() throws {
+
+        do {
+            let collector = Collector()
+            let observabilitySystem = ObservabilitySystem(collector)
+            let diagnosticsEngine = observabilitySystem.topScope.makeDiagnosticsEngine()
+
+            let data = TestData()
+            let location = TestLocation()
+
+            diagnosticsEngine.emit(.error(data), location: location)
+            testDiagnostics(collector.diagnostics) { result in
+                var expectedMetadata = ObservabilityMetadata()
+                expectedMetadata.legacyDiagnosticLocation = .init(location)
+                expectedMetadata.legacyDiagnosticData = .init(data)
+                result.check(diagnostic: "\(data)", severity: .error, metadata: expectedMetadata)
+            }
+        }
+
+        do {
+            let diagnosticsEngine1 = DiagnosticsEngine()
+            let observabilitySystem = ObservabilitySystem(diagnosticEngine: diagnosticsEngine1)
+            let diagnosticsEngine2 = observabilitySystem.topScope.makeDiagnosticsEngine()
+
+            let data = TestData()
+            let location = TestLocation()
+
+            diagnosticsEngine2.emit(.error(data), location: location)
+
+
+            XCTAssertEqual(diagnosticsEngine1.diagnostics.count, 1)
+            XCTAssertEqual(diagnosticsEngine1.diagnostics.first!.message.data as? TestData, data)
+            XCTAssertEqual(diagnosticsEngine1.diagnostics.first!.location as? TestLocation, location)
+        }
+
+        struct TestData: DiagnosticData, Equatable {
+            var description: String = UUID().uuidString
+        }
+
+        struct TestLocation: DiagnosticLocation, Equatable {
+            var description: String = UUID().uuidString
+
+        }
+    }
+
     struct Collector: ObservabilityHandlerProvider, DiagnosticsHandler {
         private let _diagnostics = ThreadSafeArrayStore<Diagnostic>()