From a1b6acd2b237095256f3ca2aff8ac06d151629e4 Mon Sep 17 00:00:00 2001
From: Mike Schreiber <mischreiber@microsoft.com>
Date: Thu, 1 Feb 2024 17:10:10 -0800
Subject: [PATCH 1/3] Restore AvatarTests and enable for SPM

---
 Package.swift                                  |  7 +++++++
 ios/FluentUI.Tests/AvatarTests.swift           | 18 ++++++++----------
 ios/FluentUI.Tests/ColorTests.swift            |  4 ++++
 .../DatePickerControllerTests.swift            |  4 ++++
 ios/FluentUI.Tests/FluentUITests.swift         |  4 ++++
 ios/FluentUI.Tests/FontTests.swift             |  4 ++++
 ios/FluentUI.xcodeproj/project.pbxproj         |  4 ++++
 .../xcschemes/FluentUI-iOS.xcscheme            |  2 +-
 ios/FluentUI/Avatar/Avatar.swift               |  6 +++---
 9 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/Package.swift b/Package.swift
index db4600650b..8d513dd261 100644
--- a/Package.swift
+++ b/Package.swift
@@ -47,6 +47,13 @@ let package = Package(
                 "TwoLineTitleView/TwoLineTitleView.resources.xcfilelist",
             ]
         ),
