[MOB-3028] Update tests and made the Language.make function thread-safe

ecosia · Dec 18, 2024 · 9d779a9 · 9d779a9
1 parent deb8b4a
commit 9d779a9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/BrowserKit/Sources/SiteImageView/ImageProcessing/BundleImageFetcher/BundleImageFetcher.swift b/BrowserKit/Sources/SiteImageView/ImageProcessing/BundleImageFetcher/BundleImageFetcher.swift
@@ -222,8 +222,11 @@ struct EcosiaURLProvider {
 
         public internal(set) static var current = make(for: .current)
 
+        private static let queue = DispatchQueue(label: "\(Bundle.main.bundleIdentifier!).LanguageQueue")
         static func make(for locale: Locale) -> Self {
-            locale.withLanguage ?? .en
+            return queue.sync {
+                locale.withLanguage ?? .en
+            }
         }
     }
 }

diff --git a/Ecosia/Core/Language.swift b/Ecosia/Core/Language.swift
@@ -28,8 +28,11 @@ public enum Language: String, Codable, CaseIterable {
         }
     }
 
+    private static let queue = DispatchQueue(label: "\(Bundle.ecosia.bundleIdentifier!).LanguageQueue")
     static func make(for locale: Locale) -> Self {
-        locale.withLanguage ?? .en
+        return queue.sync {
+            locale.withLanguage ?? .en
+        }
     }
 }
 

diff --git a/EcosiaTests/Core/LanguageTests.swift b/EcosiaTests/Core/LanguageTests.swift
@@ -2,7 +2,8 @@
 import XCTest
 
 final class LanguageTests: XCTestCase {
-    func testCurrent() {
+    func testSettingLanguageCurrentToUnexpectedLanguageReturnsDefault() {
+        Language.current = Language.make(for: Locale(identifier: "nz"))
         XCTAssertEqual(.en, Language.current)
     }
 

diff --git a/EcosiaTests/Core/LocalTests.swift b/EcosiaTests/Core/LocalTests.swift
@@ -3,6 +3,7 @@ import XCTest
 
 final class LocalTests: XCTestCase {
     func testCurrent() {
+        Language.current = .en
         XCTAssertEqual("en-us", Language.current.locale.rawValue)
     }