[Issue-68] Fix unit tests that fail in Bold Text mode

Author: Mark Pospesel

Tests/YMatterTypeTests/Elements/TypographyButtonTests.swift

@@ -160,7 +160,7 @@ final class TypographyButtonTests: TypographyElementTests {
             sut.typography.lineHeight * 2 + sut.contentEdgeInsets.vertical
         )
 
-        let fontFamily = DefaultFontFamily(familyName: "AvenirNext")
+        let fontFamily = AvenirNextFontFamily()
         let typography = Typography(
             fontFamily: fontFamily,
             fontWeight: .bold,
@@ -423,7 +423,7 @@ final class TypographyButtonTests: TypographyElementTests {
 private extension TypographyButtonTests {
     func makeSUT(spacing: CGFloat = 0, file: StaticString = #filePath, line: UInt = #line) -> MockButton {
         let typography = Typography(
-            familyName: "NotoSans",
+            fontFamily: Typography.notoSans,
             fontWeight: .regular,
             fontSize: 16,
             lineHeight: 24,

Tests/YMatterTypeTests/Elements/TypographyLabelTests.swift

@@ -144,7 +144,7 @@ final class TypographyLabelTests: TypographyElementTests {
         // we expect label height to be a multiple of the old lineHeight
         XCTAssertEqual(sut.intrinsicContentSize.height, sut.typography.lineHeight * 2)
 
-        let fontFamily = DefaultFontFamily(familyName: "AvenirNext")
+        let fontFamily = AvenirNextFontFamily()
         let typography = Typography(
             fontFamily: fontFamily,
             fontWeight: .bold,
@@ -364,7 +364,7 @@ private extension TypographyLabelTests {
         line: UInt = #line
     ) -> MockLabel {
         let typography = Typography(
-            familyName: "NotoSans",
+            fontFamily: Typography.notoSans,
             fontWeight: .regular,
             fontSize: 24,
             lineHeight: 32,

Tests/YMatterTypeTests/Elements/TypographyTextFieldTests.swift

@@ -83,7 +83,7 @@ final class TypographyTextFieldTests: TypographyElementTests {
         // we expect text field height to equal the old lineHeight
         XCTAssertEqual(sut.intrinsicContentSize.height, sut.typography.lineHeight)
 
-        let fontFamily = DefaultFontFamily(familyName: "AvenirNext")
+        let fontFamily = AvenirNextFontFamily()
         let typography = Typography(
             fontFamily: fontFamily,
             fontWeight: .bold,
@@ -211,7 +211,7 @@ final class TypographyTextFieldTests: TypographyElementTests {
         XCTAssertEqual(sut.intrinsicContentSize.height, sut.typography.lineHeight)
 
         // changing the typograhy will restyle the attributed text
-        let fontFamily = DefaultFontFamily(familyName: "AvenirNext")
+        let fontFamily = AvenirNextFontFamily()
         sut.typography = Typography(
             fontFamily: fontFamily,
             fontWeight: .bold,
@@ -299,7 +299,7 @@ final class TypographyTextFieldTests: TypographyElementTests {
 private extension TypographyTextFieldTests {
     func makeSUT(file: StaticString = #filePath, line: UInt = #line) -> MockTextField {
         let typography = Typography(
-            familyName: "NotoSans",
+            fontFamily: Typography.notoSans,
             fontWeight: .regular,
             fontSize: 13,
             lineHeight: 20,

Tests/YMatterTypeTests/Elements/TypographyTextViewTests.swift

@@ -109,7 +109,7 @@ final class TypographyTextViewTests: TypographyElementTests {
         // we expect label height to be a multiple of the old lineHeight
         XCTAssertEqual(sut.intrinsicContentSize.height, sut.typography.lineHeight * 2)
 
-        let fontFamily = DefaultFontFamily(familyName: "AvenirNext")
+        let fontFamily = AvenirNextFontFamily()
         let typography = Typography(
             fontFamily: fontFamily,
             fontWeight: .bold,
@@ -302,7 +302,7 @@ final class TypographyTextViewTests: TypographyElementTests {
 private extension TypographyTextViewTests {
     func makeSUT(spacing: CGFloat = 0, file: StaticString = #filePath, line: UInt = #line) -> MockTextView {
         let typography = Typography(
-            familyName: "NotoSans",
+            fontFamily: Typography.notoSans,
             fontWeight: .regular,
             fontSize: 22,
             lineHeight: 28,

Tests/YMatterTypeTests/Typography/TypogaphyTests.swift

@@ -60,6 +60,31 @@ struct NotoSansFontFamily: FontFamily {
     var supportedWeights: [Typography.FontWeight] { [.regular] }
 }
 
+struct AvenirNextFontFamily: FontFamily {
+    let familyName = "AvenirNext"
+
+    var supportedWeights: [Typography.FontWeight] { [.ultralight, .regular, .medium, .semibold, .bold, .heavy] }
+
+    func weightName(for weight: Typography.FontWeight) -> String {
+        switch weight {
+        case .ultralight:
+            return "UltraLight"
+        case .regular:
+            return "Regular"
+        case .medium:
+            return "Medium"
+        case .semibold:
+            return "DemiBold"
+        case .bold:
+            return "Bold"
+        case .heavy:
+            return "Heavy"
+        case .thin, .light, .black:
+            return "" // these 3 weights are not installed
+        }
+    }
+}
+
 extension Typography {
     static let notoSans = NotoSansFontFamily()
 }