diff --git a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt index a67dc361..504bbdba 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubUserServiceImpl.kt @@ -111,6 +111,5 @@ class ActivityPubUserServiceImpl( ) person } - } } diff --git a/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt b/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt index f0d77035..e7106465 100644 --- a/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/plugins/ActivityPubKtTest.kt @@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test import org.mockito.kotlin.any import org.mockito.kotlin.doAnswer import org.mockito.kotlin.mock +import utils.TestTransaction import java.security.KeyPairGenerator import java.time.Instant @@ -40,7 +41,7 @@ class ActivityPubKtTest { } } runBlocking { - val ktorKeyMap = KtorKeyMap(userQueryService) + val ktorKeyMap = KtorKeyMap(userQueryService, TestTransaction) val httpClient = HttpClient( MockEngine { httpRequestData -> diff --git a/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt b/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt index d736b04d..c7326013 100644 --- a/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/plugins/KtorKeyMapTest.kt @@ -7,6 +7,7 @@ import org.junit.jupiter.api.Test import org.mockito.kotlin.any import org.mockito.kotlin.doAnswer import org.mockito.kotlin.mock +import utils.TestTransaction import java.security.KeyPairGenerator import java.time.Instant @@ -35,7 +36,7 @@ class KtorKeyMapTest { ) } } - val ktorKeyMap = KtorKeyMap(userQueryService) + val ktorKeyMap = KtorKeyMap(userQueryService, TestTransaction) ktorKeyMap.getPrivateKey("test") } diff --git a/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubReceiveFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubReceiveFollowServiceImplTest.kt index 34b96781..66f7b338 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubReceiveFollowServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/activitypub/ActivityPubReceiveFollowServiceImplTest.kt @@ -24,6 +24,7 @@ import org.junit.jupiter.api.Test import org.mockito.ArgumentMatchers.anyString import org.mockito.kotlin.* import utils.JsonObjectMapper +import utils.TestTransaction import java.time.Instant class ActivityPubReceiveFollowServiceImplTest { @@ -33,7 +34,7 @@ class ActivityPubReceiveFollowServiceImplTest { onBlocking { schedule(eq(ReceiveFollowJob), any()) } doReturn Unit } val activityPubFollowService = - ActivityPubReceiveFollowServiceImpl(jobQueueParentService, mock(), mock(), mock(), mock()) + ActivityPubReceiveFollowServiceImpl(jobQueueParentService, mock(), mock(), mock(), mock(), TestTransaction) activityPubFollowService.receiveFollow( Follow( emptyList(), @@ -161,7 +162,8 @@ class ActivityPubReceiveFollowServiceImplTest { respondOk() } ), - userQueryService + userQueryService, + TestTransaction ) activityPubFollowService.receiveFollowJob( JobProps(