From 0c925c325cacb64402e302f90d31b890ee48ce84 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Thu, 4 Jun 2020 09:22:52 +1000 Subject: [PATCH] Make tests play nice with pod install --- .../FriendRequestProtocolTests.swift | 0 .../LokiTestUtilities.swift | 0 .../MultiDeviceProtocolTests.swift | 0 .../OnionRequestAPITests.swift | 0 .../SessionManagementProtocolTests.swift | 0 .../SyncMessagesProtocolTests.swift | 0 .../Utilities => Loki}/XCTest+Utilities.swift | 0 Signal.xcodeproj/project.pbxproj | 4 -- ...UpdateFriendRequestStatusStorageTest.swift | 56 ------------------- 9 files changed, 60 deletions(-) rename {SignalServiceKit/src/Loki/Protocol/Friend Requests => Loki}/FriendRequestProtocolTests.swift (100%) rename {SignalServiceKit/src/Loki/Utilities => Loki}/LokiTestUtilities.swift (100%) rename {SignalServiceKit/src/Loki/Protocol/Multi Device => Loki}/MultiDeviceProtocolTests.swift (100%) rename {SignalServiceKit/src/Loki/API/Onion Requests => Loki}/OnionRequestAPITests.swift (100%) rename {SignalServiceKit/src/Loki/Protocol/Session Management => Loki}/SessionManagementProtocolTests.swift (100%) rename {SignalServiceKit/src/Loki/Protocol/Sync Messages => Loki}/SyncMessagesProtocolTests.swift (100%) rename {SignalServiceKit/src/Loki/Utilities => Loki}/XCTest+Utilities.swift (100%) delete mode 100644 SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorageTest.swift diff --git a/SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift b/Loki/FriendRequestProtocolTests.swift similarity index 100% rename from SignalServiceKit/src/Loki/Protocol/Friend Requests/FriendRequestProtocolTests.swift rename to Loki/FriendRequestProtocolTests.swift diff --git a/SignalServiceKit/src/Loki/Utilities/LokiTestUtilities.swift b/Loki/LokiTestUtilities.swift similarity index 100% rename from SignalServiceKit/src/Loki/Utilities/LokiTestUtilities.swift rename to Loki/LokiTestUtilities.swift diff --git a/SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocolTests.swift b/Loki/MultiDeviceProtocolTests.swift similarity index 100% rename from SignalServiceKit/src/Loki/Protocol/Multi Device/MultiDeviceProtocolTests.swift rename to Loki/MultiDeviceProtocolTests.swift diff --git a/SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPITests.swift b/Loki/OnionRequestAPITests.swift similarity index 100% rename from SignalServiceKit/src/Loki/API/Onion Requests/OnionRequestAPITests.swift rename to Loki/OnionRequestAPITests.swift diff --git a/SignalServiceKit/src/Loki/Protocol/Session Management/SessionManagementProtocolTests.swift b/Loki/SessionManagementProtocolTests.swift similarity index 100% rename from SignalServiceKit/src/Loki/Protocol/Session Management/SessionManagementProtocolTests.swift rename to Loki/SessionManagementProtocolTests.swift diff --git a/SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocolTests.swift b/Loki/SyncMessagesProtocolTests.swift similarity index 100% rename from SignalServiceKit/src/Loki/Protocol/Sync Messages/SyncMessagesProtocolTests.swift rename to Loki/SyncMessagesProtocolTests.swift diff --git a/SignalServiceKit/src/Loki/Utilities/XCTest+Utilities.swift b/Loki/XCTest+Utilities.swift similarity index 100% rename from SignalServiceKit/src/Loki/Utilities/XCTest+Utilities.swift rename to Loki/XCTest+Utilities.swift diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 7b791e38e..a808696ba 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 2400888E239F30A600305217 /* SessionRestorationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2400888D239F30A600305217 /* SessionRestorationView.swift */; }; 241C1192245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */; }; - 241C1194245F8CE2005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */; }; 241C6314231F64C000B4198E /* JazzIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C630E231F5AAC00B4198E /* JazzIcon.swift */; }; 241C6315231F64CE00B4198E /* CGFloat+Rounding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C6312231F5F1D00B4198E /* CGFloat+Rounding.swift */; }; 241C6316231F64CE00B4198E /* UIColor+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 241C6310231F5C4400B4198E /* UIColor+Helper.swift */; }; @@ -749,7 +748,6 @@ 1CE3CD5C23334683BDD3D78C /* Pods-Signal.test.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Signal.test.xcconfig"; path = "Pods/Target Support Files/Pods-Signal/Pods-Signal.test.xcconfig"; sourceTree = ""; }; 2400888D239F30A600305217 /* SessionRestorationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionRestorationView.swift; sourceTree = ""; }; 241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK001UpdateFriendRequestStatusStorage.swift; sourceTree = ""; }; - 241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK001UpdateFriendRequestStatusStorageTest.swift; sourceTree = ""; }; 241C630E231F5AAC00B4198E /* JazzIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JazzIcon.swift; sourceTree = ""; }; 241C6310231F5C4400B4198E /* UIColor+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Helper.swift"; sourceTree = ""; }; 241C6312231F5F1D00B4198E /* CGFloat+Rounding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Rounding.swift"; sourceTree = ""; }; @@ -1644,7 +1642,6 @@ isa = PBXGroup; children = ( 241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */, - 241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */, ); path = Migrations; sourceTree = ""; @@ -4295,7 +4292,6 @@ files = ( 456F6E2F1E261D1000FD2210 /* PeerConnectionClientTest.swift in Sources */, 3491D9A121022DB7001EF5A1 /* CDSSigningCertificateTest.m in Sources */, - 241C1194245F8CE2005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift in Sources */, 34BBC861220E883300857249 /* ImageEditorModelTest.swift in Sources */, 340B02BA1FA0D6C700F9CFEC /* ConversationViewItemTest.m in Sources */, 458E383A1D6699FA0094BD24 /* OWSDeviceProvisioningURLParserTest.m in Sources */, diff --git a/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorageTest.swift b/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorageTest.swift deleted file mode 100644 index 60fb0b078..000000000 --- a/SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorageTest.swift +++ /dev/null @@ -1,56 +0,0 @@ -@testable import SignalServiceKit -import XCTest -import Curve25519Kit - -class LK001UpdateFriendRequestStatusStorageTest : XCTestCase { - - private var storage: OWSPrimaryStorage { OWSPrimaryStorage.shared() } - - override func setUp() { - super.setUp() - - LokiTestUtilities.setUpMockEnvironment() - } - - func test_shouldMigrateFriendRequestStatusCorrectly() { - typealias ThreadFriendRequestStatus = NSInteger - let friendRequestMappings: [ThreadFriendRequestStatus:LKFriendRequestStatus] = [ - 0 : .none, - 1 : .requestSending, - 2 : .requestSent, - 3 : .requestReceived, - 4 : .friends, - 5 : .requestExpired - ] - - var hexEncodedPublicKeyMapping: [String:ThreadFriendRequestStatus] = [:] - for (threadFriendRequestStatus, _) in friendRequestMappings { - let hexEncodedPublicKey = Curve25519.generateKeyPair().hexEncodedPublicKey - hexEncodedPublicKeyMapping[hexEncodedPublicKey] = threadFriendRequestStatus - } - - storage.dbReadWriteConnection.readWrite { transaction in - for (hexEncodedPublicKey, friendRequestStatus) in hexEncodedPublicKeyMapping { - let thread = TSContactThread.getOrCreateThread(withContactId: hexEncodedPublicKey, transaction: transaction) - thread.friendRequestStatus = friendRequestStatus - thread.save(with: transaction) - } - } - - // Wait for the migration to complete - let migration = self.expectation(description: "Migration") - LK001UpdateFriendRequestStatusStorage().runUp { - migration.fulfill() - } - wait(for: [ migration ], timeout: 5) - - storage.dbReadConnection.read { transaction in - for (hexEncodedPublicKey, threadFriendRequestStatus) in hexEncodedPublicKeyMapping { - let expectedFriendRequestStatus = friendRequestMappings[threadFriendRequestStatus]! - let friendRequestStatus = self.storage.getFriendRequestStatus(for: hexEncodedPublicKey, transaction: transaction) - XCTAssertEqual(friendRequestStatus, expectedFriendRequestStatus, "Expected friend request status \(friendRequestStatus.rawValue) to match \(expectedFriendRequestStatus.rawValue).") - } - } - } - -}