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

[headless] upgrade to Javalin 3.5

Browse Source
This commit is contained in:
Torsten Grote
2019-10-07 10:56:42 -03:00
parent 52feabecbe
commit 6f153f14c7
20 changed files with 135 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-headless/src/test/java/org/briarproject/briar/headless/ControllerTest.kt
View File

@@ -1,8 +1,8 @@
package org.briarproject.briar.headless
import com.fasterxml.jackson.databind.ObjectMapper
import io.javalin.Context
import io.javalin.core.util.ContextUtil
import io.javalin.http.Context
import io.javalin.http.util.ContextUtil
import io.mockk.mockk
import org.briarproject.bramble.api.contact.Contact
import org.briarproject.bramble.api.contact.ContactManager

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

@@ -1,7 +1,7 @@
package org.briarproject.briar.headless.blogs
import io.javalin.BadRequestResponse
import io.javalin.json.JavalinJson.toJson
import io.javalin.http.BadRequestResponse
import io.javalin.plugin.json.JavalinJson.toJson
import io.mockk.Runs
import io.mockk.every
import io.mockk.just

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

@@ -1,8 +1,8 @@
package org.briarproject.briar.headless.contact
import io.javalin.BadRequestResponse
import io.javalin.NotFoundResponse
import io.javalin.json.JavalinJson.toJson
import io.javalin.http.BadRequestResponse
import io.javalin.http.NotFoundResponse
import io.javalin.plugin.json.JavalinJson.toJson
import io.mockk.Runs
import io.mockk.every
import io.mockk.just

20
briar-headless/src/test/java/org/briarproject/briar/headless/event/WebSocketControllerTest.kt
View File

@@ -1,8 +1,11 @@
package org.briarproject.briar.headless.event
import io.javalin.json.JavalinJson.toJson
import io.javalin.websocket.WsSession
import io.mockk.*
import io.javalin.plugin.json.JavalinJson.toJson
import io.javalin.websocket.WsContext
import io.mockk.CapturingSlot
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import org.briarproject.bramble.api.identity.AuthorInfo
import org.briarproject.bramble.api.identity.AuthorInfo.Status.VERIFIED
import org.briarproject.bramble.test.ImmediateExecutor
@@ -16,14 +19,15 @@ import org.briarproject.briar.headless.ControllerTest
import org.briarproject.briar.headless.messaging.EVENT_CONVERSATION_MESSAGE
import org.briarproject.briar.headless.messaging.output
import org.eclipse.jetty.websocket.api.WebSocketException
import org.eclipse.jetty.websocket.common.io.FutureWriteCallback
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import java.io.IOException
internal class WebSocketControllerTest : ControllerTest() {
private val session1 = mockk<WsSession>()
private val session2 = mockk<WsSession>()
private val session1 = mockk<WsContext>()
private val session2 = mockk<WsContext>()
private val controller = WebSocketControllerImpl(ImmediateExecutor())
@@ -46,7 +50,7 @@ internal class WebSocketControllerTest : ControllerTest() {
fun testSendEvent() {
val slot = CapturingSlot<String>()
every { session1.send(capture(slot)) } just Runs
every { session1.send(capture(slot)) } returns FutureWriteCallback()
controller.sessions.add(session1)
controller.sendEvent(EVENT_CONVERSATION_MESSAGE, event.output(text))
@@ -68,7 +72,7 @@ internal class WebSocketControllerTest : ControllerTest() {
val slot = CapturingSlot<String>()
every { session1.send(capture(slot)) } throws throwable
every { session2.send(capture(slot)) } just Runs
every { session2.send(capture(slot)) } returns FutureWriteCallback()
controller.sessions.add(session1)
controller.sessions.add(session2)
@@ -99,7 +103,7 @@ internal class WebSocketControllerTest : ControllerTest() {
OutputEvent(EVENT_CONVERSATION_MESSAGE, introductionRequestEvent.output())
val slot = CapturingSlot<String>()
every { session1.send(capture(slot)) } just Runs
every { session1.send(capture(slot)) } returns FutureWriteCallback()
controller.sessions.add(session1)
controller.sendEvent(EVENT_CONVERSATION_MESSAGE, introductionRequestEvent.output())

2
briar-headless/src/test/java/org/briarproject/briar/headless/forums/ForumControllerTest.kt
View File

@@ -1,6 +1,6 @@
package org.briarproject.briar.headless.forums
import io.javalin.BadRequestResponse
import io.javalin.http.BadRequestResponse
import io.mockk.every
import io.mockk.mockk
import org.briarproject.bramble.test.TestUtils.getRandomBytes

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

@@ -1,9 +1,9 @@
package org.briarproject.briar.headless.messaging
import io.javalin.BadRequestResponse
import io.javalin.Context
import io.javalin.NotFoundResponse
import io.javalin.json.JavalinJson.toJson
import io.javalin.http.BadRequestResponse
import io.javalin.http.Context
import io.javalin.http.NotFoundResponse
import io.javalin.plugin.json.JavalinJson.toJson
import io.mockk.*
import org.briarproject.bramble.api.contact.ContactId
import org.briarproject.bramble.api.db.NoSuchContactException