From 935b51aa1955a9e4ed14e80c0c4185a3665522ae Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael.code@endoftheworl.de>
Date: Wed, 2 Aug 2017 16:51:26 -0400
Subject: [PATCH] Fixup tests
// FREEBIE
---
SignalServiceKit/src/Contacts/SignalRecipient.m | 1 +
SignalServiceKit/tests/Contacts/SignalRecipientTest.m | 10 ++++++++--
SignalServiceKit/tests/Messages/OWSMessageSenderTest.m | 10 ++++++++--
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/SignalServiceKit/src/Contacts/SignalRecipient.m b/SignalServiceKit/src/Contacts/SignalRecipient.m
index 55effc18a..dc71f3a01 100644
--- a/SignalServiceKit/src/Contacts/SignalRecipient.m
+++ b/SignalServiceKit/src/Contacts/SignalRecipient.m
@@ -44,6 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
return recipient;
}
+// TODO This method should probably live on the TSAccountManager rather than grabbing a global singleton.
+ (instancetype)selfRecipient
{
SignalRecipient *myself = [self recipientWithTextSecureIdentifier:[TSAccountManager localNumber]];
diff --git a/SignalServiceKit/tests/Contacts/SignalRecipientTest.m b/SignalServiceKit/tests/Contacts/SignalRecipientTest.m
index b5fd06045..10d46127f 100644
--- a/SignalServiceKit/tests/Contacts/SignalRecipientTest.m
+++ b/SignalServiceKit/tests/Contacts/SignalRecipientTest.m
@@ -3,10 +3,16 @@
//
#import "SignalRecipient.h"
+#import "TSAccountManager.h"
#import "TSStorageManager+keyingMaterial.h"
-#import "TSStorageManager.h"
#import <XCTest/XCTest.h>
+@interface TSAccountManager (Testing)
+
+- (void)storeLocalNumber:(NSString *)localNumber;
+
+@end
+
@interface SignalRecipientTest : XCTestCase
@property (nonatomic) NSString *localNumber;
@@ -19,7 +25,7 @@
{
[super setUp];
self.localNumber = @"+13231231234";
- [[TSStorageManager sharedManager] storePhoneNumber:self.localNumber];
+ [[TSAccountManager sharedInstance] storeLocalNumber:self.localNumber];
}
- (void)testSelfRecipientWithExistingRecord
diff --git a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
index 7a6c4f2cc..d7a8aa048 100644
--- a/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
+++ b/SignalServiceKit/tests/Messages/OWSMessageSenderTest.m
@@ -10,13 +10,13 @@
#import "OWSFakeNetworkManager.h"
#import "OWSMessageSender.h"
#import "OWSUploadingService.h"
+#import "TSAccountManager.h"
#import "TSContactThread.h"
#import "TSGroupModel.h"
#import "TSGroupThread.h"
#import "TSMessagesManager.h"
#import "TSNetworkManager.h"
#import "TSOutgoingMessage.h"
-#import "TSStorageManager+keyingMaterial.h"
#import "TSStorageManager.h"
#import <AxolotlKit/AxolotlExceptions.h>
#import <AxolotlKit/SessionBuilder.h>
@@ -174,6 +174,12 @@ NS_ASSUME_NONNULL_BEGIN
@end
+@interface TSAccountManager (Testing)
+
+- (void)storeLocalNumber:(NSString *)localNumber;
+
+@end
+
@interface OWSMessageSenderTest : XCTestCase
@property (nonatomic) TSThread *thread;
@@ -192,7 +198,7 @@ NS_ASSUME_NONNULL_BEGIN
[super setUp];
// Hack to make sure we don't explode when sending sync message.
- [[TSStorageManager sharedManager] storePhoneNumber:@"+13231231234"];
+ [[TSAccountManager sharedInstance] storeLocalNumber:@"+13231231234"];
self.thread = [[TSContactThread alloc] initWithUniqueId:@"fake-thread-id"];
[self.thread save];