UnitTests: fix Hashable and Equatable

BLeeEZ · May 28, 2021 · a7c0ad0 · a7c0ad0
1 parent fe28482
commit a7c0ad0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/Amperfy/Storage/EntityWrappers/AbstractLibraryEntity.swift b/Amperfy/Storage/EntityWrappers/AbstractLibraryEntity.swift
@@ -34,10 +34,5 @@ public class AbstractLibraryEntity {
         }
         return img
     }
-
-    public func isEqual(_ object: Any?) -> Bool {
-        guard let object = object as? AbstractLibraryEntity else { return false }
-        return managedObject == object.managedObject
-    }
 
 }
diff --git a/Amperfy/Storage/EntityWrappers/Album.swift b/Amperfy/Storage/EntityWrappers/Album.swift
@@ -84,10 +84,15 @@ public class Album: AbstractLibraryEntity, SongContainable {
         }
         return Artwork.defaultImage
     }
-
-    override public func isEqual(_ object: Any?) -> Bool {
-        guard let object = object as? Album else { return false }
-        return managedObject == object.managedObject
+
+}
+
+extension Album: Hashable, Equatable {
+    public static func == (lhs: Album, rhs: Album) -> Bool {
+        return lhs.managedObject == rhs.managedObject && lhs.managedObject == rhs.managedObject
     }
 
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(managedObject)
+    }
 }
diff --git a/Amperfy/Storage/EntityWrappers/Artist.swift b/Amperfy/Storage/EntityWrappers/Artist.swift
@@ -64,10 +64,15 @@ public class Artist: AbstractLibraryEntity, SongContainable {
             if managedObject.syncInfo != newValue?.managedObject { managedObject.syncInfo = newValue?.managedObject }
         }
     }
-
-    override public func isEqual(_ object: Any?) -> Bool {
-        guard let object = object as? Artist else { return false }
-        return managedObject == object.managedObject
+
+}
+
+extension Artist: Hashable, Equatable {
+    public static func == (lhs: Artist, rhs: Artist) -> Bool {
+        return lhs.managedObject == rhs.managedObject && lhs.managedObject == rhs.managedObject
     }
 
+    public func hash(into hasher: inout Hasher) {
+        hasher.combine(managedObject)
+    }
 }
diff --git a/Amperfy/Storage/EntityWrappers/Song.swift b/Amperfy/Storage/EntityWrappers/Song.swift
@@ -182,11 +182,6 @@ public class Song: AbstractLibraryEntity, Identifyable {
         }
         return false
     }
-
-    override public func isEqual(_ object: Any?) -> Bool {
-        guard let object = object as? Song else { return false }
-        return managedObject == object.managedObject
-    }
 
 }
 

diff --git a/AmperfyTests/Cases/Player/MusicPlayerTest.swift b/AmperfyTests/Cases/Player/MusicPlayerTest.swift
@@ -63,6 +63,7 @@ class MusicPlayerTest: XCTestCase {
     var storage: LibraryStorage!
     var mockAlertDisplayer: MOCK_AlertDisplayable!
     var eventLogger: EventLogger!
+    var userStatistics: UserStatistics!
     var songDownloader: MOCK_SongDownloader!
     var backendPlayer: BackendAudioPlayer!
     var playerData: PlayerData!
@@ -80,9 +81,10 @@ class MusicPlayerTest: XCTestCase {
         mockAVPlayer = MOCK_AVPlayer()
         mockAlertDisplayer = MOCK_AlertDisplayable()
         eventLogger = EventLogger(alertDisplayer: mockAlertDisplayer, persistentContainer: cdHelper.persistentContainer)
-        backendPlayer = BackendAudioPlayer(mediaPlayer: mockAVPlayer, eventLogger: eventLogger, songDownloader: songDownloader, songCache: storage)
+        userStatistics = storage.getUserStatistics(appVersion: "")
+        backendPlayer = BackendAudioPlayer(mediaPlayer: mockAVPlayer, eventLogger: eventLogger, songDownloader: songDownloader, songCache: storage, userStatistics: userStatistics)
         playerData = storage.getPlayerData()
-        testPlayer = MusicPlayer(coreData: playerData, downloadManager: songDownloader, backendAudioPlayer: backendPlayer)
+        testPlayer = MusicPlayer(coreData: playerData, downloadManager: songDownloader, backendAudioPlayer: backendPlayer, userStatistics: userStatistics)
 
         guard let songCachedFetched = storage.getSong(id: "36") else { XCTFail(); return }
         songCached = songCachedFetched