signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix broken tests.

Browse Source
This commit is contained in:
Matthew Chen 2019-08-16 12:18:58 -03:00
parent 386e443ce1
commit aa149f6544
6 changed files with 58 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Signal/test/util/YDBToGRDBMigrationTest.swift
View File

@ -19,6 +19,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueInt() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")
@ -95,6 +98,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueUInt() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")
@ -171,6 +177,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueDouble() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")
@ -247,6 +256,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueData() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")
@ -315,6 +327,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueString() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")
@ -383,6 +398,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueDate() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")
@ -470,6 +488,9 @@ class YDBToGRDBMigrationTest: SignalBaseTest {
}
func testKeyValueObject() {
// GRDB TODO: This test can be fixed using the storage coordinator in master.
XCTAssert(FeatureFlags.useGRDB)
let store1 = SDSKeyValueStore(collection: "store1")
let store2 = SDSKeyValueStore(collection: "store2")
let store3 = SDSKeyValueStore(collection: "store3")

2
SignalServiceKit/src/Network/MessageSenderJobQueue.swift
View File

@ -67,7 +67,7 @@ public class MessageSenderJobQueue: NSObject, JobQueue {
let jobRecord: SSKMessageSenderJobRecord
do {
jobRecord = try SSKMessageSenderJobRecord(message: message, removeMessageAfterSending: false, label: self.jobRecordLabel)
jobRecord = try SSKMessageSenderJobRecord(message: message, removeMessageAfterSending: false, label: self.jobRecordLabel, transaction: transaction)
} catch {
owsFailDebug("failed to build job: \(error)")
return

2
SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.h
View File

@ -6,6 +6,7 @@
NS_ASSUME_NONNULL_BEGIN
@class SDSAnyReadTransaction;
@class TSOutgoingMessage;
@interface SSKMessageSenderJobRecord : SSKJobRecord
@ -18,6 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable instancetype)initWithMessage:(TSOutgoingMessage *)message
removeMessageAfterSending:(BOOL)removeMessageAfterSending
label:(NSString *)label
transaction:(SDSAnyReadTransaction *)transaction
error:(NSError **)outError NS_DESIGNATED_INITIALIZER;
- (nullable instancetype)initWithCoder:(NSCoder *)coder NS_DESIGNATED_INITIALIZER;

8
SignalServiceKit/src/Storage/SSKMessageSenderJobRecord.m
View File

@ -4,6 +4,7 @@
#import "SSKMessageSenderJobRecord.h"
#import "TSOutgoingMessage.h"
#import <SignalServiceKit/SignalServiceKit-Swift.h>
NS_ASSUME_NONNULL_BEGIN
@ -19,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
- (nullable instancetype)initWithMessage:(TSOutgoingMessage *)message
removeMessageAfterSending:(BOOL)removeMessageAfterSending
label:(NSString *)label
transaction:(SDSAnyReadTransaction *)transaction
error:(NSError **)outError
{
self = [super initWithLabel:label];
@ -28,10 +30,12 @@ NS_ASSUME_NONNULL_BEGIN
if (message.shouldBeSaved) {
_messageId = message.uniqueId;
if (_messageId == nil) {
OWSAssertDebug(_messageId.length > 0);
BOOL isSaved = [TSInteraction anyFetchWithUniqueId:_messageId transaction:transaction] != nil;
if (!isSaved) {
*outError = [NSError errorWithDomain:SSKJobRecordErrorDomain
code:JobRecordError_AssertionError
userInfo:@{ NSDebugDescriptionErrorKey : @"messageId wasn't set" }];
userInfo:@{ NSDebugDescriptionErrorKey : @"message wasn't saved" }];
return nil;
}
_invisibleMessage = nil;

4
SignalServiceKit/tests/Messages/OWSUDManagerTest.swift
View File

@ -50,7 +50,7 @@ class OWSUDManagerTest: SSKBaseTestSwift {
// Configure UDManager
self.write { transaction in
profileManager.setProfileKeyData(OWSAES256Key.generateRandom().keyData, for: aliceAddress, transaction: transaction)
self.profileManager.setProfileKeyData(OWSAES256Key.generateRandom().keyData, for: self.aliceAddress, transaction: transaction)
}
udManager.certificateValidator = MockCertificateValidator()
@ -159,7 +159,7 @@ class OWSUDManagerTest: SSKBaseTestSwift {
let bobRecipientAddress = SignalServiceAddress(phoneNumber: "+13213214322")
XCTAssertFalse(bobRecipientAddress.isLocalAddress)
self.write { transaction in
profileManager.setProfileKeyData(OWSAES256Key.generateRandom().keyData, for: bobRecipientAddress, transaction: transaction)
self.profileManager.setProfileKeyData(OWSAES256Key.generateRandom().keyData, for: bobRecipientAddress, transaction: transaction)
}
var udAccess: OWSUDAccess!

43
SignalServiceKit/tests/Network/MessageSenderJobRecordTest.swift
View File

@ -11,34 +11,43 @@ class SSKMessageSenderJobRecordTest: SSKBaseTestSwift {
func test_savedVisibleMessage() {
let message = OutgoingMessageFactory().create()
let jobRecord = try! SSKMessageSenderJobRecord(message: message, removeMessageAfterSending: false, label: MessageSenderJobQueue.jobRecordLabel)
XCTAssertNotNil(jobRecord.messageId)
XCTAssertNotNil(jobRecord.threadId)
XCTAssertNil(jobRecord.invisibleMessage)
self.yapRead { transaction in
let jobRecord = try! SSKMessageSenderJobRecord(message: message,
removeMessageAfterSending: false,
label: MessageSenderJobQueue.jobRecordLabel,
transaction: transaction.asAnyRead)
XCTAssertNotNil(jobRecord.messageId)
XCTAssertNotNil(jobRecord.threadId)
XCTAssertNil(jobRecord.invisibleMessage)
}
}
func test_unsavedVisibleMessage() {
var message: TSOutgoingMessage!
self.yapWrite { transaction in
message = OutgoingMessageFactory().build(transaction: transaction.asAnyWrite)
}
do {
_ = try SSKMessageSenderJobRecord(message: message, removeMessageAfterSending: false, label: MessageSenderJobQueue.jobRecordLabel)
XCTFail("Should error")
} catch JobRecordError.assertionError {
// expected
} catch {
XCTFail("unexpected error: \(error)")
do {
_ = try SSKMessageSenderJobRecord(message: message, removeMessageAfterSending: false, label: MessageSenderJobQueue.jobRecordLabel, transaction: transaction.asAnyRead)
XCTFail("Should error")
} catch JobRecordError.assertionError {
// expected
} catch {
XCTFail("unexpected error: \(error)")
}
}
}
func test_invisibleMessage() {
let message = OutgoingMessageFactory().buildDeliveryReceipt()
let jobRecord = try! SSKMessageSenderJobRecord(message: message, removeMessageAfterSending: false, label: MessageSenderJobQueue.jobRecordLabel)
XCTAssertNil(jobRecord.messageId)
XCTAssertNotNil(jobRecord.threadId)
XCTAssertNotNil(jobRecord.invisibleMessage)
self.yapRead { transaction in
let jobRecord = try! SSKMessageSenderJobRecord(message: message,
removeMessageAfterSending: false,
label: MessageSenderJobQueue.jobRecordLabel,
transaction: transaction.asAnyRead)
XCTAssertNil(jobRecord.messageId)
XCTAssertNotNil(jobRecord.threadId)
XCTAssertNotNil(jobRecord.invisibleMessage)
}
}
}