Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Use maps for JSON output.

Browse Source
This commit is contained in:
akwizgran
2018-09-21 18:15:29 +01:00
committed by Torsten Grote
parent cf033dc29d
commit bda52ea548
12 changed files with 157 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-headless/src/test/java/org/briarproject/briar/headless/blogs/BlogControllerTest.kt
View File

@@ -101,7 +101,7 @@ internal class BlogControllerTest : ControllerTest() {
fun testEmptyList() {
every { blogManager.blogs } returns listOf(blog)
every { blogManager.getPostHeaders(group.id) } returns emptyList()
every { ctx.json(emptyList<OutputBlogPost>()) } returns ctx
every { ctx.json(emptyList<Any>()) } returns ctx
controller.listPosts(ctx)
}

2
briar-headless/src/test/java/org/briarproject/briar/headless/contact/ContactControllerTest.kt
View File

@@ -14,7 +14,7 @@ internal class ContactControllerTest : ControllerTest() {
@Test
fun testEmptyContactList() {
every { contactManager.activeContacts } returns emptyList<Contact>()
every { ctx.json(emptyList<OutputContact>()) } returns ctx
every { ctx.json(emptyList<Any>()) } returns ctx
controller.list(ctx)
}

10
briar-headless/src/test/java/org/briarproject/briar/headless/messaging/MessagingControllerImplTest.kt
View File

@@ -55,7 +55,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
every { ctx.pathParam("contactId") } returns contact.id.int.toString()
every { contactManager.getContact(contact.id) } returns contact
every { conversationManager.getMessageHeaders(contact.id) } returns emptyList<PrivateMessageHeader>()
every { ctx.json(emptyList<OutputPrivateMessageHeader>()) } returns ctx
every { ctx.json(emptyList<Any>()) } returns ctx
controller.list(ctx)
}
@@ -73,7 +73,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
@Test
fun write() {
val privateMessage = PrivateMessage(message)
val slot = CapturingSlot<OutputPrivateMessageHeader>()
val slot = CapturingSlot<Map<String, Any>>()
expectGetContact()
every { ctx.formParam("text") } returns body
@@ -92,9 +92,9 @@ internal class MessagingControllerImplTest : ControllerTest() {
controller.write(ctx)
val output = slot.captured
assertEquals(contact.id.int, output.contactId)
assertEquals(body, output.body)
assertEquals(message.id.bytes, output.id)
assertEquals(contact.id.int, output.get("contactId"))
assertEquals(body, output.get("body"))
assertEquals(message.id.bytes, output.get("id"))
}
@Test