From ba07005b13e2ca341e22e2621bc5fd06b44ff361 Mon Sep 17 00:00:00 2001 From: Quentin Bandera Date: Fri, 12 Apr 2024 16:45:09 +0200 Subject: [PATCH] Fix equatable properties for arrays --- Sources/ResgenSwift/Strings/Model/XcString.swift | 9 ++++++++- .../Strings/StringsFileGeneratorTests.swift | 3 --- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Sources/ResgenSwift/Strings/Model/XcString.swift b/Sources/ResgenSwift/Strings/Model/XcString.swift index acee405..c80ad7a 100644 --- a/Sources/ResgenSwift/Strings/Model/XcString.swift +++ b/Sources/ResgenSwift/Strings/Model/XcString.swift @@ -38,6 +38,10 @@ struct XCStringDefinitionContainer: Codable, Equatable { } } } + + static func == (lhs: XCStringDefinitionContainer, rhs: XCStringDefinitionContainer) -> Bool { + return lhs.strings.count == rhs.strings.count && lhs.strings.sorted(by: { $0.title < $1.title }) == rhs.strings.sorted(by: { $0.title < $1.title }) + } } struct XCStringDefinition: Codable, Equatable { @@ -48,7 +52,6 @@ struct XCStringDefinition: Codable, Equatable { struct XCStringDefinitionContent: Codable, Equatable { let extractionState: String var localizations: XCStringLocalizationContainer - } struct XCStringLocalizationContainer: Codable, Equatable { @@ -63,6 +66,10 @@ struct XCStringLocalizationContainer: Codable, Equatable { } } } + + static func == (lhs: XCStringLocalizationContainer, rhs: XCStringLocalizationContainer) -> Bool { + return lhs.localizations.count == rhs.localizations.count && lhs.localizations.sorted(by: { $0.lang < $1.lang }) == rhs.localizations.sorted(by: { $0.lang < $1.lang }) + } } struct XCStringLocalization: Codable, Equatable { diff --git a/Tests/ResgenSwiftTests/Strings/StringsFileGeneratorTests.swift b/Tests/ResgenSwiftTests/Strings/StringsFileGeneratorTests.swift index 8910bd6..6c4d758 100644 --- a/Tests/ResgenSwiftTests/Strings/StringsFileGeneratorTests.swift +++ b/Tests/ResgenSwiftTests/Strings/StringsFileGeneratorTests.swift @@ -448,9 +448,6 @@ final class StringsFileGeneratorTests: XCTestCase { // "version" : "1.0" // } // """ - debugPrint(rootObject) - debugPrint(expect) - XCTAssertEqual(rootObject, expect) }