chore: update tests to swift testing

NoahKamara · Oct 24, 2024 · 39338c0 · 39338c0
1 parent dcb3b4a
commit 39338c0
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 49 deletions.
diff --git a/Tests/CompoundPredicateTests/ArithmeticTests.swift b/Tests/CompoundPredicateTests/ArithmeticTests.swift
@@ -1,7 +1,6 @@
-import XCTesting
+import Testing
+import Foundation
 
-
-@XCTesting
 @Suite
 /// Tests for Arithmetic (+, -, \*, /, %) and Unary Minus (-) Operators
 struct ArithmeticTests {
@@ -118,8 +117,8 @@ struct ArithmeticTests {
     }
 }
 
-extension PredicateExpressions.Variable: Equatable {
-    public static func == (lhs: Self, rhs: Self) -> Bool {
-        lhs.key == rhs.key
-    }
-}
+//extension PredicateExpressions.Variable: Equatable {
+//    public static func == (lhs: Self, rhs: Self) -> Bool {
+//        lhs.key == rhs.key
+//    }
+//}
diff --git a/Tests/CompoundPredicateTests/BasicTests.swift b/Tests/CompoundPredicateTests/BasicTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 @testable import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct BasicTests {
     @Test
@@ -92,23 +92,7 @@ struct BasicTests {
         let lhs = Predicate<Bool>({ CustomPredicate(variable: $0) })
         let rhs = Predicate<Bool>({ CustomPredicate(variable: $0) })
 
-        await confirmation(expectedCount: 2) { confirm in
-            NotificationCenter.default.addObserver(
-                forName: .foundationExtensionsRuntimeWarning,
-                object: nil,
-                queue: .main
-            ) { notification in
-                let runtimeWarnMsg = try? #require(notification.userInfo?["message"] as? String)
-
-                guard let runtimeWarnMsg else { return }
-
-                #expect(runtimeWarnMsg.contains("\(CustomPredicate.self) is not a supported Predicate."))
-
-                print("CALLED")
-                confirm()
-            }
-
-            XCTExpectFailure("Cannot combine unsupported Predicate", strict: true)
+        withKnownIssue {
             _ = [lhs, rhs].disjunction()
         }
     }

diff --git a/Tests/CompoundPredicateTests/BooleanLogicTests.swift b/Tests/CompoundPredicateTests/BooleanLogicTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct BooleanLogicTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/CastingTests.swift b/Tests/CompoundPredicateTests/CastingTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct CastingTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/ComparisonTests.swift b/Tests/CompoundPredicateTests/ComparisonTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
+import Foundation
 
 
-@XCTesting
 @Suite
 struct ComparisonTests {
     @Test(arguments: [PredicateExpressions.ComparisonOperator.greaterThan, .greaterThanOrEqual, .lessThan, .lessThanOrEqual])

diff --git a/Tests/CompoundPredicateTests/ConditionalTests.swift b/Tests/CompoundPredicateTests/ConditionalTests.swift
@@ -1,7 +1,6 @@
-import XCTesting
+import Testing
+import Foundation
 
-
-@XCTesting
 @Suite
 struct ConditionalLogicTests {
     @Test
@@ -31,3 +30,4 @@ struct ConditionalLogicTests {
         #expect(testReplaced.test == replacement)
     }
 }
+
diff --git a/Tests/CompoundPredicateTests/OptionalTests.swift b/Tests/CompoundPredicateTests/OptionalTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct OptionalTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/RangeTests.swift b/Tests/CompoundPredicateTests/RangeTests.swift
@@ -1,7 +1,6 @@
-import XCTesting
+import Testing
+import Foundation
 
-
-@XCTesting
 @Suite
 struct RangeTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/SequenceOperationTests.swift b/Tests/CompoundPredicateTests/SequenceOperationTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct SequenceOperationTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/StringComparisonTests.swift b/Tests/CompoundPredicateTests/StringComparisonTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct StringComparisonTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/SubscriptAndMemberTests.swift b/Tests/CompoundPredicateTests/SubscriptAndMemberTests.swift
@@ -1,7 +1,7 @@
-import XCTesting
+import Testing
 @testable import CompoundPredicate
+import Foundation
 
-@XCTesting
 @Suite
 struct SubscriptAndMemberTests {
     @Test

diff --git a/Tests/CompoundPredicateTests/Utility/Utility.swift b/Tests/CompoundPredicateTests/Utility/Utility.swift
@@ -1,8 +1,8 @@
 import Foundation
 
 // MARK: Person
-struct Person: PredicateCodableKeyPathProviding {
-    static var predicateCodableKeyPaths: [String : PartialKeyPath<Person>] = [
+struct Person: Sendable, PredicateCodableKeyPathProviding {
+    static var predicateCodableKeyPaths: [String : any PartialKeyPath<Person> & Sendable] = [
         "Person.name": \.name,
         "Person.age": \.age,
         "Person.isStarred": \.isStarred,
@@ -148,3 +148,12 @@ fileprivate struct Unknown: CustomStringConvertible {
     }
 }
 
+
+
+
+
+extension PredicateExpressions.Variable: @retroactive Equatable {
+    public static func == (lhs: Self, rhs: Self) -> Bool {
+        lhs.key == rhs.key
+    }
+}