briar-headless: Inject a singleton ObjectMapper for JSON parsing

This commit is contained in:
Torsten Grote
2018-10-18 09:55:08 -03:00
parent 89d5145665
commit 8cf54bcedb
9 changed files with 23 additions and 9 deletions

View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.headless
import com.fasterxml.jackson.databind.ObjectMapper
import io.javalin.Context
import io.javalin.core.util.ContextUtil
import io.mockk.mockk
@@ -30,6 +31,8 @@ abstract class ControllerTest {
private val response = mockk<HttpServletResponse>(relaxed = true)
private val outputCtx = ContextUtil.init(request, response)
protected val objectMapper = ObjectMapper()
protected val group: Group = getGroup(getClientId(), 0)
protected val author: Author = getAuthor()
protected val localAuthor: LocalAuthor = getLocalAuthor()

View File

@@ -23,7 +23,7 @@ internal class BlogControllerTest : ControllerTest() {
private val blogPostFactory = mockk<BlogPostFactory>()
private val controller =
BlogControllerImpl(blogManager, blogPostFactory, identityManager, clock)
BlogControllerImpl(blogManager, blogPostFactory, identityManager, objectMapper, clock)
private val blog = Blog(group, author, false)
private val parentId: MessageId? = null

View File

@@ -16,7 +16,7 @@ internal class ForumControllerTest : ControllerTest() {
private val forumManager = mockk<ForumManager>()
private val controller = ForumControllerImpl(forumManager)
private val controller = ForumControllerImpl(forumManager, objectMapper)
private val forum = Forum(group, getRandomString(5), getRandomBytes(5))

View File

@@ -38,6 +38,7 @@ internal class MessagingControllerImplTest : ControllerTest() {
contactManager,
webSocketController,
dbExecutor,
objectMapper,
clock
)