@@ -35,28 +35,28 @@ class SatoriServerTest() {
35
35
user = object : UserApiHandler {},
36
36
)
37
37
private val resourceHandler = object : ResourceHandler {
38
- override fun getResource (id : String ): Pair < ByteArray , String > {
39
- return Pair (ByteArray (0 ), " " )
38
+ override fun getResource (id : String ): ResourceHandler . Resource {
39
+ return ResourceHandler . Resource (ByteArray (0 ), " " )
40
40
}
41
41
}
42
42
43
43
private val satoriServer = SatoriServer (satoriConfig, handlerConfig, resourceHandler)
44
- val client = HttpClient ()
44
+ private val client = HttpClient ()
45
45
46
46
@Test
47
47
fun testRoot () {
48
48
satoriServer.start()
49
- val result = runBlocking { client.get(satoriServer.baseLink ) }
49
+ val result = runBlocking { client.get(satoriConfig.link ) }
50
50
assertEquals(result.status, HttpStatusCode .OK )
51
- satoriServer.stop ()
51
+ satoriServer.stopBlocking ()
52
52
}
53
53
54
54
@Test
55
55
fun testChannelGet () {
56
56
satoriServer.start()
57
57
58
58
val result = runBlocking {
59
- client.post(satoriServer.baseLink + satoriServer.baseUri + " /channel.get" ) {
59
+ client.post(satoriConfig.link + satoriConfig.path + " /channel.get" ) {
60
60
contentType(ContentType .Application .Json )
61
61
header(HttpHeaders .Authorization , " Bearer 114514" )
62
62
setBody(Json .encodeToString(serializer(), ChannelGet (" 114514" )))
@@ -65,6 +65,6 @@ class SatoriServerTest() {
65
65
val body = runBlocking { result.bodyAsText() }
66
66
assertEquals(result.status, HttpStatusCode .OK )
67
67
assertEquals(Json .decodeFromString<Channel >(body), Channel (" 114514" , ChannelType .TEXT , " 114514" ))
68
- satoriServer.stop ()
68
+ satoriServer.stopBlocking ()
69
69
}
70
70
}
0 commit comments