From 24f57ceddab515584c70ea64f391934c76db30ed Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Fri, 9 Nov 2018 17:39:24 -0600
Subject: [PATCH] add missing method to FakeContactsManager, convert to Swift
 to avoid missing protocol methods in the future.

---
 SignalServiceKit/src/SignalServiceKit.h       |  1 +
 .../src/TestUtils/FakeContactsManager.swift   | 44 ++++++++++++
 .../src/TestUtils/MockSSKEnvironment.m        |  1 -
 .../src/TestUtils/OWSFakeContactsManager.h    | 17 -----
 .../src/TestUtils/OWSFakeContactsManager.m    | 71 -------------------
 .../Messages/OWSDisappearingMessagesJobTest.m |  1 -
 .../tests/Messages/OWSMessageManagerTest.m    |  1 -
 .../tests/Messages/OWSMessageSenderTest.m     |  1 -
 8 files changed, 45 insertions(+), 92 deletions(-)
 create mode 100644 SignalServiceKit/src/TestUtils/FakeContactsManager.swift
 delete mode 100644 SignalServiceKit/src/TestUtils/OWSFakeContactsManager.h
 delete mode 100644 SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m

diff --git a/SignalServiceKit/src/SignalServiceKit.h b/SignalServiceKit/src/SignalServiceKit.h
index 41ce35955..2ae48031f 100644
--- a/SignalServiceKit/src/SignalServiceKit.h
+++ b/SignalServiceKit/src/SignalServiceKit.h
@@ -4,6 +4,7 @@
 
 // Anything used by Swift outside of the framework must be imported.
 #import <Reachability/Reachability.h>
+#import <SignalServiceKit/ContactsManagerProtocol.h>
 #import <SignalServiceKit/OWSFileSystem.h>
 #import <SignalServiceKit/OWSOperation.h>
 #import <SignalServiceKit/OWSSyncManagerProtocol.h>
diff --git a/SignalServiceKit/src/TestUtils/FakeContactsManager.swift b/SignalServiceKit/src/TestUtils/FakeContactsManager.swift
new file mode 100644
index 000000000..8cd52a61f
--- /dev/null
+++ b/SignalServiceKit/src/TestUtils/FakeContactsManager.swift
@@ -0,0 +1,44 @@
+//
+//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//
+
+@objc(OWSFakeContactsManager)
+class FakeContactsManager: NSObject, ContactsManagerProtocol {
+    func displayName(forPhoneIdentifier recipientId: String?) -> String {
+        return "Fake name"
+    }
+
+    func displayName(forPhoneIdentifier recipientId: String?, transaction: YapDatabaseReadTransaction) -> String {
+        return self.displayName(forPhoneIdentifier: recipientId)
+    }
+
+    func signalAccounts() -> [SignalAccount] {
+        return []
+    }
+
+    func isSystemContact(_ recipientId: String) -> Bool {
+        return true
+    }
+
+    func isSystemContact(withSignalAccount recipientId: String) -> Bool {
+        return true
+    }
+
+    func compare(signalAccount left: SignalAccount, with right: SignalAccount) -> ComparisonResult {
+        // If this method ends up being used by the tests, we should provide a better implementation.
+        assertionFailure("TODO")
+        return ComparisonResult.orderedAscending
+    }
+
+    func cnContact(withId contactId: String?) -> CNContact? {
+        return nil
+    }
+
+    func avatarData(forCNContactId contactId: String?) -> Data? {
+        return nil
+    }
+
+    func avatarImage(forCNContactId contactId: String?) -> UIImage? {
+        return nil
+    }
+}
diff --git a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m
index 65f5a5ce3..5ce8a34ea 100644
--- a/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m
+++ b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m
@@ -10,7 +10,6 @@
 #import "OWSBlockingManager.h"
 #import "OWSDisappearingMessagesJob.h"
 #import "OWSFakeCallMessageHandler.h"
-#import "OWSFakeContactsManager.h"
 #import "OWSFakeContactsUpdater.h"
 #import "OWSFakeMessageSender.h"
 #import "OWSFakeNetworkManager.h"
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.h b/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.h
deleted file mode 100644
index 0ac2786ea..000000000
--- a/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "ContactsManagerProtocol.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-#ifdef DEBUG
-
-@interface OWSFakeContactsManager : NSObject <ContactsManagerProtocol>
-
-@end
-
-#endif
-
-NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m b/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m
deleted file mode 100644
index 08e15592b..000000000
--- a/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
-//
-
-#import "OWSFakeContactsManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-#ifdef DEBUG
-
-@implementation OWSFakeContactsManager
-
-- (NSString *)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber
-{
-    return @"Fake name";
-}
-
-- (NSArray<SignalAccount *> *)signalAccounts
-{
-    return @[];
-}
-
-- (BOOL)isSystemContact:(NSString *)recipientId
-{
-    return YES;
-}
-
-- (BOOL)isSystemContactWithSignalAccount:(NSString *)recipientId
-{
-    return YES;
-}
-
-- (NSComparisonResult)compareSignalAccount:(SignalAccount *)left
-                         withSignalAccount:(SignalAccount *)right NS_SWIFT_NAME(compare(signalAccount:with:))
-{
-    // If this method ends up being used by the tests, we should provide a better implementation.
-    OWSAbstractMethod();
-
-    return NSOrderedAscending;
-}
-
-+ (BOOL)name:(NSString *_Nonnull)nameString matchesQuery:(NSString *_Nonnull)queryString
-{
-    return YES;
-}
-
-- (UIImage *_Nullable)imageForPhoneIdentifier:(NSString *_Nullable)phoneNumber
-{
-    return nil;
-}
-
-- (nullable CNContact *)cnContactWithId:(nullable NSString *)contactId
-{
-    return nil;
-}
-
-- (nullable NSData *)avatarDataForCNContactId:(nullable NSString *)contactId
-{
-    return nil;
-}
-
-- (nullable UIImage *)avatarImageForCNContactId:(nullable NSString *)contactId
-{
-    return nil;
-}
-
-@end
-
-#endif
-
-NS_ASSUME_NONNULL_END
diff --git a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
index db2ef85bd..345b82c1d 100644
--- a/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
+++ b/SignalServiceKit/tests/Messages/OWSDisappearingMessagesJobTest.m
@@ -5,7 +5,6 @@
 #import "OWSDisappearingMessagesJob.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSDisappearingMessagesFinder.h"
-#import "OWSFakeContactsManager.h"
 #import "OWSPrimaryStorage.h"
 #import "SSKBaseTestObjC.h"
 #import "TSContactThread.h"
diff --git a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
index 580bb8b99..71a57955a 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageManagerTest.m
@@ -6,7 +6,6 @@
 #import "ContactsUpdater.h"
 #import "MockSSKEnvironment.h"
 #import "OWSFakeCallMessageHandler.h"
-#import "OWSFakeContactsManager.h"
 #import "OWSFakeMessageSender.h"
 #import "OWSFakeNetworkManager.h"
 #import "OWSIdentityManager.h"
diff --git a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
index ef03ec699..3f26f7e10 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
@@ -6,7 +6,6 @@
 #import "NSError+MessageSending.h"
 #import "OWSDisappearingMessagesConfiguration.h"
 #import "OWSError.h"
-#import "OWSFakeContactsManager.h"
 #import "OWSFakeNetworkManager.h"
 #import "OWSPrimaryStorage.h"
 #import "OWSUploadOperation.h"