Skip to content

Commit

Permalink
update all the tests to compile
Browse files Browse the repository at this point in the history
  • Loading branch information
@nplasterer
nplasterer committed Nov 3, 2024
1 parent 2055f48 commit 7baa420
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 1,383 deletions.
6 changes: 3 additions & 3 deletions library/src/androidTest/java/org/xmtp/android/library/DmTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class DmTest {

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAllConversationMessages().collect { message ->
alixClient.conversations.streamAllMessages().collect { message ->
allMessages.add(message)
}
} catch (e: Exception) {
Expand Down Expand Up @@ -299,7 +299,7 @@ class DmTest {

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAllConversationDecryptedMessages().collect { message ->
alixClient.conversations.streamAllDecryptedMessages().collect { message ->
allMessages.add(message)
}
} catch (e: Exception) {
Expand Down Expand Up @@ -329,7 +329,7 @@ class DmTest {

@Test
fun testCanStreamConversations() = kotlinx.coroutines.test.runTest {
boClient.conversations.streamConversations().test {
boClient.conversations.stream().test {
val dm =
alixClient.conversations.findOrCreateDm(bo.walletAddress)
assertEquals(dm.id, awaitItem().id)
Expand Down
20 changes: 10 additions & 10 deletions library/src/androidTest/java/org/xmtp/android/library/GroupPermissionsTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class GroupPermissionsTest {
@Test
fun testGroupCreatedWithCorrectAdminList() {
val boGroup = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress)) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

assert(!boGroup.isAdmin(boClient.inboxId))
Expand All @@ -83,7 +83,7 @@ class GroupPermissionsTest {
@Test
fun testGroupCanUpdateAdminList() {
val boGroup = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress, caro.walletAddress), GroupPermissionPreconfiguration.ADMIN_ONLY) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

assert(!boGroup.isAdmin(boClient.inboxId))
Expand Down Expand Up @@ -177,7 +177,7 @@ class GroupPermissionsTest {
@Test
fun testGroupCanUpdateSuperAdminList() {
val boGroup = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress, caro.walletAddress), GroupPermissionPreconfiguration.ADMIN_ONLY) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

assert(boGroup.isSuperAdmin(boClient.inboxId))
Expand Down Expand Up @@ -218,7 +218,7 @@ class GroupPermissionsTest {
@Test
fun testGroupMembersAndPermissionLevel() {
val group = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress, caro.walletAddress), GroupPermissionPreconfiguration.ADMIN_ONLY) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

// Initial checks for group members and their permissions
Expand Down Expand Up @@ -267,7 +267,7 @@ class GroupPermissionsTest {
@Test
fun testCanCommitAfterInvalidPermissionsCommit() {
val boGroup = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress, caro.walletAddress), GroupPermissionPreconfiguration.ALL_MEMBERS) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

// Verify that alix can NOT add an admin
Expand Down Expand Up @@ -298,7 +298,7 @@ class GroupPermissionsTest {
@Test
fun testCanUpdatePermissions() {
val boGroup = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress, caro.walletAddress), GroupPermissionPreconfiguration.ADMIN_ONLY) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

// Verify that alix can NOT update group name
Expand Down Expand Up @@ -336,7 +336,7 @@ class GroupPermissionsTest {
@Test
fun testCanUpdatePinnedFrameUrl() {
val boGroup = runBlocking { boClient.conversations.newGroup(listOf(alix.walletAddress, caro.walletAddress), GroupPermissionPreconfiguration.ADMIN_ONLY) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

// Verify that alix can NOT update pinned frame
Expand Down Expand Up @@ -389,7 +389,7 @@ class GroupPermissionsTest {
permissionPolicySet = permissionPolicySet,
)
}
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }

// Verify permission look correct
Expand Down Expand Up @@ -439,7 +439,7 @@ class GroupPermissionsTest {
)

// Valid custom policy works as expected
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
assert(runBlocking { alixClient.conversations.listGroups() }.isEmpty())

val boGroup = runBlocking {
Expand All @@ -448,7 +448,7 @@ class GroupPermissionsTest {
permissionPolicySet = permissionPolicySetValid,
)
}
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
assert(runBlocking { alixClient.conversations.listGroups() }.size == 1)
}
}
66 changes: 29 additions & 37 deletions library/src/androidTest/java/org/xmtp/android/library/GroupTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class GroupTest {
boClient.conversations.newGroup(listOf(alix.walletAddress))
}
runBlocking {
alixClient.conversations.syncGroups()
alixClient.conversations.syncConversations()
boGroup.sync()
}
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }
Expand Down Expand Up @@ -125,7 +125,7 @@ class GroupTest {
permissions = GroupPermissionPreconfiguration.ADMIN_ONLY
)
}
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }
assert(boGroup.id.isNotEmpty())
assert(alixGroup.id.isNotEmpty())
Expand Down Expand Up @@ -199,14 +199,6 @@ class GroupTest {
).sorted()
)

assertEquals(
Conversation.Group(group).peerAddresses.sorted(),
listOf(
caroClient.inboxId,
alixClient.inboxId,
).sorted()
)

assertEquals(
runBlocking { group.peerInboxIds().sorted() },
listOf(
Expand All @@ -231,7 +223,7 @@ class GroupTest {
boGroup.updateGroupName("This Is A Great Group")
boGroup.updateGroupImageUrlSquare("thisisanewurl.com")
boGroup.sync()
alixClient.conversations.syncGroups()
alixClient.conversations.syncConversations()
}
val alixGroup = runBlocking { alixClient.conversations.listGroups().first() }
runBlocking { alixGroup.sync() }
Expand Down Expand Up @@ -287,10 +279,10 @@ class GroupTest {
}
runBlocking {
boGroup.addAdmin(alixClient.inboxId)
alixClient.conversations.syncGroups()
alixClient.conversations.syncConversations()
}
val group = runBlocking {
alixClient.conversations.syncGroups()
alixClient.conversations.syncConversations()
alixClient.conversations.listGroups().first()
}
runBlocking {
Expand Down Expand Up @@ -363,7 +355,7 @@ class GroupTest {
)
)
}
runBlocking { caroClient.conversations.syncGroups() }
runBlocking { caroClient.conversations.syncConversations() }
val caroGroup = runBlocking { caroClient.conversations.listGroups().first() }
runBlocking { caroGroup.sync() }
assert(caroGroup.isActive())
Expand All @@ -385,7 +377,7 @@ class GroupTest {
)
)
}
runBlocking { boClient.conversations.syncGroups() }
runBlocking { boClient.conversations.syncConversations() }
val boGroup = runBlocking { boClient.conversations.listGroups().first() }
assertEquals(boGroup.addedByInboxId(), alixClient.inboxId)
}
Expand All @@ -411,7 +403,7 @@ class GroupTest {
davonV3Client.conversations.findOrCreateDm(bo.walletAddress)
boClient.conversations.syncConversations()
}
val convos = runBlocking { boClient.conversations.list(includeGroups = true) }
val convos = runBlocking { boClient.conversations.list() }
assertEquals(convos.size, 3)
}

