Re-enable disabled unit tests

danielsaidi · danielsaidi · commit 6d30c78315e0 · 2025-04-04T09:12:59.000+02:00
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.0
 
 import PackageDescription
 
diff --git a/Tests/RichTextKitTests/RichTextEditorTests.swift b/Tests/RichTextKitTests/RichTextEditorTests.swift
@@ -11,7 +11,7 @@ import RichTextKit
 import SwiftUI
 import XCTest
 
-/*
+@MainActor
 final class RichTextEditorTests: XCTestCase {
 
     private var text: NSAttributedString!
@@ -55,5 +55,4 @@ final class RichTextEditorTests: XCTestCase {
         XCTAssertTrue(coordinator.context === context)
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewIntegrationTests+UIKit.swift b/Tests/RichTextKitTests/RichTextViewIntegrationTests+UIKit.swift
@@ -6,14 +6,14 @@
 //
 
 #if os(iOS)
-import UIKit
-
 import CoreGraphics
 import SwiftUI
-@testable import RichTextKit
+import UIKit
 import XCTest
 
-/*
+@testable import RichTextKit
+
+@MainActor
 final class RichTextViewIntegrationTests: XCTestCase {
 
     private var text: NSAttributedString!
@@ -135,5 +135,4 @@ final class RichTextViewIntegrationTests: XCTestCase {
         XCTAssertTrue(try XCTUnwrap(fontForLastString?.fontDescriptor.symbolicTraits.contains(.traitBold)))
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewRepresentable+AlignmentTests.swift b/Tests/RichTextKitTests/RichTextViewRepresentable+AlignmentTests.swift
@@ -18,7 +18,6 @@ import AppKit
 import RichTextKit
 import XCTest
 
-/*
 final class RichTextViewComponent_AlignmentTests: XCTestCase {
 
     private var textView: RichTextViewComponent!
@@ -95,5 +94,4 @@ final class RichTextViewComponent_AlignmentTests: XCTestCase {
         #endif
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewRepresentable+AttributesTests.swift b/Tests/RichTextKitTests/RichTextViewRepresentable+AttributesTests.swift
@@ -18,7 +18,6 @@ import AppKit
 import RichTextKit
 import XCTest
 
-/*
 final class RichTextViewComponent_AttributesTests: XCTestCase {
 
     private var textView: RichTextViewComponent!
@@ -101,5 +100,4 @@ private extension RichTextViewComponent_AttributesTests {
         assertNonEqualAttribute(attr[.font])
     }
 }
-*/
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewRepresentable+ColorTests.swift b/Tests/RichTextKitTests/RichTextViewRepresentable+ColorTests.swift
@@ -18,7 +18,6 @@ import AppKit
 import RichTextKit
 import XCTest
 
-/*
 final class RichTextViewComponent_ColorTests: XCTestCase {
 
     private var textView: RichTextViewComponent!
@@ -96,5 +95,4 @@ final class RichTextViewComponent_ColorTests: XCTestCase {
         assertEqualColor(textView.typingAttributes[.foregroundColor])
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewRepresentable+FontSizeTests.swift b/Tests/RichTextKitTests/RichTextViewRepresentable+FontSizeTests.swift
@@ -17,7 +17,7 @@ import AppKit
 #if iOS || macOS || os(tvOS)
 import RichTextKit
 import XCTest
-/*
+
 final class RichTextViewComponent_FontSizeTests: XCTestCase {
 
     private var textView: RichTextViewComponent!
@@ -106,5 +106,4 @@ private extension RichTextViewComponent_FontSizeTests {
         XCTAssertNotEqual((attr as? FontRepresentable)?.pointSize, size)
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewRepresentable+StylesTests.swift b/Tests/RichTextKitTests/RichTextViewRepresentable+StylesTests.swift
@@ -18,7 +18,6 @@ import AppKit
 import RichTextKit
 import XCTest
 
-/*
 final class RichTextViewComponent_StylesTests: XCTestCase {
 
     private var textView: RichTextViewComponent!
@@ -80,5 +79,4 @@ final class RichTextViewComponent_StylesTests: XCTestCase {
         XCTAssertFalse(textView.richTextStyles.hasStyle(.underlined))
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/RichTextViewRepresentableTests.swift b/Tests/RichTextKitTests/RichTextViewRepresentableTests.swift
@@ -10,7 +10,6 @@
 import RichTextKit
 import XCTest
 
-/*
 final class RichTextViewComponentTests: XCTestCase {
 
     private var view: RichTextView!
@@ -85,5 +84,4 @@ final class RichTextViewComponentTests: XCTestCase {
         #endif
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/_Foundation/RichTextCoordinator+SubscriptionsTests.swift b/Tests/RichTextKitTests/_Foundation/RichTextCoordinator+SubscriptionsTests.swift
@@ -11,7 +11,7 @@ import RichTextKit
 import SwiftUI
 import XCTest
 
-/*
+@MainActor
 final class RichTextCoordinator_SubscriptionsTests: XCTestCase {
 
     private var text: NSAttributedString!
@@ -49,11 +49,10 @@ final class RichTextCoordinator_SubscriptionsTests: XCTestCase {
         XCTAssertNotNil(coordinator)
     }
 
-    func testFontNameChangesUpdatesTextView() {
+    func testFontNameChangesUpdatesTextView() async {
         XCTAssertNotEqual(textView.richTextFont?.fontName, "Arial")
         textContext.fontName = ""
-
-        eventually {
+        await MainActor.run {
             #if iOS || os(tvOS)
             XCTAssertEqual(self.textView.richTextFont?.fontName, ".SFUI-Regular")
             #elseif macOS
@@ -132,5 +131,4 @@ final class RichTextCoordinator_SubscriptionsTests: XCTestCase {
         XCTAssertEqual(textView.richTextAlignment, .right)
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/_Foundation/RichTextCoordinatorIntegrationTests+UIKit.swift b/Tests/RichTextKitTests/_Foundation/RichTextCoordinatorIntegrationTests+UIKit.swift
@@ -12,7 +12,6 @@ import SwiftUI
 @testable import RichTextKit
 import XCTest
 
-/*
 final class RichTextCoordinatorIntegrationTests: XCTestCase {
     private var text: NSAttributedString!
     private var textBinding: Binding<NSAttributedString>!
@@ -79,5 +78,4 @@ final class RichTextCoordinatorIntegrationTests: XCTestCase {
         XCTAssertEqual(textView.richTextAttributes[.strikethroughStyle] as? Int, 1)
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/_Foundation/RichTextCoordinatorTests.swift b/Tests/RichTextKitTests/_Foundation/RichTextCoordinatorTests.swift
@@ -12,7 +12,6 @@ import XCTest
 
 @testable import RichTextKit
 
-/*
 final class RichTextCoordinatorTests: XCTestCase {
     private var text: NSAttributedString!
     private var textBinding: Binding<NSAttributedString>!
@@ -166,5 +165,4 @@ final class RichTextCoordinatorTests: XCTestCase {
         XCTAssertEqual(view.richTextColor(.foreground), .yellow)
     }
 }
- */
 #endif