+        .testTarget(
+            name: "FluentUITests-iOS",
+            dependencies: [
+                .target(name: "FluentUI_ios", condition: .when(platforms: [.iOS, .visionOS])),
+            ],
+            path: "ios/FluentUI.Tests"
+        ),
         .target(
             name: "FluentUI_macos",
             path: "macos/FluentUI",
diff --git a/ios/FluentUI.Tests/AvatarTests.swift b/ios/FluentUI.Tests/AvatarTests.swift
index 1daad5c001..027b2ed74a 100644
--- a/ios/FluentUI.Tests/AvatarTests.swift
+++ b/ios/FluentUI.Tests/AvatarTests.swift
@@ -4,17 +4,14 @@
 //
 
 import XCTest
-import FluentUI
+#if SWIFT_PACKAGE
+@testable import FluentUI_ios
+#else
+@testable import FluentUI
+#endif
 
 class AvatarTests: XCTestCase {
 
-    /// Validates that the number of colors defined for tokens textCalculatedBackgroundColors and textCalculatedForegroundColors are the same.
-    func testTextCalculatedBackgroundForegroundColorsCount() {
-        XCTAssertEqual(FluentUIThemeManager.S.MSFAvatarTokens.textCalculatedBackgroundColors.count,
-                       FluentUIThemeManager.S.MSFAvatarTokens.textCalculatedForegroundColors.count,
-                       "Text calculated background and foreground colors should provide the same number of options.")
-    }
-
     /// Validates that the background and foreground colors for a given index in both arrays (textCalculatedBackgroundColors and textCalculatedForegroundColors tokens) match comparing:
     ///  1. A color light mode background color with its counterpart dark mode foreground color. The color should be the same (tint40)
     ///  2. A color light mode foreground color with its counterpart dark mode background color. The color should be the same (shade30)
@@ -27,8 +24,9 @@ class AvatarTests: XCTestCase {
     ///    - Background: shade30
     ///    - Foreground: tint40
     func testTextCalculatedBackgroundForegroundColorsMatch() {
-        let bgColors = FluentUIThemeManager.S.MSFAvatarTokens.textCalculatedBackgroundColors
-        let fgColors = FluentUIThemeManager.S.MSFAvatarTokens.textCalculatedForegroundColors
+        let colors = Avatar.CalculatedColors.colors
+        let bgColors = (0..<colors.count).map { Avatar.CalculatedColors.backgroundColor(hashCode: $0) }
+        let fgColors = (0..<colors.count).map { Avatar.CalculatedColors.foregroundColor(hashCode: $0) }
         let lightModeTraitCollection = UITraitCollection(userInterfaceStyle: .light)
         let darkModeTraitCollection = UITraitCollection(userInterfaceStyle: .dark)
 
diff --git a/ios/FluentUI.Tests/ColorTests.swift b/ios/FluentUI.Tests/ColorTests.swift
index f7148ebe08..0094ac7d0e 100644
--- a/ios/FluentUI.Tests/ColorTests.swift
+++ b/ios/FluentUI.Tests/ColorTests.swift
@@ -4,7 +4,11 @@
 //
 
 import XCTest
+#if SWIFT_PACKAGE
+@testable import FluentUI_ios
+#else
 @testable import FluentUI
+#endif
 
 class ColorTests: XCTestCase {
 
diff --git a/ios/FluentUI.Tests/DatePickerControllerTests.swift b/ios/FluentUI.Tests/DatePickerControllerTests.swift
index 26fe92c5c2..bbfeeb1c61 100644
--- a/ios/FluentUI.Tests/DatePickerControllerTests.swift
+++ b/ios/FluentUI.Tests/DatePickerControllerTests.swift
@@ -4,7 +4,11 @@
 //
 
 import XCTest
+#if SWIFT_PACKAGE
+@testable import FluentUI_ios
+#else
 @testable import FluentUI
+#endif
 
 class DatePickerControllerTests: XCTestCase {
     let startDate: Date = NSDate.now
diff --git a/ios/FluentUI.Tests/FluentUITests.swift b/ios/FluentUI.Tests/FluentUITests.swift
index 1668d33bbb..d3c45ef2e7 100644
--- a/ios/FluentUI.Tests/FluentUITests.swift
+++ b/ios/FluentUI.Tests/FluentUITests.swift
@@ -4,7 +4,11 @@
 //
 
 import XCTest
+#if SWIFT_PACKAGE
+@testable import FluentUI_ios
+#else
 @testable import FluentUI
+#endif
 
 class FluentUITests: XCTestCase {
     override func setUp() {
diff --git a/ios/FluentUI.Tests/FontTests.swift b/ios/FluentUI.Tests/FontTests.swift
index 547044d4ca..f6bd2fa0e0 100644
--- a/ios/FluentUI.Tests/FontTests.swift
+++ b/ios/FluentUI.Tests/FontTests.swift
@@ -5,7 +5,11 @@
 
 import XCTest
 import SwiftUI
+#if SWIFT_PACKAGE
+@testable import FluentUI_ios
+#else
 @testable import FluentUI
+#endif
 
 class FontTests: XCTestCase {
 
diff --git a/ios/FluentUI.xcodeproj/project.pbxproj b/ios/FluentUI.xcodeproj/project.pbxproj
index 3a284ac817..ccd3b922fa 100644
--- a/ios/FluentUI.xcodeproj/project.pbxproj
+++ b/ios/FluentUI.xcodeproj/project.pbxproj
@@ -194,6 +194,7 @@
 		926FEEAA2B45A8B4002C61D0 /* Compatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = 926FEEA92B45A8B4002C61D0 /* Compatibility.swift */; };
 		9275105626815A7100F12730 /* MSFPersonaButtonCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9275105426815A7100F12730 /* MSFPersonaButtonCarousel.swift */; };
 		927EB2BD278627440069753D /* PersonaButtonModifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927EB2BC278627440069753D /* PersonaButtonModifiers.swift */; };
+		929215B92B6C75E500D4EA9F /* AvatarTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929215B82B6C75E500D4EA9F /* AvatarTests.swift */; };
 		9298798B2669A875002B1EB4 /* PersonaButtonTokenSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 927E34C62668350800998031 /* PersonaButtonTokenSet.swift */; };
 		929DD257266ED3AC00E8175E /* PersonaButtonCarouselTokenSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929DD255266ED3AC00E8175E /* PersonaButtonCarouselTokenSet.swift */; };
 		929DD25A266ED3B600E8175E /* PersonaButtonCarousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 929DD258266ED3B600E8175E /* PersonaButtonCarousel.swift */; };
@@ -359,6 +360,7 @@
 		9275105426815A7100F12730 /* MSFPersonaButtonCarousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSFPersonaButtonCarousel.swift; sourceTree = "<group>"; };
 		927E34C62668350800998031 /* PersonaButtonTokenSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonaButtonTokenSet.swift; sourceTree = "<group>"; };
 		927EB2BC278627440069753D /* PersonaButtonModifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonaButtonModifiers.swift; sourceTree = "<group>"; };
+		929215B82B6C75E500D4EA9F /* AvatarTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AvatarTests.swift; sourceTree = "<group>"; };
 		929DD255266ED3AC00E8175E /* PersonaButtonCarouselTokenSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonaButtonCarouselTokenSet.swift; sourceTree = "<group>"; };
 		929DD258266ED3B600E8175E /* PersonaButtonCarousel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PersonaButtonCarousel.swift; sourceTree = "<group>"; };
 		92A1E4F326A791590007ED60 /* MSFCardNudge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSFCardNudge.swift; sourceTree = "<group>"; };
@@ -983,6 +985,7 @@
 		A5CEC15E20D980B30016922A /* FluentUI.Tests */ = {
 			isa = PBXGroup;
 			children = (
+				929215B82B6C75E500D4EA9F /* AvatarTests.swift */,
 				8FA3CB5A246B19EA0049E431 /* ColorTests.swift */,
 				FD053A342224CA33009B6378 /* DatePickerControllerTests.swift */,
 				A5CEC15F20D980B30016922A /* FluentUITests.swift */,
@@ -1751,6 +1754,7 @@
 			files = (
 				924268A2277AD9F700C5A452 /* FontTests.swift in Sources */,
 				A5CEC16020D980B30016922A /* FluentUITests.swift in Sources */,
+				929215B92B6C75E500D4EA9F /* AvatarTests.swift in Sources */,
 				8FA3CB5B246B19EA0049E431 /* ColorTests.swift in Sources */,
 				FD053A352224CA33009B6378 /* DatePickerControllerTests.swift in Sources */,
 			);
diff --git a/ios/FluentUI.xcodeproj/xcshareddata/xcschemes/FluentUI-iOS.xcscheme b/ios/FluentUI.xcodeproj/xcshareddata/xcschemes/FluentUI-iOS.xcscheme
index fb7bcf08e4..f8b8b59b0f 100644
--- a/ios/FluentUI.xcodeproj/xcshareddata/xcschemes/FluentUI-iOS.xcscheme
+++ b/ios/FluentUI.xcodeproj/xcshareddata/xcschemes/FluentUI-iOS.xcscheme
@@ -31,7 +31,7 @@
       enableASanStackUseAfterReturn = "YES">
       <Testables>
          <TestableReference
-            skipped = "YES">
+            skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A5CEC15920D980B30016922A"
diff --git a/ios/FluentUI/Avatar/Avatar.swift b/ios/FluentUI/Avatar/Avatar.swift
index 69271495ea..e130e43b02 100644
--- a/ios/FluentUI/Avatar/Avatar.swift
+++ b/ios/FluentUI/Avatar/Avatar.swift
@@ -464,7 +464,7 @@ public struct Avatar: View, TokenizedControlView {
     }
 
     /// Handles calculating colors for Avatar foreground and background.
-    private struct CalculatedColors {
+    struct CalculatedColors {
         static func backgroundColor(hashCode: Int) -> UIColor {
             let colorSet = colors[hashCode % colors.count]
             return UIColor(light: GlobalTokens.sharedColor(colorSet, .tint40),
@@ -492,7 +492,7 @@ public struct Avatar: View, TokenizedControlView {
         /// Hash algorithm to determine Avatar color.
         /// Referenced from: https://github.com/microsoft/fluentui/blob/master/packages/react-components/react-avatar/src/components/Avatar/useAvatar.tsx#L200
         /// - Returns: Hash code
-        private static func hashCode(_ text: NSString) -> Int32 {
+        static func hashCode(_ text: NSString) -> Int32 {
             var hash: Int32 = 0
             for len in (0..<text.length).reversed() {
                 // Convert from `unichar` to `Int32` to avoid potential arithmetic overflow in the next few lines.
@@ -505,7 +505,7 @@ public struct Avatar: View, TokenizedControlView {
             return hash
         }
 
-        private static var colors: [GlobalTokens.SharedColorSet] = [
+        static var colors: [GlobalTokens.SharedColorSet] = [
             .darkRed,
             .cranberry,
             .red,

From 53fa8e3c3ca2547905985ba5fc5448a3925f6619 Mon Sep 17 00:00:00 2001
From: Mike Schreiber <mischreiber@microsoft.com>
Date: Fri, 2 Feb 2024 13:38:20 -0800
Subject: [PATCH 2/3] Simplify imports for tests

---
 Package.swift                                      | 2 +-
 ios/FluentUI.Tests/AvatarTests.swift               | 3 +--
 ios/FluentUI.Tests/ColorTests.swift                | 3 +--
 ios/FluentUI.Tests/DatePickerControllerTests.swift | 3 +--
 ios/FluentUI.Tests/FluentUITests.swift             | 3 +--
 ios/FluentUI.Tests/FontTests.swift                 | 3 +--
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Package.swift b/Package.swift
index 8d513dd261..7df474a470 100644
--- a/Package.swift
+++ b/Package.swift
@@ -50,7 +50,7 @@ let package = Package(
         .testTarget(
             name: "FluentUITests-iOS",
             dependencies: [
-                .target(name: "FluentUI_ios", condition: .when(platforms: [.iOS, .visionOS])),
+                .target(name: "FluentUI", condition: .when(platforms: [.iOS, .visionOS])),
             ],
             path: "ios/FluentUI.Tests"
         ),
diff --git a/ios/FluentUI.Tests/AvatarTests.swift b/ios/FluentUI.Tests/AvatarTests.swift
index 027b2ed74a..7d392a8b2a 100644
--- a/ios/FluentUI.Tests/AvatarTests.swift
+++ b/ios/FluentUI.Tests/AvatarTests.swift
@@ -4,10 +4,9 @@
 //
 
 import XCTest
+@testable import FluentUI
 #if SWIFT_PACKAGE
 @testable import FluentUI_ios
-#else
-@testable import FluentUI
 #endif
 
 class AvatarTests: XCTestCase {
diff --git a/ios/FluentUI.Tests/ColorTests.swift b/ios/FluentUI.Tests/ColorTests.swift
index 0094ac7d0e..39e3ea2b0b 100644
--- a/ios/FluentUI.Tests/ColorTests.swift
+++ b/ios/FluentUI.Tests/ColorTests.swift
@@ -4,10 +4,9 @@
 //
 
 import XCTest
+@testable import FluentUI
 #if SWIFT_PACKAGE
 @testable import FluentUI_ios
-#else
-@testable import FluentUI
 #endif
 
 class ColorTests: XCTestCase {
diff --git a/ios/FluentUI.Tests/DatePickerControllerTests.swift b/ios/FluentUI.Tests/DatePickerControllerTests.swift
index bbfeeb1c61..4ef6780055 100644
--- a/ios/FluentUI.Tests/DatePickerControllerTests.swift
+++ b/ios/FluentUI.Tests/DatePickerControllerTests.swift
@@ -4,10 +4,9 @@
 //
 
 import XCTest
+@testable import FluentUI
 #if SWIFT_PACKAGE
 @testable import FluentUI_ios
-#else
-@testable import FluentUI
 #endif
 
 class DatePickerControllerTests: XCTestCase {
diff --git a/ios/FluentUI.Tests/FluentUITests.swift b/ios/FluentUI.Tests/FluentUITests.swift
index d3c45ef2e7..31d44147ed 100644
--- a/ios/FluentUI.Tests/FluentUITests.swift
+++ b/ios/FluentUI.Tests/FluentUITests.swift
@@ -4,10 +4,9 @@
 //
 
 import XCTest
+@testable import FluentUI
 #if SWIFT_PACKAGE
 @testable import FluentUI_ios
-#else
-@testable import FluentUI
 #endif
 
 class FluentUITests: XCTestCase {
diff --git a/ios/FluentUI.Tests/FontTests.swift b/ios/FluentUI.Tests/FontTests.swift
index f6bd2fa0e0..f2b21fa6ca 100644
--- a/ios/FluentUI.Tests/FontTests.swift
+++ b/ios/FluentUI.Tests/FontTests.swift
@@ -5,10 +5,9 @@
 
 import XCTest
 import SwiftUI
+@testable import FluentUI
 #if SWIFT_PACKAGE
 @testable import FluentUI_ios
-#else
-@testable import FluentUI
 #endif
 
 class FontTests: XCTestCase {

From 6e82c68eb8425f9970263eebca5ffba5b410a761 Mon Sep 17 00:00:00 2001
From: Mike Schreiber <mischreiber@microsoft.com>
Date: Tue, 6 Feb 2024 15:51:01 -0800
Subject: [PATCH 3/3] Remove SPM test target for the moment

---
 Package.swift                                      | 7 -------
 ios/FluentUI.Tests/AvatarTests.swift               | 3 ---
 ios/FluentUI.Tests/ColorTests.swift                | 3 ---
 ios/FluentUI.Tests/DatePickerControllerTests.swift | 3 ---
 ios/FluentUI.Tests/FluentUITests.swift             | 3 ---
 ios/FluentUI.Tests/FontTests.swift                 | 3 ---
 6 files changed, 22 deletions(-)

diff --git a/Package.swift b/Package.swift
index 7df474a470..db4600650b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -47,13 +47,6 @@ let package = Package(
                 "TwoLineTitleView/TwoLineTitleView.resources.xcfilelist",
             ]
         ),
-        .testTarget(
-            name: "FluentUITests-iOS",
-            dependencies: [
-                .target(name: "FluentUI", condition: .when(platforms: [.iOS, .visionOS])),
-            ],
-            path: "ios/FluentUI.Tests"
-        ),
         .target(
             name: "FluentUI_macos",
             path: "macos/FluentUI",
diff --git a/ios/FluentUI.Tests/AvatarTests.swift b/ios/FluentUI.Tests/AvatarTests.swift
index 7d392a8b2a..7a3058a585 100644
--- a/ios/FluentUI.Tests/AvatarTests.swift
+++ b/ios/FluentUI.Tests/AvatarTests.swift
@@ -5,9 +5,6 @@
 
 import XCTest
 @testable import FluentUI
-#if SWIFT_PACKAGE
-@testable import FluentUI_ios
-#endif
 
 class AvatarTests: XCTestCase {
 
diff --git a/ios/FluentUI.Tests/ColorTests.swift b/ios/FluentUI.Tests/ColorTests.swift
index 39e3ea2b0b..f7148ebe08 100644
--- a/ios/FluentUI.Tests/ColorTests.swift
+++ b/ios/FluentUI.Tests/ColorTests.swift
@@ -5,9 +5,6 @@
 
 import XCTest
 @testable import FluentUI
-#if SWIFT_PACKAGE
-@testable import FluentUI_ios
-#endif
 
 class ColorTests: XCTestCase {
 
diff --git a/ios/FluentUI.Tests/DatePickerControllerTests.swift b/ios/FluentUI.Tests/DatePickerControllerTests.swift
index 4ef6780055..26fe92c5c2 100644
--- a/ios/FluentUI.Tests/DatePickerControllerTests.swift
+++ b/ios/FluentUI.Tests/DatePickerControllerTests.swift
@@ -5,9 +5,6 @@
 
 import XCTest
 @testable import FluentUI
-#if SWIFT_PACKAGE
-@testable import FluentUI_ios
-#endif
 
 class DatePickerControllerTests: XCTestCase {
     let startDate: Date = NSDate.now
diff --git a/ios/FluentUI.Tests/FluentUITests.swift b/ios/FluentUI.Tests/FluentUITests.swift
index 31d44147ed..1668d33bbb 100644
--- a/ios/FluentUI.Tests/FluentUITests.swift
+++ b/ios/FluentUI.Tests/FluentUITests.swift
@@ -5,9 +5,6 @@
 
 import XCTest
 @testable import FluentUI
-#if SWIFT_PACKAGE
-@testable import FluentUI_ios
-#endif
 
 class FluentUITests: XCTestCase {
     override func setUp() {
diff --git a/ios/FluentUI.Tests/FontTests.swift b/ios/FluentUI.Tests/FontTests.swift
index f2b21fa6ca..547044d4ca 100644
--- a/ios/FluentUI.Tests/FontTests.swift
+++ b/ios/FluentUI.Tests/FontTests.swift
@@ -6,9 +6,6 @@
 import XCTest
 import SwiftUI
 @testable import FluentUI
-#if SWIFT_PACKAGE
-@testable import FluentUI_ios
-#endif
 
 class FontTests: XCTestCase {