diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt index 089acdca..51afa187 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt @@ -12,6 +12,7 @@ import dev.usbharu.hideout.domain.model.job.DeliverPostJob import dev.usbharu.hideout.query.FollowerQueryService import dev.usbharu.hideout.query.MediaQueryService import dev.usbharu.hideout.query.UserQueryService +import dev.usbharu.hideout.service.ap.job.ApNoteJobServiceImpl import dev.usbharu.hideout.service.job.JobQueueParentService import io.ktor.client.* import io.ktor.client.engine.mock.* @@ -24,6 +25,7 @@ import org.mockito.Mockito.anyLong import org.mockito.Mockito.eq import org.mockito.kotlin.* import utils.JsonObjectMapper.objectMapper +import utils.TestTransaction import java.net.URL import java.time.Instant import kotlin.test.assertEquals @@ -134,18 +136,13 @@ class APNoteServiceImplTest { respondOk() } ) - val activityPubNoteService = APNoteServiceImpl( - jobQueueParentService = mock(), - postRepository = mock(), - apUserService = mock(), + val activityPubNoteService = ApNoteJobServiceImpl( + userQueryService = mock(), - followerQueryService = mock(), - postQueryService = mock(), - mediaQueryService = mediaQueryService, objectMapper = objectMapper, - postService = mock(), - apResourceResolveService = mock(), - postBuilder = postBuilder + apRequestService = mock(), + transaction = TestTransaction, + applicationConfig = ApplicationConfig(URL("https://example.com")) ) activityPubNoteService.createNoteJob( JobProps( diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt index d91761a2..f13981e1 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt @@ -13,6 +13,7 @@ import dev.usbharu.hideout.domain.model.hideout.entity.Post 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.ap.job.APReceiveFollowJobServiceImpl import dev.usbharu.hideout.service.job.JobQueueParentService import dev.usbharu.hideout.service.user.UserService import kjob.core.dsl.ScheduleContext @@ -25,6 +26,7 @@ import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers.anyString import org.mockito.kotlin.* import utils.JsonObjectMapper.objectMapper +import utils.TestTransaction import java.net.URL import java.time.Instant @@ -145,9 +147,13 @@ class APReceiveFollowServiceImplTest { onBlocking { followRequest(any(), any()) } doReturn false } val activityPubFollowService = - APReceiveFollowServiceImpl( + APReceiveFollowJobServiceImpl( + apUserService, + userQueryService, mock(), - objectMapper + userService, + objectMapper, + TestTransaction ) activityPubFollowService.receiveFollowJob( JobProps(