Make tests play nice with pod install

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 = "<group>"; };
 		2400888D239F30A600305217 /* SessionRestorationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionRestorationView.swift; sourceTree = "<group>"; };
 		241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK001UpdateFriendRequestStatusStorage.swift; sourceTree = "<group>"; };
-		241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LK001UpdateFriendRequestStatusStorageTest.swift; sourceTree = "<group>"; };
 		241C630E231F5AAC00B4198E /* JazzIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JazzIcon.swift; sourceTree = "<group>"; };
 		241C6310231F5C4400B4198E /* UIColor+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Helper.swift"; sourceTree = "<group>"; };
 		241C6312231F5F1D00B4198E /* CGFloat+Rounding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Rounding.swift"; sourceTree = "<group>"; };
@@ -1644,7 +1642,6 @@
 			isa = PBXGroup;
 			children = (
 				241C1191245F8878005CB2F4 /* LK001UpdateFriendRequestStatusStorage.swift */,
-				241C1193245F8C95005CB2F4 /* LK001UpdateFriendRequestStatusStorageTest.swift */,
 			);
 			path = Migrations;
 			sourceTree = "<group>";
@@ -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 */,

SignalMessaging/Loki/Migrations/LK001UpdateFriendRequestStatusStorageTest.swift

@@ -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).")
-            }
-        }
-    }
-
-}