Merge pull request #305 from BlueOwlOpenSource/fixes-test-failure-when-fulfill-calls-multiple-times

Author: Ignacio Bonafonte

Tests/ExportersTests/DatadogExporter/Files/FileTests.swift

@@ -8,6 +8,7 @@ import XCTest
 
 class FileTests: XCTestCase {
     private let fileManager = FileManager.default
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
     override func setUp() {
         super.setUp()

Tests/ExportersTests/DatadogExporter/Helpers/TestsDirectory.swift

@@ -18,7 +18,7 @@ func obtainUniqueTemporaryDirectory() -> Directory {
 
 /// `Directory` pointing to subfolder in `/var/folders/`.
 /// The subfolder does not exist and can be created and deleted by calling `.create()` and `.delete()`.
-let temporaryDirectory = obtainUniqueTemporaryDirectory()
+//let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
 /// Extends `Directory` with set of utilities for convenient work with files in tests.
 /// Provides handy methods to create / delete files and directires.

Tests/ExportersTests/DatadogExporter/Persistence/FileReaderTests.swift

@@ -7,6 +7,8 @@
 import XCTest
 
 class FileReaderTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     override func setUp() {
         super.setUp()
         temporaryDirectory.create()

Tests/ExportersTests/DatadogExporter/Persistence/FileWriterTests.swift

@@ -7,6 +7,8 @@
 import XCTest
 
 class FileWriterTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     override func setUp() {
         super.setUp()
         temporaryDirectory.create()

Tests/ExportersTests/DatadogExporter/Persistence/FilesOrchestratorTests.swift

@@ -8,6 +8,7 @@ import XCTest
 
 class FilesOrchestratorTests: XCTestCase {
     private let performance: PerformancePreset = .default
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
     override func setUp() {
         super.setUp()

Tests/ExportersTests/DatadogExporter/Upload/DataUploadWorkerTests.swift

@@ -7,6 +7,8 @@
 import XCTest
 
 class DataUploadWorkerTests: XCTestCase {
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     lazy var dateProvider = RelativeDateProvider(advancingBySeconds: 1)
     lazy var orchestrator = FilesOrchestrator(
         directory: temporaryDirectory,

Tests/ExportersTests/PersistenceExporter/Export/DataExportWorkerTests.swift

@@ -146,10 +146,16 @@ class DataExportWorkerTests: XCTestCase {
             }
         }
 
-        let exportExpectation = self.expectation(description: "value exported")
-        
+        let exportExpectation = expectation(description: "value exported")
+
+        // The onExport closure is called more than once as part of test execution
+        // It does not seem to be called the same number of times on each test run.
+        // Setting `assertForOverFulfill` to `false` works around the XCTestExpectation
+        // error that fails the test.
+        // "API violation - multiple calls made to -[XCTestExpectation fulfill] for value exported."
+        exportExpectation.assertForOverFulfill = false
+
         var mockDataExporter = DataExporterMock(exportStatus: .mockWith(needsRetry: true))
-        
         mockDataExporter.onExport = { data in exportExpectation.fulfill() }
 
         // When

Tests/ExportersTests/PersistenceExporter/Helpers/TestsDirectory.swift

@@ -18,7 +18,7 @@ func obtainUniqueTemporaryDirectory() -> Directory {
 
 /// `Directory` pointing to subfolder in `/var/folders/`.
 /// The subfolder does not exist and can be created and deleted by calling `.create()` and `.delete()`.
-let temporaryDirectory = obtainUniqueTemporaryDirectory()
+//let temporaryDirectory = obtainUniqueTemporaryDirectory()
 
 /// Extends `Directory` with set of utilities for convenient work with files in tests.
 /// Provides handy methods to create / delete files and directires.

Tests/ExportersTests/PersistenceExporter/PersistenceMetricExporterDecoratorTests.swift

@@ -9,7 +9,8 @@ import OpenTelemetrySdk
 import XCTest
 
 class PersistenceMetricExporterDecoratorTests: XCTestCase {
-    
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     class MetricExporterMock: MetricExporter {
 
         let onExport: ([Metric]) -> MetricExporterResultCode

Tests/ExportersTests/PersistenceExporter/PersistenceSpanExporterDecoratorTests.swift

@@ -9,7 +9,8 @@ import OpenTelemetrySdk
 import XCTest
 
 class PersistenceSpanExporterDecoratorTests: XCTestCase {
-    
+    private let temporaryDirectory = obtainUniqueTemporaryDirectory()
+
     class SpanExporterMock: SpanExporter {
 
         let onExport: ([SpanData]) -> SpanExporterResultCode