Merge branch 'develop' into release/2.20.0

Author: ncreated

.gitlab-ci.yml

@@ -103,7 +103,7 @@ Unit Tests (iOS):
   script:
     - ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE"
     - make clean repo-setup ENV=ci
-    - make test-ios-all OS="$DEFAULT_IOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE" USE_TEST_VISIBILITY=0
+    - make test-ios-all OS="$DEFAULT_IOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE" USE_TEST_VISIBILITY=1
 
 Unit Tests (tvOS):
   stage: test
@@ -116,7 +116,7 @@ Unit Tests (tvOS):
   script:
     - ./tools/runner-setup.sh --xcode "$DEFAULT_XCODE"
     - make clean repo-setup ENV=ci
-    - make test-tvos-all OS="$DEFAULT_TVOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE" USE_TEST_VISIBILITY=0
+    - make test-tvos-all OS="$DEFAULT_TVOS_OS" PLATFORM="$PLATFORM" DEVICE="$DEVICE" USE_TEST_VISIBILITY=1
 
 UI Tests:
   stage: ui-test

DatadogCore/Tests/Datadog/Mocks/DirectoriesMock.swift

@@ -70,9 +70,9 @@ extension Directory {
         do {
             try FileManager.default.createDirectory(at: url, withIntermediateDirectories: true, attributes: attributes)
             let initialFilesCount = try files().count
-            XCTAssert(initialFilesCount == 0, "🔥 `TestsDirectory` is not empty: \(url)", file: file, line: line)
+            XCTAssert(initialFilesCount == 0, "🔥 `Directory` is not empty: \(url)", file: file, line: line)
         } catch {
-            XCTFail("🔥 Failed to create `TestsDirectory`: \(error)", file: file, line: line)
+            XCTFail("🔥 `Directory.create()` failed: \(error)", file: file, line: line)
         }
         return self
     }
@@ -83,7 +83,7 @@ extension Directory {
             do {
                 try FileManager.default.removeItem(at: url)
             } catch {
-                XCTFail("🔥 Failed to delete `TestsDirectory`: \(error)", file: file, line: line)
+                XCTFail("🔥 `Directory.delete()` failed: \(error)", file: file, line: line)
             }
         }
     }

TestUtilities/Helpers/TestsDirectory.swift

@@ -30,9 +30,9 @@ public func CreateTemporaryDirectory(attributes: [FileAttributeKey: Any]? = nil,
         try FileManager.default.createDirectory(at: temporaryDirectory, withIntermediateDirectories: true, attributes: attributes)
         let files = try FileManager.default
             .contentsOfDirectory(at: temporaryDirectory, includingPropertiesForKeys: [.isRegularFileKey, .canonicalPathKey])
-        XCTAssert(files.count == 0, "🔥 `TestsDirectory` is not empty: \(temporaryDirectory)", file: file, line: line)
+        XCTAssert(files.count == 0, "🔥 `temporaryDirectory` is not empty: \(temporaryDirectory)", file: file, line: line)
     } catch {
-        XCTFail("🔥 Failed to create `TestsDirectory`: \(error)", file: file, line: line)
+        XCTFail("🔥 `CreateTemporaryDirectory()` failed: \(error)", file: file, line: line)
     }
 }
 
@@ -43,7 +43,7 @@ public func DeleteTemporaryDirectory(file: StaticString = #file, line: UInt = #l
         do {
             try FileManager.default.removeItem(at: temporaryDirectory)
         } catch {
-            XCTFail("🔥 Failed to delete `TestsDirectory`: \(error)", file: file, line: line)
+            XCTFail("🔥 `DeleteTemporaryDirectory()` failed: \(error)", file: file, line: line)
         }
     }
 }