From 77a035b6433d9b5b50c7e31c34dad6387af76865 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 1 May 2025 15:54:49 +0200 Subject: [PATCH 1/3] Fix sync test --- PadelClubDataTests/SynchronizationTests.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/PadelClubDataTests/SynchronizationTests.swift b/PadelClubDataTests/SynchronizationTests.swift index 06e117a..09049da 100644 --- a/PadelClubDataTests/SynchronizationTests.swift +++ b/PadelClubDataTests/SynchronizationTests.swift @@ -56,10 +56,13 @@ struct SynchronizationTests { } // Cleanup - let eventCollection1: SyncedCollection = StoreCenter.main.mainStore.registerSynchronizedCollection(synchronousLoading: true) + let eventCollection1: SyncedCollection = await StoreCenter.main.mainStore.synchronizedCollectionWithFileLoading() + #expect(eventCollection1.hasLoaded == true) + await eventCollection1.deleteAsync(contentOfs: Array(eventCollection1)) - let eventCollection2: SyncedCollection = self.secondStoreCenter.mainStore.registerSynchronizedCollection(synchronousLoading: true) + let eventCollection2: SyncedCollection = await self.secondStoreCenter.mainStore.synchronizedCollectionWithFileLoading() + #expect(eventCollection2.hasLoaded == true) eventCollection2.clear() // Create From 5fa72a27a33cffb6f865163b0438ce17fa87e364 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 1 May 2025 16:18:07 +0200 Subject: [PATCH 2/3] Fix test issue --- PadelClubDataTests/PadelClubDataTests.swift | 1 + PadelClubDataTests/SynchronizationTests.swift | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/PadelClubDataTests/PadelClubDataTests.swift b/PadelClubDataTests/PadelClubDataTests.swift index d843bdb..aa986c3 100644 --- a/PadelClubDataTests/PadelClubDataTests.swift +++ b/PadelClubDataTests/PadelClubDataTests.swift @@ -11,6 +11,7 @@ import Testing enum TestError: Error { case notAuthenticated + case sameDeviceId } struct PadelClubDataTests { diff --git a/PadelClubDataTests/SynchronizationTests.swift b/PadelClubDataTests/SynchronizationTests.swift index 09049da..551b94f 100644 --- a/PadelClubDataTests/SynchronizationTests.swift +++ b/PadelClubDataTests/SynchronizationTests.swift @@ -22,6 +22,8 @@ struct SynchronizationTests { self.secondStoreCenter.configureURLs(secureScheme: false, domain: "127.0.0.1:8000", webSockets: false) self.secondStoreCenter.tokenKeychain = MockKeychainStore(fileName: "storage-2/token.json") self.secondStoreCenter.deviceKeychain = MockKeychainStore(fileName: "storage-2/device.json") + try self.secondStoreCenter.deviceKeychain.add(value: UUID().uuidString) + self.secondStoreCenter.classProject = "PadelClubData" let token2 = try? self.secondStoreCenter.rawTokenShouldNotBeUsed() @@ -32,6 +34,7 @@ struct SynchronizationTests { StoreCenter.main.configureURLs(secureScheme: false, domain: "127.0.0.1:8000", webSockets: false) StoreCenter.main.tokenKeychain = MockKeychainStore(fileName: "storage/token.json") StoreCenter.main.deviceKeychain = MockKeychainStore(fileName: "storage/device.json") + try StoreCenter.main.deviceKeychain.add(value: UUID().uuidString) StoreCenter.main.classProject = "PadelClubData" let token = try? StoreCenter.main.rawTokenShouldNotBeUsed() @@ -44,6 +47,11 @@ struct SynchronizationTests { let _: CustomUser = try await storeCenter.service().login(username: self.username, password: self.password) } + @Test("device id tests") + func testDeviceIds() async throws { + #expect(StoreCenter.main.deviceId() != self.secondStoreCenter.deviceId()) + } + @Test func testAuthentication() { #expect(StoreCenter.main.isAuthenticated) #expect(self.secondStoreCenter.isAuthenticated) @@ -75,8 +83,8 @@ struct SynchronizationTests { try await eventCollection1.loadDataFromServerIfAllowed(clear: true) #expect(eventCollection1.count == 1) - try await eventCollection2.loadDataFromServerIfAllowed(clear: true) - #expect(eventCollection2.count == 1) +// try await eventCollection2.loadDataFromServerIfAllowed(clear: true) +// #expect(eventCollection2.count == 1) try await self.secondStoreCenter.testSynchronizeOnceAsync() #expect(eventCollection2.count == 1) From b80cd18db1a3d3ec67b4aa26d8819207fda3743c Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 1 May 2025 16:26:56 +0200 Subject: [PATCH 3/3] fix test --- PadelClubDataTests/SynchronizationTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PadelClubDataTests/SynchronizationTests.swift b/PadelClubDataTests/SynchronizationTests.swift index 551b94f..6ca7137 100644 --- a/PadelClubDataTests/SynchronizationTests.swift +++ b/PadelClubDataTests/SynchronizationTests.swift @@ -83,8 +83,8 @@ struct SynchronizationTests { try await eventCollection1.loadDataFromServerIfAllowed(clear: true) #expect(eventCollection1.count == 1) -// try await eventCollection2.loadDataFromServerIfAllowed(clear: true) -// #expect(eventCollection2.count == 1) + try await self.secondStoreCenter.testSynchronizeOnceAsync() + #expect(eventCollection2.count == 1) try await self.secondStoreCenter.testSynchronizeOnceAsync() #expect(eventCollection2.count == 1)