Expand Down Expand Up @@ -459,7 +451,7 @@ class GroupTest {

val job = CoroutineScope(Dispatchers.IO).launch {
try {
boClient.conversations.streamAllGroupMessages().collect { message ->
boClient.conversations.streamAllMessages().collect { message ->
messageCallbacks++
}
} catch (e: Exception) {
Expand All @@ -472,7 +464,7 @@ class GroupTest {
runBlocking {
alixGroup.send("hello1")
alixGroup.updateGroupName("hello")
boClient.conversations.syncGroups()
boClient.conversations.syncConversations()
}

val boGroups = runBlocking { boClient.conversations.listGroups() }
Expand Down Expand Up @@ -517,7 +509,7 @@ class GroupTest {
assertEquals(group.messages().first().deliveryStatus, MessageDeliveryStatus.PUBLISHED)
assertEquals(group.messages().size, 3)

runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val sameGroup = runBlocking { alixClient.conversations.listGroups().last() }
runBlocking { sameGroup.sync() }
assertEquals(sameGroup.messages().size, 2)
Expand All @@ -539,7 +531,7 @@ class GroupTest {
assertEquals(group.messages(deliveryStatus = MessageDeliveryStatus.UNPUBLISHED).size, 0)
assertEquals(group.messages(deliveryStatus = MessageDeliveryStatus.PUBLISHED).size, 3)

runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val sameGroup = runBlocking { alixClient.conversations.listGroups().last() }
runBlocking { sameGroup.sync() }
assertEquals(sameGroup.messages(deliveryStatus = MessageDeliveryStatus.PUBLISHED).size, 2)
Expand Down Expand Up @@ -584,7 +576,7 @@ class GroupTest {
val membershipChange = TranscriptMessages.GroupUpdated.newBuilder().build()

val group = boClient.conversations.newGroup(listOf(alix.walletAddress.lowercase()))
alixClient.conversations.syncGroups()
alixClient.conversations.syncConversations()
val alixGroup = alixClient.conversations.listGroups().first()
group.streamMessages().test {
alixGroup.send("hi")
Expand All @@ -602,13 +594,13 @@ class GroupTest {
fun testCanStreamAllGroupMessages() {
val group = runBlocking { caroClient.conversations.newGroup(listOf(alix.walletAddress)) }
val dm = runBlocking { davonV3Client.conversations.findOrCreateDm(alix.walletAddress) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }

val allMessages = mutableListOf<DecodedMessage>()

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAllGroupMessages().collect { message ->
alixClient.conversations.streamAllMessages().collect { message ->
allMessages.add(message)
}
} catch (e: Exception) {
Expand Down Expand Up @@ -651,7 +643,7 @@ class GroupTest {

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAllMessages(includeGroups = true)
alixClient.conversations.streamAllMessages()
.collect { message ->
allMessages.add(message)
}
Expand All @@ -676,7 +668,7 @@ class GroupTest {
@Test
fun testCanStreamDecryptedGroupMessages() = kotlinx.coroutines.test.runTest {
val group = boClient.conversations.newGroup(listOf(alix.walletAddress))
alixClient.conversations.syncGroups()
alixClient.conversations.syncConversations()
val alixGroup = alixClient.conversations.listGroups().first()
group.streamDecryptedMessages().test {
alixGroup.send("hi")
Expand All @@ -696,7 +688,7 @@ class GroupTest {

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAllGroupDecryptedMessages().collect { message ->
alixClient.conversations.streamAllDecryptedMessages().collect { message ->
allMessages.add(message)
}
} catch (e: Exception) {
Expand Down Expand Up @@ -731,13 +723,13 @@ class GroupTest {
val dm = runBlocking { davonV3Client.conversations.findOrCreateDm(alix.walletAddress) }
val conversation =
runBlocking { boClient.conversations.newConversation(alix.walletAddress) }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }

val allMessages = mutableListOf<DecryptedMessage>()

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAllDecryptedMessages(includeGroups = true)
alixClient.conversations.streamAllDecryptedMessages()
.collect { message ->
allMessages.add(message)
}
Expand All @@ -761,7 +753,7 @@ class GroupTest {

@Test
fun testCanStreamGroups() = kotlinx.coroutines.test.runTest {
boClient.conversations.streamGroups().test {
boClient.conversations.stream().test {
val group =
alixClient.conversations.newGroup(listOf(bo.walletAddress))
assertEquals(group.id, awaitItem().id)
Expand All @@ -780,7 +772,7 @@ class GroupTest {

val job = CoroutineScope(Dispatchers.IO).launch {
try {
alixClient.conversations.streamAll()
alixClient.conversations.stream()
.collect { message ->
allMessages.add(message.topic)
}
Expand Down Expand Up @@ -867,7 +859,7 @@ class GroupTest {
)
)
}
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = alixClient.findGroup(boGroup.id)

assertEquals(alixGroup?.id, boGroup.id)
Expand All @@ -884,7 +876,7 @@ class GroupTest {
)
}
val boMessageId = runBlocking { boGroup.send("Hello") }
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup = alixClient.findGroup(boGroup.id)
runBlocking { alixGroup?.sync() }
val alixMessage = alixClient.findMessage(boMessageId)
Expand All @@ -902,7 +894,7 @@ class GroupTest {
)
)
}
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup: Group = alixClient.findGroup(boGroup.id)!!
runBlocking { assert(!alixClient.contacts.isGroupAllowed(boGroup.id)) }
val preparedMessageId = runBlocking { alixGroup.prepareMessage("Test text") }
Expand Down Expand Up @@ -941,7 +933,7 @@ class GroupTest {
)
)
}
runBlocking { alixClient.conversations.syncGroups() }
runBlocking { alixClient.conversations.syncConversations() }
val alixGroup: Group = alixClient.findGroup(boGroup.id)!!
val alixGroup2: Group = alixClient.findGroup(boGroup2.id)!!
var numGroups: UInt?
Expand All @@ -952,7 +944,7 @@ class GroupTest {
runBlocking {
boGroup.send("hi")
boGroup2.send("hi")
numGroups = alixClient.conversations.syncAllGroups()
numGroups = alixClient.conversations.syncAllConversations()
}

assertEquals(alixGroup.messages().size, 1)
Expand All @@ -965,7 +957,7 @@ class GroupTest {
boGroup.send("hi")
boGroup2.send("hi")
boGroup2.send("hi")
numGroups = alixClient.conversations.syncAllGroups()
numGroups = alixClient.conversations.syncAllConversations()
}

assertEquals(alixGroup.messages().size, 3)
Expand All @@ -974,7 +966,7 @@ class GroupTest {
assertEquals(numGroups, 2u)

runBlocking {
numGroups = alixClient.conversations.syncAllGroups()
numGroups = alixClient.conversations.syncAllConversations()
}
// Next syncAllGroups will not include the inactive group
assertEquals(numGroups, 1u)
Expand Down
Loading

0 comments on commit 7baa420

Please sign in to comment.