From af19405178e0b825036b77b2e4cf7e7f598f5569 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 29 Oct 2018 12:19:57 -0600
Subject: [PATCH 1/3] update carthage build path for tests

---
 Signal.xcodeproj/project.pbxproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj
index 44752a1f7c..035209148c 100644
--- a/Signal.xcodeproj/project.pbxproj
+++ b/Signal.xcodeproj/project.pbxproj
@@ -2960,8 +2960,8 @@
 			files = (
 			);
 			inputPaths = (
-				"$(SRCROOT)/Carthage/Build/iOS/WebRTC.framework",
-				"$(SRCROOT)/Carthage/Build/iOS/ZXingObjC.framework",
+				"$(SRCROOT)/ThirdParty/WebRTC/Build/WebRTC.framework",
+				"$(SRCROOT)/ThirdParty/Carthage/Build/iOS/ZXingObjC.framework",
 			);
 			name = "[Carthage] Copy Frameworks";
 			outputPaths = (

From 159c546d16b74f8068f6b5ead6021ae34ea92d8b Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 29 Oct 2018 12:20:14 -0600
Subject: [PATCH 2/3] update test environment

---
 Signal/test/mocks/MockEnvironment.m | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Signal/test/mocks/MockEnvironment.m b/Signal/test/mocks/MockEnvironment.m
index 97dd723a42..ac1bf215a7 100644
--- a/Signal/test/mocks/MockEnvironment.m
+++ b/Signal/test/mocks/MockEnvironment.m
@@ -8,6 +8,7 @@
 #import <SignalMessaging/LockInteractionController.h>
 #import <SignalMessaging/OWSPreferences.h>
 #import <SignalMessaging/OWSSounds.h>
+#import <SignalMessaging/SignalMessaging-Swift.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -26,15 +27,20 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssertDebug(primaryStorage);
 
     // TODO: We should probably mock this out.
+    OWSAudioSession *audioSession = [OWSAudioSession new];
+    LockInteractionController *lockInteractionController = [[LockInteractionController alloc] initDefault];
     OWSPreferences *preferences = [OWSPreferences new];
     OWSSounds *sounds = [[OWSSounds alloc] initWithPrimaryStorage:primaryStorage];
-    LockInteractionController *lockInteractionController = [[LockInteractionController alloc] initDefault];
+    id<OWSProximityMonitoringManager> proximityMonitoringManager = [OWSProximityMonitoringManagerImpl new];
     OWSWindowManager *windowManager = [[OWSWindowManager alloc] initDefault];
 
-    self = [super initWithPreferences:preferences
-                               sounds:sounds
-            lockInteractionController:lockInteractionController
-                        windowManager:windowManager];
+    self = [super initWithAudioSession:audioSession
+             lockInteractionController:lockInteractionController
+                           preferences:preferences
+            proximityMonitoringManager:proximityMonitoringManager
+                                sounds:sounds
+                         windowManager:windowManager];
+
     OWSAssertDebug(self);
     return self;
 }

From 90500475f15a6888d1ebee0cac78f760dc81c9f2 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 29 Oct 2018 12:20:27 -0600
Subject: [PATCH 3/3] fixup searcher test

---
 Signal/test/util/SearcherTest.swift | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Signal/test/util/SearcherTest.swift b/Signal/test/util/SearcherTest.swift
index c2bcf8914d..fcfc405aa0 100644
--- a/Signal/test/util/SearcherTest.swift
+++ b/Signal/test/util/SearcherTest.swift
@@ -9,6 +9,9 @@ import XCTest
 // TODO: We might be able to merge this with OWSFakeContactsManager.
 @objc
 class ConversationSearcherContactsManager: NSObject, ContactsManagerProtocol {
+    func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String {
+        return self.displayName(forPhoneIdentifier: recipientId)
+    }
 
     func displayName(forPhoneIdentifier phoneNumber: String?) -> String {
         if phoneNumber == aliceRecipientId {