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

Merge branch 'mlin/PR/FixTests_GroupMembershipTable'

Browse Source
This commit is contained in:
Michelle Linington 2021-05-06 15:46:06 -07:00
commit 75529abd26
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Signal/test/util/FTS/GRDBFullTextSearcherTest.swift
View File

@ -160,7 +160,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
tsAccountManager.registerForTests(withLocalNumber: localE164Identifier, uuid: localUUID)
self.write { transaction in
let bookClubGroupThread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
let bookClubGroupThread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Book Club",
transaction: transaction)
self.bookClubThread = ThreadViewModel(thread: bookClubGroupThread,
@ -397,7 +397,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
var thread: TSGroupThread! = nil
self.write { transaction in
thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Lifecycle",
transaction: transaction)
}
@ -451,7 +451,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
func testModelLifecycle2() {
self.write { transaction in
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Lifecycle",
transaction: transaction)
@ -480,7 +480,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
func testModelLifecycle3() {
self.write { transaction in
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Lifecycle",
transaction: transaction)
@ -509,7 +509,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
func testDiacritics() {
self.write { transaction in
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Lifecycle",
transaction: transaction)
@ -550,7 +550,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
var thread: TSGroupThread! = nil
self.write { transaction in
thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Lifecycle",
transaction: transaction)
}
@ -591,7 +591,7 @@ class GRDBFullTextSearcherTest: SignalBaseTest {
Bench(title: "Populate Index", memorySamplerRatio: 1) { _ in
self.write { transaction in
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient],
let thread = try! GroupManager.createGroupForTests(members: [self.aliceRecipient, self.bobRecipient, self.tsAccountManager.localAddress!],
name: "Perf",
transaction: transaction)

6
Signal/test/util/GroupAndContactStreamTest.swift
View File

@ -15,7 +15,7 @@ class GroupAndContactStreamTest: SignalBaseTest {
// ensure local client has necessary "registered" state
let localE164Identifier = "+13235551234"
let localUUID = UUID()
let localUUID = UUID(uuidString: "83DF967A-5CBD-43EB-AE9A-571A930F78D6")!
tsAccountManager.registerForTests(withLocalNumber: localE164Identifier, uuid: localUUID)
}
@ -101,7 +101,7 @@ class GroupAndContactStreamTest: SignalBaseTest {
}
}
let outputGroupSyncData = "awoQc111Fz2xlVb3YbtcfwN0SBoMKzEzMjEzMjE0MzIxGgwrMTMyMTMyMTQzMjMiDgoJaW1hZ2UvcG5nEKMBMAA6BWJyb3duSg4SDCsxMzIxMzIxNDMyMUoOEgwrMTMyMTMyMTQzMjNQAVgAiVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAAaADAAQAAAABAAAAAQAAAAD5Ip3+AAAADUlEQVQIHWP4z8DwHwAFAAH/yA9iFgAAAABJRU5ErkJggnoKEHNtthc9sZVW92G7XH8DdEgSCUJvb2sgQ2x1YhoMKzEzMjEzMjE0MzIxGgwrMTU1NTMyMTQzMjMiDgoJaW1hZ2UvcG5nEKMBMAA6CWJsdWVfZ3JleUoOEgwrMTMyMTMyMTQzMjFKDhIMKzE1NTUzMjE0MzIzUAJYAYlQTkcNChoKAAAADUlIRFIAAAABAAAAAQgGAAAAHxXEiQAAAAFzUkdCAK7OHOkAAABEZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAAGgAwAEAAAAAQAAAAEAAAAA+SKd/gAAAA1JREFUCB1jYGD4/x8AAwIB/6fhVKUAAAAASUVORK5CYIJ1ChBzffcXPbGVVvdhu1x/A3RIEglDb29rIEJsdWIaDCsxMzIxMzIxMzMzMxoMKzE1NTUzMjEyMjIyIg4KCWltYWdlL3BuZxCjATAAOgRibHVlSg4SDCsxMzIxMzIxMzMzM0oOEgwrMTU1NTMyMTIyMjJQAFgBiVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAAaADAAQAAAABAAAAAQAAAAD5Ip3+AAAADUlEQVQIHWNg+M/wHwAEAQH/MH0Y7gAAAABJRU5ErkJggg=="
let outputGroupSyncData = "awoQc111Fz2xlVb3YbtcfwN0SBoMKzEzMjEzMjE0MzIxGgwrMTMyMTMyMTQzMjMiDgoJaW1hZ2UvcG5nEKMBMAA6BWJyb3duSg4SDCsxMzIxMzIxNDMyMUoOEgwrMTMyMTMyMTQzMjNQAVgAiVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAAaADAAQAAAABAAAAAQAAAAD5Ip3+AAAADUlEQVQIHWP4z8DwHwAFAAH/yA9iFgAAAABJRU5ErkJggnoKEHNtthc9sZVW92G7XH8DdEgSCUJvb2sgQ2x1YhoMKzEzMjEzMjE0MzIxGgwrMTU1NTMyMTQzMjMiDgoJaW1hZ2UvcG5nEKMBMAA6CWJsdWVfZ3JleUoOEgwrMTMyMTMyMTQzMjFKDhIMKzE1NTUzMjE0MzIzUAJYAYlQTkcNChoKAAAADUlIRFIAAAABAAAAAQgGAAAAHxXEiQAAAAFzUkdCAK7OHOkAAABEZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAAGgAwAEAAAAAQAAAAEAAAAA+SKd/gAAAA1JREFUCB1jYGD4/x8AAwIB/6fhVKUAAAAASUVORK5CYIKTAQoQc333Fz2xlVb3YbtcfwN0SBIJQ29vayBCbHViGgwrMTMyMTMyMTMzMzMaDCsxMzIzNTU1MTIzNBoMKzE1NTUzMjEyMjIyIg4KCWltYWdlL3BuZxCjATAAOgRibHVlSg4SDCsxMzIxMzIxMzMzM0oOEgwrMTMyMzU1NTEyMzRKDhIMKzE1NTUzMjEyMjIyUABYAYlQTkcNChoKAAAADUlIRFIAAAABAAAAAQgGAAAAHxXEiQAAAAFzUkdCAK7OHOkAAABEZVhJZk1NACoAAAAIAAGHaQAEAAAAAQAAABoAAAAAAAOgAQADAAAAAQABAACgAgAEAAAAAQAAAAGgAwAEAAAAAQAAAAEAAAAA+SKd/gAAAA1JREFUCB1jYPjP8B8ABAEB/zB9GO4AAAAASUVORK5CYII="
let groupImageData1 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAAaADAAQAAAABAAAAAQAAAAD5Ip3+AAAADUlEQVQIHWP4z8DwHwAFAAH/yA9iFgAAAABJRU5ErkJggg=="
let groupImageData2 = "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAAaADAAQAAAABAAAAAQAAAAD5Ip3+AAAADUlEQVQIHWNgYPj/HwADAgH/p+FUpQAAAABJRU5ErkJggg=="
@ -156,6 +156,7 @@ class GroupAndContactStreamTest: SignalBaseTest {
let groupId = Data(base64Encoded: "c333Fz2xlVb3YbtcfwN0SA==")!
let groupMembers: [SignalServiceAddress] = [
.init(phoneNumber: "+13213213333"),
tsAccountManager.localAddress!,
.init(uuidString: "55555555-88fb-4c4e-9f6a-222222222222", phoneNumber: "+15553212222")
]
@ -247,6 +248,7 @@ class GroupAndContactStreamTest: SignalBaseTest {
XCTAssertEqual(group.name, "Cook Blub")
XCTAssertEqual(group.memberAddresses, [
SignalServiceAddress(phoneNumber: "+13213213333"),
tsAccountManager.localAddress!,
SignalServiceAddress(uuidString: "55555555-88FB-4C4E-9F6A-222222222222", phoneNumber: "+15553212222")
])
XCTAssertEqual(group.conversationColorName, ConversationColorName.blue.rawValue)

3
SignalServiceKit/tests/Util/TSMessageStorageTests.m
View File

@ -146,7 +146,8 @@
NSMutableArray<TSIncomingMessage *> *messages = [NSMutableArray new];
for (uint64_t i = 0; i < 10; i++) {
SignalServiceAddress *authorAddress = [[SignalServiceAddress alloc] initWithPhoneNumber:@"+fakephone"];
NSUInteger memberIdx = (i % thread.groupModel.groupMembers.count);
SignalServiceAddress *authorAddress = thread.groupModel.groupMembers[memberIdx];
TSIncomingMessageBuilder *incomingMessageBuilder =
[TSIncomingMessageBuilder incomingMessageBuilderWithThread:thread messageBody:body];
incomingMessageBuilder.timestamp = i + 1;