Fix DateFormattingTests

pietrocaselani · Dec 17, 2019 · 8a735c2 · 8a735c2
1 parent 4705706
commit 8a735c2
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 15 deletions.
diff --git a/CouchTrackerCore/Core/DateFormatting.swift b/CouchTrackerCore/Core/DateFormatting.swift
@@ -0,0 +1,28 @@
+import Foundation
+
+public enum DateFormatting {
+  public static func shortString(
+    localeProvider: () -> Locale = { DefaultBundleProvider.instance.currentLanguage.asLocale },
+    timeZoneProvider: () -> TimeZone = { NSTimeZone.system },
+    date: Date
+  ) -> String {
+    let dateFormatter = DateFormatter()
+    dateFormatter.locale = localeProvider()
+    dateFormatter.dateFormat = CouchTrackerCoreStrings.shortDateFormat()
+    dateFormatter.timeZone = timeZoneProvider()
+    return dateFormatter.string(from: date)
+  }
+}
+
+extension Date {
+  public func shortString(
+    localeProvider: () -> Locale = { DefaultBundleProvider.instance.currentLanguage.asLocale },
+    timeZoneProvider: () -> TimeZone = { NSTimeZone.system }
+  ) -> String {
+    return DateFormatting.shortString(
+      localeProvider: localeProvider,
+      timeZoneProvider: timeZoneProvider,
+      date: self
+    )
+  }
+}
diff --git a/CouchTrackerCore/Extensions/Date+Presentable.swift b/CouchTrackerCore/Extensions/Date+Presentable.swift
diff --git a/CouchTrackerCore/Localization/SupportedLanguages.swift b/CouchTrackerCore/Localization/SupportedLanguages.swift
@@ -4,7 +4,7 @@ public enum SupportedLanguages: String, Hashable, CaseIterable {
   case englishUS = "en_US"
   case portugueseBR = "pt_BR"
 
-  var asLocale: Locale {
+  public var asLocale: Locale {
     return Locale(identifier: rawValue)
   }
 }
diff --git a/...tensionsTests/Date+PresentableTests.swift → ...rCoreTests/Core/DateFormattingTests.swift b/...tensionsTests/Date+PresentableTests.swift → ...rCoreTests/Core/DateFormattingTests.swift
@@ -1,9 +1,11 @@
 @testable import CouchTrackerCore
+import Foundation
 import XCTest
 
-final class DatePresentableTests: XCTestCase {
+final class DateFormattingTests: XCTestCase {
   private var userDefaults: UserDefaults!
   private var oldLanguage: SupportedLanguages!
+  private let timeZone = { TimeZone(identifier: "America/Sao_Paulo")! }
 
   override func setUp() {
     super.setUp()
@@ -24,7 +26,7 @@ final class DatePresentableTests: XCTestCase {
 
     let date = Date(timeIntervalSince1970: 1_557_187_200) //		2019-05-07 00:00:00 +0000
     let expectedString = "06 de maio"
-    XCTAssertEqual(date.shortString(), expectedString)
+    XCTAssertEqual(date.shortString(timeZoneProvider: timeZone), expectedString)
   }
 
   func testDatePresentable_inEnglishUS() {
@@ -34,6 +36,6 @@ final class DatePresentableTests: XCTestCase {
 
     let date = Date(timeIntervalSince1970: 1_557_187_200) //		2019-05-07 00:00:00 +0000
     let expectedString = "May 06"
-    XCTAssertEqual(date.shortString(), expectedString)
+    XCTAssertEqual(date.shortString(timeZoneProvider: timeZone), expectedString)
   }
 }