diff --git a/Tests/RichTextKitTests/_Foundation/RichTextPresenterTests.swift b/Tests/RichTextKitTests/_Foundation/RichTextPresenterTests.swift
@@ -9,7 +9,6 @@
 import RichTextKit
 import XCTest
 
-/*
 final class RichTextPresenterTests: XCTestCase {
 
     private var text: NSAttributedString!
@@ -62,4 +61,3 @@ private class MockRichTextPresenter: RichTextPresenter {
 
     var selectedRange: NSRange
 }
-*/

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// swift-tools-version: 5.9`
	`1`	`+// swift-tools-version: 6.0`
`2`	`2`
`3`	`3`	`import PackageDescription`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import RichTextKit`
`11`	`11`	`import SwiftUI`
`12`	`12`	`import XCTest`
`13`	`13`
`14`		`-/*`
	`14`	`+@MainActor`
`15`	`15`	`final class RichTextEditorTests: XCTestCase {`
`16`	`16`
`17`	`17`	`private var text: NSAttributedString!`
`@@ -55,5 +55,4 @@ final class RichTextEditorTests: XCTestCase {`
`55`	`55`	`XCTAssertTrue(coordinator.context === context)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`		`- */`
`59`	`58`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,6 @@ import AppKit`
`18`	`18`	`import RichTextKit`
`19`	`19`	`import XCTest`
`20`	`20`
`21`		`-/*`
`22`	`21`	`final class RichTextViewComponent_AlignmentTests: XCTestCase {`
`23`	`22`
`24`	`23`	`private var textView: RichTextViewComponent!`
`@@ -95,5 +94,4 @@ final class RichTextViewComponent_AlignmentTests: XCTestCase {`
`95`	`94`	`#endif`
`96`	`95`	`}`
`97`	`96`	`}`
`98`		`- */`
`99`	`97`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import AppKit`
`17`	`17`	`#if iOS \|\| macOS \|\| os(tvOS)`
`18`	`18`	`import RichTextKit`
`19`	`19`	`import XCTest`
`20`		`-/*`
	`20`	`+`
`21`	`21`	`final class RichTextViewComponent_FontSizeTests: XCTestCase {`
`22`	`22`
`23`	`23`	`private var textView: RichTextViewComponent!`
`@@ -106,5 +106,4 @@ private extension RichTextViewComponent_FontSizeTests {`
`106`	`106`	`XCTAssertNotEqual((attr as? FontRepresentable)?.pointSize, size)`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`- */`
`110`	`109`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import RichTextKit`
`11`	`11`	`import XCTest`
`12`	`12`
`13`		`-/*`
`14`	`13`	`final class RichTextViewComponentTests: XCTestCase {`
`15`	`14`
`16`	`15`	`private var view: RichTextView!`
`@@ -85,5 +84,4 @@ final class RichTextViewComponentTests: XCTestCase {`
`85`	`84`	`#endif`
`86`	`85`	`}`
`87`	`86`	`}`
`88`		`- */`
`89`	`87`	`#endif`