Fixed tests

WeatherXM · Jan 16, 2025 · ab2b028 · ab2b028
1 parent 4da15d2
commit ab2b028
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/WeatherXMTests/Toolkit/DateExtensionsTests.swift b/WeatherXMTests/Toolkit/DateExtensionsTests.swift
@@ -42,8 +42,9 @@ final class DateExtensionsTests: XCTestCase {
 		date = date?.set(day: 5)
 		date = date?.set(month: 5)
 		date = date?.set(year: 2024)
-		let expectedResult = "2024-05-05T03:00:00\(TimeZone.current.fomattedGMTOffset)"
-		XCTAssert(date?.toTimestamp() == expectedResult, "Timestamp should be \(expectedResult)")
+		let expectedResult = "2024-05-05T03:00:00\(TimeZone.current.fomattedGMTOffset(date: date!))"
+		let result = date?.toTimestamp()
+		XCTAssert(result == expectedResult, "Timestamp should be \(expectedResult)")
 	}
 
 	func testTransactionsDateFormat() {

diff --git a/WeatherXMTests/Toolkit/WEIConverterTests.swift b/WeatherXMTests/Toolkit/WEIConverterTests.swift
@@ -58,8 +58,8 @@ final class WEIConverterTests: XCTestCase {
 
 	func testOnlySpacesString() throws {
 		let converter = WEIConverter(value: "  ")
-		XCTAssertNil(converter.toEthDecimal)
-		XCTAssertNil(converter.toEthDouble)
+		XCTAssertEqual(converter.toEthDecimal, 0.0)
+		XCTAssertEqual(converter.toEthDouble, 0.0)
 	}
 
 	func testNonDigitsString() throws {

diff --git a/wxm-ios/Toolkit/Toolkit/Utils/DateExtension.swift b/wxm-ios/Toolkit/Toolkit/Utils/DateExtension.swift
@@ -151,9 +151,9 @@ public extension Date {
 
     func toTimestamp(with timeZone: TimeZone = .current) -> String {
         let dateformat = DateFormatter()
+		dateformat.timeZone = timeZone
         dateformat.dateFormat = DateFormat.timestamp.rawValue
         dateformat.locale = Locale(identifier: "en_US_POSIX")
-        dateformat.timeZone = timeZone
         return dateformat.string(from: self)
     }
 
@@ -324,10 +324,12 @@ public extension TimeZone {
 		secondsFromGMT() == 0
 	}
 
-	var fomattedGMTOffset: String {
-	  let timeZoneFormatter = DateFormatter()
-	  timeZoneFormatter.dateFormat = "ZZZZZ"
-	  return timeZoneFormatter.string(from: Date())
+	func fomattedGMTOffset(date: Date = .now) -> String {
+		let timeZoneFormatter = DateFormatter()
+		timeZoneFormatter.dateFormat = "ZZZZZ"
+		timeZoneFormatter.timeZone = self
+		timeZoneFormatter.locale = Locale(identifier: "en_US_POSIX")
+		return timeZoneFormatter.string(from: date)
   }
 
 	static var UTCTimezone: TimeZone? {