wip

pointfreeco · Jan 23, 2024 · 08b7c11 · 08b7c11
1 parent 9c21097
commit 08b7c11
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 41 deletions.
diff --git a/Sources/XCTestDynamicOverlay/XCTExpectFailure.swift b/Sources/XCTestDynamicOverlay/XCTExpectFailure.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-#if DEBUG && canImport(ObjectiveC)
+#if canImport(ObjectiveC)
   /// Instructs the test to expect a failure in an upcoming assertion, with options to customize
   /// expected failure checking and handling.
   ///

diff --git a/Sources/XCTestDynamicOverlay/XCTFail.swift b/Sources/XCTestDynamicOverlay/XCTFail.swift
@@ -203,7 +203,7 @@ public struct XCTFailContext: Sendable {
         }
       }
       return { (message: String, _ file: StaticString, _ line: UInt) in
-        print(noop(message: message))
+        print("XCTFail: \(message)")
       }
     }()
   }
@@ -213,31 +213,3 @@ public struct XCTFailContext: Sendable {
     DynamicallyResolved.XCTFail(message, file, line)
   }
 #endif
-
-private func noop(message: String, file: StaticString? = nil, line: UInt? = nil) -> String {
-  let fileAndLine: String
-  if let file = file, let line = line {
-    fileAndLine = """
-      :
-      ┃
-      ┃   \(file):\(line)
-      ┃
-      ┃ …
-      """
-  } else {
-    fileAndLine = "\n┃ "
-  }
-
-  return """
-    XCTFail: \(message)
-
-    ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┉┅
-    ┃ ⚠︎ Warning: This XCTFail was ignored
-    ┃
-    ┃ XCTFail was invoked in a non-DEBUG environment\(fileAndLine)and so was ignored. Be sure to run tests with
-    ┃ the DEBUG=1 flag set in order to dynamically
-    ┃ load XCTFail.
-    ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┉┅
-        ▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄▀▄
-    """
-}
diff --git a/Tests/XCTestDynamicOverlayTests/GeneratePlaceholderTests.swift b/Tests/XCTestDynamicOverlayTests/GeneratePlaceholderTests.swift
@@ -1,4 +1,4 @@
-#if DEBUG && !os(Linux) && !os(Windows)
+#if !os(Linux) && !os(Windows)
   import Foundation
   import XCTest
   import XCTestDynamicOverlay

diff --git a/Tests/XCTestDynamicOverlayTests/TestHelpers.swift b/Tests/XCTestDynamicOverlayTests/TestHelpers.swift
@@ -5,7 +5,7 @@ func MyXCTFail(_ message: String) {
   XCTFail(message)
 }
 
-#if DEBUG && canImport(ObjectiveC)
+#if canImport(ObjectiveC)
   func MyXCTExpectFailure(
     _ failureReason: String,
     enabled: Bool = true,

diff --git a/Tests/XCTestDynamicOverlayTests/UnimplementedTests.swift b/Tests/XCTestDynamicOverlayTests/UnimplementedTests.swift
@@ -1,4 +1,4 @@
-#if DEBUG && !os(Linux) && !os(Windows)
+#if !os(Linux) && !os(Windows)
   import XCTest
 
   final class UnimplementedTests: XCTestCase {
@@ -10,7 +10,7 @@
           Unimplemented: f00 …
 
             Defined at:
-              XCTestDynamicOverlayTests/TestHelpers.swift:70
+              XCTestDynamicOverlayTests/TestHelpers.swift:98
           """
       }
 
@@ -21,7 +21,7 @@
           Unimplemented: f01 …
 
             Defined at:
-              XCTestDynamicOverlayTests/TestHelpers.swift:71
+              XCTestDynamicOverlayTests/TestHelpers.swift:99
 
             Invoked with:
               ""
@@ -35,7 +35,7 @@
           Unimplemented: f02 …
 
             Defined at:
-              XCTestDynamicOverlayTests/TestHelpers.swift:72
+              XCTestDynamicOverlayTests/TestHelpers.swift:100
 
             Invoked with:
               ("", 42)
@@ -49,7 +49,7 @@
           Unimplemented: f03 …
 
             Defined at:
-              XCTestDynamicOverlayTests/TestHelpers.swift:73
+              XCTestDynamicOverlayTests/TestHelpers.swift:101
 
             Invoked with:
               ("", 42, 1.2)
@@ -63,7 +63,7 @@
           Unimplemented: f04 …
 
             Defined at:
-              XCTestDynamicOverlayTests/TestHelpers.swift:74
+              XCTestDynamicOverlayTests/TestHelpers.swift:102
 
             Invoked with:
               ("", 42, 1.2, [1, 2])
@@ -79,7 +79,7 @@
           Unimplemented: f05 …
 
             Defined at:
-              XCTestDynamicOverlayTests/TestHelpers.swift:75
+              XCTestDynamicOverlayTests/TestHelpers.swift:103
 
             Invoked with:
               ("", 42, 1.2, [1, 2], XCTestDynamicOverlayTests.User(id: DEADBEEF-DEAD-BEEF-DEAD-BEEFDEADBEEF))

diff --git a/Tests/XCTestDynamicOverlayTests/XCTContextTests.swift b/Tests/XCTestDynamicOverlayTests/XCTContextTests.swift
@@ -1,4 +1,4 @@
-#if DEBUG && !os(Linux) && !os(Windows)
+#if !os(Linux) && !os(Windows)
   import XCTest
   import XCTestDynamicOverlay
 

diff --git a/Tests/XCTestDynamicOverlayTests/XCTExpectFailureTests.swift b/Tests/XCTestDynamicOverlayTests/XCTExpectFailureTests.swift
@@ -1,6 +1,6 @@
 import XCTest
 
-#if DEBUG && canImport(ObjectiveC)
+#if canImport(ObjectiveC)
   final class XCTExpectFailureTests: XCTestCase {
     func testXCTDynamicOverlayWithBlockShouldFail() async throws {
       MyXCTExpectFailure("This is expected to pass.", strict: false) {