From d6cbdddc4203cf5a6be8016eb0011dbffaee2778 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 15 Oct 2018 15:57:29 -0600 Subject: [PATCH] Fix test build, rename src/Test/ ->src/TestUtils/ to avoid confusion with the existing test/ directory --- .../src/{Tests/TestUtil => TestUtils}/Factories.swift | 0 .../src/{Tests => TestUtils}/MockSSKEnvironment.h | 0 .../src/{Tests => TestUtils}/MockSSKEnvironment.m | 0 .../src/{Tests => TestUtils}/OWSFakeCallMessageHandler.h | 0 .../src/{Tests => TestUtils}/OWSFakeCallMessageHandler.m | 0 .../src/{Tests => TestUtils}/OWSFakeContactsManager.h | 0 .../src/{Tests => TestUtils}/OWSFakeContactsManager.m | 0 .../src/{Tests => TestUtils}/OWSFakeContactsUpdater.h | 0 .../src/{Tests => TestUtils}/OWSFakeContactsUpdater.m | 0 .../src/{Tests => TestUtils}/OWSFakeMessageSender.h | 0 .../src/{Tests => TestUtils}/OWSFakeMessageSender.m | 0 .../src/{Tests => TestUtils}/OWSFakeNetworkManager.h | 0 .../src/{Tests => TestUtils}/OWSFakeNetworkManager.m | 0 .../src/{Tests => TestUtils}/OWSFakeNotificationsManager.h | 0 .../src/{Tests => TestUtils}/OWSFakeNotificationsManager.m | 0 .../src/{Tests => TestUtils}/OWSFakeProfileManager.h | 0 .../src/{Tests => TestUtils}/OWSFakeProfileManager.m | 6 ++++-- SignalServiceKit/src/{Tests => TestUtils}/TestAppContext.h | 0 SignalServiceKit/src/{Tests => TestUtils}/TestAppContext.m | 0 .../src/{Tests => TestUtils}/TestKeychainStorage.swift | 0 .../{src/Tests/TestUtil => tests}/SSKSwiftTests.swift | 0 21 files changed, 4 insertions(+), 2 deletions(-) rename SignalServiceKit/src/{Tests/TestUtil => TestUtils}/Factories.swift (100%) rename SignalServiceKit/src/{Tests => TestUtils}/MockSSKEnvironment.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/MockSSKEnvironment.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeCallMessageHandler.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeCallMessageHandler.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeContactsManager.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeContactsManager.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeContactsUpdater.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeContactsUpdater.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeMessageSender.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeMessageSender.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeNetworkManager.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeNetworkManager.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeNotificationsManager.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeNotificationsManager.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeProfileManager.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/OWSFakeProfileManager.m (96%) rename SignalServiceKit/src/{Tests => TestUtils}/TestAppContext.h (100%) rename SignalServiceKit/src/{Tests => TestUtils}/TestAppContext.m (100%) rename SignalServiceKit/src/{Tests => TestUtils}/TestKeychainStorage.swift (100%) rename SignalServiceKit/{src/Tests/TestUtil => tests}/SSKSwiftTests.swift (100%) diff --git a/SignalServiceKit/src/Tests/TestUtil/Factories.swift b/SignalServiceKit/src/TestUtils/Factories.swift similarity index 100% rename from SignalServiceKit/src/Tests/TestUtil/Factories.swift rename to SignalServiceKit/src/TestUtils/Factories.swift diff --git a/SignalServiceKit/src/Tests/MockSSKEnvironment.h b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.h similarity index 100% rename from SignalServiceKit/src/Tests/MockSSKEnvironment.h rename to SignalServiceKit/src/TestUtils/MockSSKEnvironment.h diff --git a/SignalServiceKit/src/Tests/MockSSKEnvironment.m b/SignalServiceKit/src/TestUtils/MockSSKEnvironment.m similarity index 100% rename from SignalServiceKit/src/Tests/MockSSKEnvironment.m rename to SignalServiceKit/src/TestUtils/MockSSKEnvironment.m diff --git a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h rename to SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.h diff --git a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m b/SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m rename to SignalServiceKit/src/TestUtils/OWSFakeCallMessageHandler.m diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsManager.h b/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeContactsManager.h rename to SignalServiceKit/src/TestUtils/OWSFakeContactsManager.h diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsManager.m b/SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeContactsManager.m rename to SignalServiceKit/src/TestUtils/OWSFakeContactsManager.m diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsUpdater.h b/SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeContactsUpdater.h rename to SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.h diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsUpdater.m b/SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.m similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeContactsUpdater.m rename to SignalServiceKit/src/TestUtils/OWSFakeContactsUpdater.m diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.h b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeMessageSender.h rename to SignalServiceKit/src/TestUtils/OWSFakeMessageSender.h diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.m b/SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeMessageSender.m rename to SignalServiceKit/src/TestUtils/OWSFakeMessageSender.m diff --git a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h b/SignalServiceKit/src/TestUtils/OWSFakeNetworkManager.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeNetworkManager.h rename to SignalServiceKit/src/TestUtils/OWSFakeNetworkManager.h diff --git a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m b/SignalServiceKit/src/TestUtils/OWSFakeNetworkManager.m similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeNetworkManager.m rename to SignalServiceKit/src/TestUtils/OWSFakeNetworkManager.m diff --git a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h b/SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h rename to SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.h diff --git a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m b/SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.m similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m rename to SignalServiceKit/src/TestUtils/OWSFakeNotificationsManager.m diff --git a/SignalServiceKit/src/Tests/OWSFakeProfileManager.h b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h similarity index 100% rename from SignalServiceKit/src/Tests/OWSFakeProfileManager.h rename to SignalServiceKit/src/TestUtils/OWSFakeProfileManager.h diff --git a/SignalServiceKit/src/Tests/OWSFakeProfileManager.m b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m similarity index 96% rename from SignalServiceKit/src/Tests/OWSFakeProfileManager.m rename to SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m index 8cc511fbe..0cb21bbac 100644 --- a/SignalServiceKit/src/Tests/OWSFakeProfileManager.m +++ b/SignalServiceKit/src/TestUtils/OWSFakeProfileManager.m @@ -55,7 +55,8 @@ NS_ASSUME_NONNULL_BEGIN self.profileKeys[recipientId] = key; } -- (nullable NSData *)profileKeyDataForRecipientId:(NSString *)recipientId { +- (nullable NSData *)profileKeyDataForRecipientId:(NSString *)recipientId +{ return self.profileKeys[recipientId].keyData; } @@ -74,7 +75,8 @@ NS_ASSUME_NONNULL_BEGIN [self.recipientWhitelist addObject:recipientId]; } -- (void)addGroupIdToProfileWhitelist:(NSData *)groupId { +- (void)addGroupIdToProfileWhitelist:(NSData *)groupId +{ [self.threadWhitelist addObject:groupId.hexadecimalString]; } diff --git a/SignalServiceKit/src/Tests/TestAppContext.h b/SignalServiceKit/src/TestUtils/TestAppContext.h similarity index 100% rename from SignalServiceKit/src/Tests/TestAppContext.h rename to SignalServiceKit/src/TestUtils/TestAppContext.h diff --git a/SignalServiceKit/src/Tests/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m similarity index 100% rename from SignalServiceKit/src/Tests/TestAppContext.m rename to SignalServiceKit/src/TestUtils/TestAppContext.m diff --git a/SignalServiceKit/src/Tests/TestKeychainStorage.swift b/SignalServiceKit/src/TestUtils/TestKeychainStorage.swift similarity index 100% rename from SignalServiceKit/src/Tests/TestKeychainStorage.swift rename to SignalServiceKit/src/TestUtils/TestKeychainStorage.swift diff --git a/SignalServiceKit/src/Tests/TestUtil/SSKSwiftTests.swift b/SignalServiceKit/tests/SSKSwiftTests.swift similarity index 100% rename from SignalServiceKit/src/Tests/TestUtil/SSKSwiftTests.swift rename to SignalServiceKit/tests/SSKSwiftTests.swift