From e784f9feebf08b7a9f97266148bb623de01e0f3a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 7 Sep 2018 17:24:17 -0400 Subject: [PATCH 1/3] Move fakes to SSK/tests. --- .../Tests}/OWSFakeCallMessageHandler.h | 5 +- .../Tests}/OWSFakeCallMessageHandler.m | 0 .../Tests}/OWSFakeContactsManager.h | 5 +- .../Tests}/OWSFakeContactsManager.m | 8 +-- .../src/Tests/OWSFakeMessageSender.h | 17 +++++++ .../src/Tests/OWSFakeMessageSender.m | 49 +++++++++++++++++++ .../Tests}/OWSFakeNetworkManager.h | 7 ++- .../Tests}/OWSFakeNetworkManager.m | 5 +- .../Tests}/OWSFakeNotificationsManager.h | 5 +- .../Tests}/OWSFakeNotificationsManager.m | 2 +- .../Tests}/OWSFakeProfileManager.h | 2 +- .../Tests}/OWSFakeProfileManager.m | 2 +- .../TestKeychainStorage.swift | 0 .../Fakes/OWSFakeContactsUpdater.h | 12 ----- .../Fakes/OWSFakeContactsUpdater.m | 21 -------- .../TestSupport/Fakes/OWSFakeMessageSender.h | 19 ------- .../TestSupport/Fakes/OWSFakeMessageSender.m | 37 -------------- .../Fakes/OWSUnitTestEnvironment.h | 16 ------ .../Fakes/OWSUnitTestEnvironment.m | 35 ------------- 19 files changed, 90 insertions(+), 157 deletions(-) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeCallMessageHandler.h (60%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeCallMessageHandler.m (100%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeContactsManager.h (60%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeContactsManager.m (52%) create mode 100644 SignalServiceKit/src/Tests/OWSFakeMessageSender.h create mode 100644 SignalServiceKit/src/Tests/OWSFakeMessageSender.m rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeNetworkManager.h (56%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeNetworkManager.m (79%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeNotificationsManager.h (60%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeNotificationsManager.m (89%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeProfileManager.h (72%) rename SignalServiceKit/{tests/TestSupport/Fakes => src/Tests}/OWSFakeProfileManager.m (96%) rename SignalServiceKit/src/{Storage => Tests}/TestKeychainStorage.swift (100%) delete mode 100644 SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.h delete mode 100644 SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.m delete mode 100644 SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.h delete mode 100644 SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.m delete mode 100644 SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.h delete mode 100644 SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.m diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeCallMessageHandler.h b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h similarity index 60% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeCallMessageHandler.h rename to SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h index 2562d459b..28afd3810 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeCallMessageHandler.h +++ b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 12/18/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "OWSCallMessageHandler.h" diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeCallMessageHandler.m b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m similarity index 100% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeCallMessageHandler.m rename to SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsManager.h b/SignalServiceKit/src/Tests/OWSFakeContactsManager.h similarity index 60% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsManager.h rename to SignalServiceKit/src/Tests/OWSFakeContactsManager.h index ac8c8b0a7..97d38d088 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeContactsManager.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 10/7/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "ContactsManagerProtocol.h" diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsManager.m b/SignalServiceKit/src/Tests/OWSFakeContactsManager.m similarity index 52% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsManager.m rename to SignalServiceKit/src/Tests/OWSFakeContactsManager.m index d67e275e9..fe3b8abe8 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeContactsManager.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSFakeContactsManager.h" @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN @implementation OWSFakeContactsManager -- (NSString * _Nonnull)displayNameForPhoneIdentifier:(NSString * _Nullable)phoneNumber +- (NSString *_Nonnull)displayNameForPhoneIdentifier:(NSString *_Nullable)phoneNumber { return @"Fake name"; } @@ -25,12 +25,12 @@ NS_ASSUME_NONNULL_BEGIN return @[]; } -+ (BOOL)name:(NSString * _Nonnull)nameString matchesQuery:(NSString * _Nonnull)queryString ++ (BOOL)name:(NSString *_Nonnull)nameString matchesQuery:(NSString *_Nonnull)queryString { return YES; } -- (UIImage * _Nullable)imageForPhoneIdentifier:(NSString * _Nullable)phoneNumber +- (UIImage *_Nullable)imageForPhoneIdentifier:(NSString *_Nullable)phoneNumber { return nil; } diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.h b/SignalServiceKit/src/Tests/OWSFakeMessageSender.h new file mode 100644 index 000000000..b6230ee84 --- /dev/null +++ b/SignalServiceKit/src/Tests/OWSFakeMessageSender.h @@ -0,0 +1,17 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "OWSMessageSender.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface OWSFakeMessageSender : OWSMessageSender + +@property (nonatomic, nullable) dispatch_block_t enqueueMessageBlock; +@property (nonatomic, nullable) dispatch_block_t enqueueAttachmentBlock; +@property (nonatomic, nullable) dispatch_block_t enqueueTemporaryAttachmentBlock; + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.m b/SignalServiceKit/src/Tests/OWSFakeMessageSender.m new file mode 100644 index 000000000..b60d569e3 --- /dev/null +++ b/SignalServiceKit/src/Tests/OWSFakeMessageSender.m @@ -0,0 +1,49 @@ +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// + +#import "OWSFakeMessageSender.h" + +NS_ASSUME_NONNULL_BEGIN + +@implementation OWSFakeMessageSender + +- (void)enqueueMessage:(TSOutgoingMessage *)message + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler +{ + if (self.enqueueMessageBlock) { + self.enqueueMessageBlock(); + } + successHandler(); +} + +- (void)enqueueAttachment:(DataSource *)dataSource + contentType:(NSString *)contentType + sourceFilename:(nullable NSString *)sourceFilename + inMessage:(TSOutgoingMessage *)outgoingMessage + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler +{ + if (self.enqueueAttachmentBlock) { + self.enqueueAttachmentBlock(); + } + successHandler(); +} + +- (void)enqueueTemporaryAttachment:(DataSource *)dataSource + contentType:(NSString *)contentType + inMessage:(TSOutgoingMessage *)outgoingMessage + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler +{ + if (self.enqueueTemporaryAttachmentBlock) { + self.enqueueTemporaryAttachmentBlock(); + } + successHandler(); +} + + +@end + +NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNetworkManager.h b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h similarity index 56% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNetworkManager.h rename to SignalServiceKit/src/Tests/OWSFakeNetworkManager.h index 979904d9f..d81bce2c6 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNetworkManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 10/19/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "TSNetworkManager.h" @@ -7,6 +8,8 @@ NS_ASSUME_NONNULL_BEGIN @interface OWSFakeNetworkManager : TSNetworkManager +- (instancetype)init; + @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNetworkManager.m b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m similarity index 79% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNetworkManager.m rename to SignalServiceKit/src/Tests/OWSFakeNetworkManager.m index b08626202..994a3ec4a 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNetworkManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 10/19/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "OWSFakeNetworkManager.h" diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNotificationsManager.h b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h similarity index 60% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNotificationsManager.h rename to SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h index 28d078805..b29a7ad9c 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNotificationsManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h @@ -1,5 +1,6 @@ -// Created by Michael Kirk on 12/18/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "NotificationsProtocol.h" diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNotificationsManager.m b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m similarity index 89% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNotificationsManager.m rename to SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m index fd96833c0..270c08bac 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeNotificationsManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSFakeNotificationsManager.h" diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeProfileManager.h b/SignalServiceKit/src/Tests/OWSFakeProfileManager.h similarity index 72% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeProfileManager.h rename to SignalServiceKit/src/Tests/OWSFakeProfileManager.h index 29469f3cc..00d58b3d3 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeProfileManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeProfileManager.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "ProfileManagerProtocol.h" diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeProfileManager.m b/SignalServiceKit/src/Tests/OWSFakeProfileManager.m similarity index 96% rename from SignalServiceKit/tests/TestSupport/Fakes/OWSFakeProfileManager.m rename to SignalServiceKit/src/Tests/OWSFakeProfileManager.m index 84dc2116c..19a857a55 100644 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeProfileManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeProfileManager.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. // #import "OWSFakeProfileManager.h" diff --git a/SignalServiceKit/src/Storage/TestKeychainStorage.swift b/SignalServiceKit/src/Tests/TestKeychainStorage.swift similarity index 100% rename from SignalServiceKit/src/Storage/TestKeychainStorage.swift rename to SignalServiceKit/src/Tests/TestKeychainStorage.swift diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.h b/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.h deleted file mode 100644 index 9adc1fecf..000000000 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.h +++ /dev/null @@ -1,12 +0,0 @@ -// Created by Michael Kirk on 10/7/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. - -#import "ContactsUpdater.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSFakeContactsUpdater : ContactsUpdater - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.m b/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.m deleted file mode 100644 index 46520e554..000000000 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeContactsUpdater.m +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#import "OWSFakeContactsUpdater.h" -#import "SignalRecipient.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSFakeContactsUpdater - -- (nullable SignalRecipient *)synchronousLookup:(NSString *)identifier error:(NSError **)error -{ - NSLog(@"[OWSFakeContactsUpdater] Faking contact lookup."); - return [[SignalRecipient alloc] initWithTextSecureIdentifier:@"fake-recipient-id" - relay:nil]; -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.h b/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.h deleted file mode 100644 index c8dfc0d0d..000000000 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#import "OWSMessageSender.h" -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSFakeMessageSender : OWSMessageSender - -- (instancetype)init; -- (instancetype)initWithExpectation:(XCTestExpectation *)expectation; - -@property (nonatomic, readonly) XCTestExpectation *expectation; - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.m b/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.m deleted file mode 100644 index 2a62bfb17..000000000 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSFakeMessageSender.m +++ /dev/null @@ -1,37 +0,0 @@ -// -// Copyright (c) 2017 Open Whisper Systems. All rights reserved. -// - -#import "OWSFakeMessageSender.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSFakeMessageSender - -- (instancetype)initWithExpectation:(XCTestExpectation *)expectation -{ - self = [self init]; - if (!self) { - return self; - } - - _expectation = expectation; - - return self; -} - -- (void)sendTemporaryAttachmentData:(NSData *)attachmentData - contentType:(NSString *)contentType - inMessage:(TSOutgoingMessage *)outgoingMessage - success:(void (^)())successHandler - failure:(void (^)(NSError *error))failureHandler -{ - - NSLog(@"Faking sendTemporyAttachmentData."); - [self.expectation fulfill]; - successHandler(); -} - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.h b/SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.h deleted file mode 100644 index 2feeb71aa..000000000 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import "SSKEnvironment.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface OWSUnitTestEnvironment : SSKEnvironment - -+ (void)ensureSetup; -- (instancetype)initDefault; - -@end - -NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.m b/SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.m deleted file mode 100644 index e48f0923e..000000000 --- a/SignalServiceKit/tests/TestSupport/Fakes/OWSUnitTestEnvironment.m +++ /dev/null @@ -1,35 +0,0 @@ -// -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. -// - -#import "OWSUnitTestEnvironment.h" -#import "OWSFakeCallMessageHandler.h" -#import "OWSFakeContactsManager.h" -#import "OWSFakeMessageSender.h" -#import "OWSFakeNotificationsManager.h" -#import "OWSFakeProfileManager.h" - -NS_ASSUME_NONNULL_BEGIN - -@implementation OWSUnitTestEnvironment - -+ (void)ensureSetup -{ - static dispatch_once_t onceToken; - dispatch_once(&onceToken, ^{ - [self setShared:[[self alloc] initDefault]]; - }); -} - -- (instancetype)initDefault -{ - return [super initWithCallMessageHandler:[OWSFakeCallMessageHandler new] - contactsManager:[OWSFakeContactsManager new] - messageSender:[OWSFakeMessageSender new] - notificationsManager:[OWSFakeNotificationsManager new] - profileManager:[OWSFakeProfileManager new]]; -} - -@end - -NS_ASSUME_NONNULL_END From ef12612a9cb32f2f923bb18b6bcf1a523d02e1aa Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 14 Sep 2018 14:06:21 -0400 Subject: [PATCH 2/3] Update cocoapods. --- Pods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pods b/Pods index 327edd6db..6f5013b6f 160000 --- a/Pods +++ b/Pods @@ -1 +1 @@ -Subproject commit 327edd6db716ef97af817b170155ed4b4487d891 +Subproject commit 6f5013b6f65fa1d988c9a2a027ea2b09f995ab95 From 2ba642c9e9c2bdd9e3e70dd0a6b807924405b64d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 14 Sep 2018 14:18:39 -0400 Subject: [PATCH 3/3] Ensure fakes/mocks are debug-only. --- .../xcshareddata/xcschemes/Signal.xcscheme | 4 ++-- .../src/Tests/OWSFakeCallMessageHandler.h | 4 ++++ .../src/Tests/OWSFakeCallMessageHandler.m | 19 ++++++++++++------- .../src/Tests/OWSFakeContactsManager.h | 4 ++++ .../src/Tests/OWSFakeContactsManager.m | 4 +++- .../src/Tests/OWSFakeMessageSender.h | 4 ++++ .../src/Tests/OWSFakeMessageSender.m | 4 ++++ .../src/Tests/OWSFakeNetworkManager.h | 4 ++++ .../src/Tests/OWSFakeNetworkManager.m | 4 ++++ .../src/Tests/OWSFakeNotificationsManager.h | 4 ++++ .../src/Tests/OWSFakeNotificationsManager.m | 4 ++++ .../src/Tests/OWSFakeProfileManager.h | 4 ++++ .../src/Tests/OWSFakeProfileManager.m | 4 ++++ SignalServiceKit/src/Tests/TestAppContext.h | 4 ++++ SignalServiceKit/src/Tests/TestAppContext.m | 4 ++++ .../src/Tests/TestKeychainStorage.swift | 4 ++++ SignalServiceKit/tests/SSKBaseTest.h | 4 ++++ SignalServiceKit/tests/SSKBaseTest.m | 4 ++++ 18 files changed, 77 insertions(+), 10 deletions(-) diff --git a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme index f08479b69..c9ee2d500 100644 --- a/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme +++ b/Signal.xcodeproj/xcshareddata/xcschemes/Signal.xcscheme @@ -28,7 +28,7 @@ buildForAnalyzing = "YES"> @@ -56,7 +56,7 @@ skipped = "NO"> diff --git a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h index 28afd3810..c2364cae7 100644 --- a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h +++ b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.h @@ -6,8 +6,12 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeCallMessageHandler : NSObject @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m index e2b51a93d..5925468c4 100644 --- a/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m +++ b/SignalServiceKit/src/Tests/OWSFakeCallMessageHandler.m @@ -1,37 +1,42 @@ -// Created by Michael Kirk on 12/18/16. -// Copyright © 2016 Open Whisper Systems. All rights reserved. +// +// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// #import "OWSFakeCallMessageHandler.h" NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @implementation OWSFakeCallMessageHandler -- (void)receivedOffer:(OWSSignalServiceProtosCallMessageOffer *)offer fromCallerId:(NSString *)callerId +- (void)receivedOffer:(SSKProtoCallMessageOffer *)offer fromCallerId:(NSString *)callerId { NSLog(@"%s", __PRETTY_FUNCTION__); } -- (void)receivedAnswer:(OWSSignalServiceProtosCallMessageAnswer *)answer fromCallerId:(NSString *)callerId +- (void)receivedAnswer:(SSKProtoCallMessageAnswer *)answer fromCallerId:(NSString *)callerId { NSLog(@"%s", __PRETTY_FUNCTION__); } -- (void)receivedIceUpdate:(OWSSignalServiceProtosCallMessageIceUpdate *)iceUpdate fromCallerId:(NSString *)callerId +- (void)receivedIceUpdate:(SSKProtoCallMessageIceUpdate *)iceUpdate fromCallerId:(NSString *)callerId { NSLog(@"%s", __PRETTY_FUNCTION__); } -- (void)receivedHangup:(OWSSignalServiceProtosCallMessageHangup *)hangup fromCallerId:(NSString *)callerId +- (void)receivedHangup:(SSKProtoCallMessageHangup *)hangup fromCallerId:(NSString *)callerId { NSLog(@"%s", __PRETTY_FUNCTION__); } -- (void)receivedBusy:(OWSSignalServiceProtosCallMessageBusy *)busy fromCallerId:(NSString *)callerId +- (void)receivedBusy:(SSKProtoCallMessageBusy *)busy fromCallerId:(NSString *)callerId { NSLog(@"%s", __PRETTY_FUNCTION__); } @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsManager.h b/SignalServiceKit/src/Tests/OWSFakeContactsManager.h index 97d38d088..0ac2786ea 100644 --- a/SignalServiceKit/src/Tests/OWSFakeContactsManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeContactsManager.h @@ -6,8 +6,12 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeContactsManager : NSObject @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeContactsManager.m b/SignalServiceKit/src/Tests/OWSFakeContactsManager.m index fe3b8abe8..cf2a747dd 100644 --- a/SignalServiceKit/src/Tests/OWSFakeContactsManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeContactsManager.m @@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN -@class UIImage; +#ifdef DEBUG @implementation OWSFakeContactsManager @@ -37,4 +37,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.h b/SignalServiceKit/src/Tests/OWSFakeMessageSender.h index b6230ee84..00ce55670 100644 --- a/SignalServiceKit/src/Tests/OWSFakeMessageSender.h +++ b/SignalServiceKit/src/Tests/OWSFakeMessageSender.h @@ -6,6 +6,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeMessageSender : OWSMessageSender @property (nonatomic, nullable) dispatch_block_t enqueueMessageBlock; @@ -14,4 +16,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeMessageSender.m b/SignalServiceKit/src/Tests/OWSFakeMessageSender.m index b60d569e3..6b5ebca13 100644 --- a/SignalServiceKit/src/Tests/OWSFakeMessageSender.m +++ b/SignalServiceKit/src/Tests/OWSFakeMessageSender.m @@ -6,6 +6,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @implementation OWSFakeMessageSender - (void)enqueueMessage:(TSOutgoingMessage *)message @@ -46,4 +48,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h index d81bce2c6..73b76d209 100644 --- a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.h @@ -6,10 +6,14 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeNetworkManager : TSNetworkManager - (instancetype)init; @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m index 994a3ec4a..03fcc23c8 100644 --- a/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeNetworkManager.m @@ -6,6 +6,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @implementation OWSFakeNetworkManager - (void)makeRequest:(TSRequest *)request @@ -17,4 +19,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h index b29a7ad9c..adf79cff3 100644 --- a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.h @@ -6,8 +6,12 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeNotificationsManager : NSObject @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m index 270c08bac..f42c63d61 100644 --- a/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeNotificationsManager.m @@ -6,6 +6,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @implementation OWSFakeNotificationsManager - (void)notifyUserForIncomingMessage:(TSIncomingMessage *)incomingMessage @@ -23,4 +25,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeProfileManager.h b/SignalServiceKit/src/Tests/OWSFakeProfileManager.h index 00d58b3d3..d2cf1bbb0 100644 --- a/SignalServiceKit/src/Tests/OWSFakeProfileManager.h +++ b/SignalServiceKit/src/Tests/OWSFakeProfileManager.h @@ -6,8 +6,12 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeProfileManager : NSObject @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/OWSFakeProfileManager.m b/SignalServiceKit/src/Tests/OWSFakeProfileManager.m index 19a857a55..7a39a324c 100644 --- a/SignalServiceKit/src/Tests/OWSFakeProfileManager.m +++ b/SignalServiceKit/src/Tests/OWSFakeProfileManager.m @@ -8,6 +8,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface OWSFakeProfileManager () @property (nonatomic, readonly) NSMutableDictionary *profileKeys; @@ -68,4 +70,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/TestAppContext.h b/SignalServiceKit/src/Tests/TestAppContext.h index b438e0c82..0f32d440c 100644 --- a/SignalServiceKit/src/Tests/TestAppContext.h +++ b/SignalServiceKit/src/Tests/TestAppContext.h @@ -6,8 +6,12 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface TestAppContext : NSObject @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/TestAppContext.m b/SignalServiceKit/src/Tests/TestAppContext.m index 527f3e757..bbf3fc4bb 100644 --- a/SignalServiceKit/src/Tests/TestAppContext.m +++ b/SignalServiceKit/src/Tests/TestAppContext.m @@ -7,6 +7,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface TestAppContext () @property (nonatomic) SSKTestKeychainStorage *testKeychainStorage; @@ -150,4 +152,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/Tests/TestKeychainStorage.swift b/SignalServiceKit/src/Tests/TestKeychainStorage.swift index 828637ec3..8127738ea 100644 --- a/SignalServiceKit/src/Tests/TestKeychainStorage.swift +++ b/SignalServiceKit/src/Tests/TestKeychainStorage.swift @@ -4,6 +4,8 @@ import Foundation +#if DEBUG + @objc public class SSKTestKeychainStorage: NSObject, SSKKeychainStorage { @@ -50,3 +52,5 @@ public class SSKTestKeychainStorage: NSObject, SSKKeychainStorage { dataMap.removeValue(forKey: key) } } + +#endif diff --git a/SignalServiceKit/tests/SSKBaseTest.h b/SignalServiceKit/tests/SSKBaseTest.h index e0957284d..ffa150fe1 100644 --- a/SignalServiceKit/tests/SSKBaseTest.h +++ b/SignalServiceKit/tests/SSKBaseTest.h @@ -6,8 +6,12 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @interface SSKBaseTest : XCTestCase @end +#endif + NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/tests/SSKBaseTest.m b/SignalServiceKit/tests/SSKBaseTest.m index e32e30a9c..6b413e5ea 100644 --- a/SignalServiceKit/tests/SSKBaseTest.m +++ b/SignalServiceKit/tests/SSKBaseTest.m @@ -9,6 +9,8 @@ NS_ASSUME_NONNULL_BEGIN +#ifdef DEBUG + @implementation SSKBaseTest - (void)setUp @@ -35,4 +37,6 @@ NS_ASSUME_NONNULL_BEGIN @end +#endif + NS_ASSUME_NONNULL_END