update old non-existant API usage

pull/1/head
Michael Kirk 7 years ago
parent 7a832e85ec
commit 170eb63772

@ -104,7 +104,7 @@ class AccountManagerTest: SignalBaseTest {
func testSuccessfulRegistration() { func testSuccessfulRegistration() {
Environment.clearSharedForTests() Environment.clearSharedForTests()
Environment.setCurrent(Release.releaseEnvironment()) Environment.shared = Release.releaseEnvironment()
let tsAccountManager = TokenObtainingTSAccountManager(networkManager: TSNetworkManager.shared(), primaryStorage: OWSPrimaryStorage.shared()) let tsAccountManager = TokenObtainingTSAccountManager(networkManager: TSNetworkManager.shared(), primaryStorage: OWSPrimaryStorage.shared())

@ -134,7 +134,7 @@
TSAttachmentStream *attachmentStream = [self createAttachmentStream]; TSAttachmentStream *attachmentStream = [self createAttachmentStream];
NSString *orphanedFilePath = [attachmentStream filePath]; NSString *orphanedFilePath = [attachmentStream originalFilePath];
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath]; BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
XCTAssert(fileExists); XCTAssert(fileExists);
XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]); XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);
@ -168,7 +168,7 @@
__unused TSIncomingMessage *incomingMessage = __unused TSIncomingMessage *incomingMessage =
[self createIncomingMessageWithThread:savedThread attachmentIds:@[ attachmentStream.uniqueId ]]; [self createIncomingMessageWithThread:savedThread attachmentIds:@[ attachmentStream.uniqueId ]];
NSString *attachmentFilePath = [attachmentStream filePath]; NSString *attachmentFilePath = [attachmentStream originalFilePath];
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentFilePath]; BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:attachmentFilePath];
XCTAssert(fileExists); XCTAssert(fileExists);
XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]); XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);
@ -197,7 +197,7 @@
[attachmentStream writeData:[NSData new] error:&error]; [attachmentStream writeData:[NSData new] error:&error];
// Intentionally not saved, because we want a lingering file. // Intentionally not saved, because we want a lingering file.
NSString *orphanedFilePath = [attachmentStream filePath]; NSString *orphanedFilePath = [attachmentStream originalFilePath];
BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath]; BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:orphanedFilePath];
XCTAssert(fileExists); XCTAssert(fileExists);
XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]); XCTAssertEqual(1, [self numberOfItemsInAttachmentsFolder]);

@ -106,7 +106,7 @@ class ConversationSearcherTest: SignalBaseTest {
override func tearDown() { override func tearDown() {
super.tearDown() super.tearDown()
SSKEnvironment.setShared(originalEnvironment!) SSKEnvironment.shared = originalEnvironment!
} }
override func setUp() { override func setUp() {
@ -123,7 +123,7 @@ class ConversationSearcherTest: SignalBaseTest {
let testEnvironment: StubbableEnvironment = StubbableEnvironment(proxy: originalEnvironment!) let testEnvironment: StubbableEnvironment = StubbableEnvironment(proxy: originalEnvironment!)
testEnvironment.stubbedContactsManager = FakeContactsManager() testEnvironment.stubbedContactsManager = FakeContactsManager()
SSKEnvironment.setShared(testEnvironment) SSKEnvironment.shared = testEnvironment
self.dbConnection.readWrite { transaction in self.dbConnection.readWrite { transaction in
let bookModel = TSGroupModel(title: "Book Club", memberIds: [aliceRecipientId, bobRecipientId], image: nil, groupId: Randomness.generateRandomBytes(16)) let bookModel = TSGroupModel(title: "Book Club", memberIds: [aliceRecipientId, bobRecipientId], image: nil, groupId: Randomness.generateRandomBytes(16))

Loading…
Cancel
Save