style: スタイルを修正

This commit is contained in:
2023-10-14 23:34:57 +09:00
parent 25ad32918b
commit ae376d55d0
16 changed files with 60 additions and 94 deletions
@@ -3,17 +3,17 @@
package dev.usbharu.hideout.service.ap
import com.fasterxml.jackson.module.kotlin.readValue
import dev.usbharu.hideout.config.Config
import dev.usbharu.hideout.config.ConfigData
import dev.usbharu.hideout.domain.model.ap.*
import dev.usbharu.hideout.domain.model.ap.Follow
import dev.usbharu.hideout.domain.model.ap.Image
import dev.usbharu.hideout.domain.model.ap.Key
import dev.usbharu.hideout.domain.model.ap.Person
import dev.usbharu.hideout.domain.model.hideout.entity.User
import dev.usbharu.hideout.domain.model.job.ReceiveFollowJob
import dev.usbharu.hideout.query.UserQueryService
import dev.usbharu.hideout.service.job.JobQueueParentService
import dev.usbharu.hideout.service.user.UserService
import io.ktor.client.*
import io.ktor.client.engine.mock.*
import kjob.core.dsl.ScheduleContext
import kjob.core.job.JobProps
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -40,7 +40,6 @@ class APReceiveFollowServiceImplTest {
mock(),
mock(),
mock(),
mock(),
TestTransaction,
objectMapper,
mock()
@@ -146,32 +145,6 @@ class APReceiveFollowServiceImplTest {
mock(),
apUserService,
userService,
HttpClient(
MockEngine { httpRequestData ->
assertEquals(person.inbox, httpRequestData.url.toString())
val accept = Accept(
type = emptyList(),
name = "Follow",
`object` = Follow(
type = emptyList(),
name = "Follow",
`object` = "https://example.com",
actor = "https://follower.example.com"
),
actor = "https://example.com"
)
accept.context += "https://www.w3.org/ns/activitystreams"
val content = httpRequestData.body.toByteArray().decodeToString()
println(content)
assertEquals(
accept,
Config.configData.objectMapper.readValue<Accept>(
content
)
)
respondOk()
}
),
userQueryService,
TestTransaction,
objectMapper,
@@ -16,7 +16,6 @@ import org.mockito.kotlin.any
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.whenever
import utils.JsonObjectMapper.objectMapper
import java.time.Instant
import kotlin.test.assertEquals
@@ -53,7 +52,7 @@ class APResourceResolveServiceImplTest {
)
val apResourceResolveService =
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager(), objectMapper)
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager())
apResourceResolveService.resolve<Object>("https", 0)
@@ -88,7 +87,7 @@ class APResourceResolveServiceImplTest {
)
val apResourceResolveService =
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager(), objectMapper)
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager())
apResourceResolveService.resolve<Object>("https", 0)
apResourceResolveService.resolve<Object>("https", 0)
@@ -126,7 +125,7 @@ class APResourceResolveServiceImplTest {
)
val apResourceResolveService =
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager(), objectMapper)
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager())
repeat(10) {
awaitAll(
@@ -175,7 +174,7 @@ class APResourceResolveServiceImplTest {
)
val apResourceResolveService =
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager(), objectMapper)
APResourceResolveServiceImpl(mock(), userRepository, InMemoryCacheManager())
apResourceResolveService.resolve<Object>("abcd", 0)
apResourceResolveService.resolve<Object>("1234", 0)