usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

test: テストをPagination APIに対応

This commit is contained in:
usbharu 2024-01-29 20:55:28 +09:00
parent 370869af62
commit 942d5d71e3
3 changed files with 177 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/account/MastodonAccountApiControllerTest.kt
View File

@ -1,6 +1,7 @@
package dev.usbharu.hideout.mastodon.interfaces.api.account package dev.usbharu.hideout.mastodon.interfaces.api.account
import dev.usbharu.hideout.application.config.ActivityPubConfig import dev.usbharu.hideout.application.config.ActivityPubConfig
import dev.usbharu.hideout.application.config.ApplicationConfig
import dev.usbharu.hideout.core.infrastructure.springframework.security.OAuth2JwtLoginUserContextHolder import dev.usbharu.hideout.core.infrastructure.springframework.security.OAuth2JwtLoginUserContextHolder
import dev.usbharu.hideout.domain.mastodon.model.generated.AccountSource import dev.usbharu.hideout.domain.mastodon.model.generated.AccountSource
import dev.usbharu.hideout.domain.mastodon.model.generated.CredentialAccount import dev.usbharu.hideout.domain.mastodon.model.generated.CredentialAccount
@ -26,6 +27,7 @@ import org.springframework.test.web.servlet.get
import org.springframework.test.web.servlet.post import org.springframework.test.web.servlet.post
import org.springframework.test.web.servlet.setup.MockMvcBuilders import org.springframework.test.web.servlet.setup.MockMvcBuilders
import utils.TestTransaction import utils.TestTransaction
import java.net.URL
@ExtendWith(MockitoExtension::class) @ExtendWith(MockitoExtension::class)
class MastodonAccountApiControllerTest { class MastodonAccountApiControllerTest {
@ -41,6 +43,9 @@ class MastodonAccountApiControllerTest {
@Mock @Mock
private lateinit var accountApiService: AccountApiService private lateinit var accountApiService: AccountApiService
@Spy
private val applicationConfig: ApplicationConfig = ApplicationConfig(URL("https://example.com"))
@InjectMocks @InjectMocks
private lateinit var mastodonAccountApiController: MastodonAccountApiController private lateinit var mastodonAccountApiController: MastodonAccountApiController

218
src/test/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/timeline/MastodonTimelineApiControllerTest.kt
View File

@ -1,6 +1,8 @@
package dev.usbharu.hideout.mastodon.interfaces.api.timeline package dev.usbharu.hideout.mastodon.interfaces.api.timeline
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import dev.usbharu.hideout.application.config.ApplicationConfig
import dev.usbharu.hideout.application.infrastructure.exposed.PaginationList
import dev.usbharu.hideout.core.infrastructure.springframework.security.OAuth2JwtLoginUserContextHolder import dev.usbharu.hideout.core.infrastructure.springframework.security.OAuth2JwtLoginUserContextHolder
import dev.usbharu.hideout.domain.mastodon.model.generated.Account import dev.usbharu.hideout.domain.mastodon.model.generated.Account
import dev.usbharu.hideout.domain.mastodon.model.generated.Status import dev.usbharu.hideout.domain.mastodon.model.generated.Status
@ -21,6 +23,7 @@ import org.springframework.test.web.servlet.MockMvc
import org.springframework.test.web.servlet.get import org.springframework.test.web.servlet.get
import org.springframework.test.web.servlet.post import org.springframework.test.web.servlet.post
import org.springframework.test.web.servlet.setup.MockMvcBuilders import org.springframework.test.web.servlet.setup.MockMvcBuilders
import java.net.URL
@ExtendWith(MockitoExtension::class) @ExtendWith(MockitoExtension::class)
class MastodonTimelineApiControllerTest { class MastodonTimelineApiControllerTest {
@ -31,6 +34,9 @@ class MastodonTimelineApiControllerTest {
@Mock @Mock
private lateinit var timelineApiService: TimelineApiService private lateinit var timelineApiService: TimelineApiService
@Spy
private val applicationConfig: ApplicationConfig = ApplicationConfig(URL("https://example.com"))
@InjectMocks @InjectMocks
private lateinit var mastodonTimelineApiController: MastodonTimelineApiController private lateinit var mastodonTimelineApiController: MastodonTimelineApiController
@ -41,107 +47,109 @@ class MastodonTimelineApiControllerTest {
mockMvc = MockMvcBuilders.standaloneSetup(mastodonTimelineApiController).build() mockMvc = MockMvcBuilders.standaloneSetup(mastodonTimelineApiController).build()
} }
val statusList = listOf<Status>( val statusList = PaginationList<Status, Long>(
Status( listOf<Status>(
id = "", Status(
uri = "",
createdAt = "",
account = Account(
id = "", id = "",
username = "", uri = "",
acct = "",
url = "",
displayName = "",
note = "",
avatar = "",
avatarStatic = "",
header = "",
headerStatic = "",
locked = false,
fields = emptyList(),
emojis = emptyList(),
bot = false,
group = false,
discoverable = true,
createdAt = "", createdAt = "",
lastStatusAt = "", account = Account(
statusesCount = 0, id = "",
followersCount = 0, username = "",
noindex = false, acct = "",
moved = false, url = "",
suspendex = false, displayName = "",
limited = false, note = "",
followingCount = 0 avatar = "",
), avatarStatic = "",
content = "", header = "",
visibility = Status.Visibility.public, headerStatic = "",
sensitive = false, locked = false,
spoilerText = "", fields = emptyList(),
mediaAttachments = emptyList(), emojis = emptyList(),
mentions = emptyList(), bot = false,
tags = emptyList(), group = false,
emojis = emptyList(), discoverable = true,
reblogsCount = 0, createdAt = "",
favouritesCount = 0, lastStatusAt = "",
repliesCount = 0, statusesCount = 0,
url = "https://example.com", followersCount = 0,
inReplyToId = null, noindex = false,
inReplyToAccountId = null, moved = false,
language = "ja_JP", suspendex = false,
text = "Test", limited = false,
editedAt = null followingCount = 0
),
content = "",
visibility = Status.Visibility.public,
sensitive = false,
spoilerText = "",
mediaAttachments = emptyList(),
mentions = emptyList(),
tags = emptyList(),
emojis = emptyList(),
reblogsCount = 0,
favouritesCount = 0,
repliesCount = 0,
url = "https://example.com",
inReplyToId = null,
inReplyToAccountId = null,
language = "ja_JP",
text = "Test",
editedAt = null
), ),
Status( Status(
id = "",
uri = "",
createdAt = "",
account = Account(
id = "", id = "",
username = "", uri = "",
acct = "",
url = "",
displayName = "",
note = "",
avatar = "",
avatarStatic = "",
header = "",
headerStatic = "",
locked = false,
fields = emptyList(),
emojis = emptyList(),
bot = false,
group = false,
discoverable = true,
createdAt = "", createdAt = "",
lastStatusAt = "", account = Account(
statusesCount = 0, id = "",
followersCount = 0, username = "",
noindex = false, acct = "",
moved = false, url = "",
suspendex = false, displayName = "",
limited = false, note = "",
followingCount = 0 avatar = "",
), avatarStatic = "",
content = "", header = "",
visibility = Status.Visibility.public, headerStatic = "",
sensitive = false, locked = false,
spoilerText = "", fields = emptyList(),
mediaAttachments = emptyList(), emojis = emptyList(),
mentions = emptyList(), bot = false,
tags = emptyList(), group = false,
emojis = emptyList(), discoverable = true,
reblogsCount = 0, createdAt = "",
favouritesCount = 0, lastStatusAt = "",
repliesCount = 0, statusesCount = 0,
url = "https://example.com", followersCount = 0,
inReplyToId = null, noindex = false,
inReplyToAccountId = null, moved = false,
language = "ja_JP", suspendex = false,
text = "Test", limited = false,
editedAt = null followingCount = 0
),
content = "",
visibility = Status.Visibility.public,
sensitive = false,
spoilerText = "",
mediaAttachments = emptyList(),
mentions = emptyList(),
tags = emptyList(),
emojis = emptyList(),
reblogsCount = 0,
favouritesCount = 0,
repliesCount = 0,
url = "https://example.com",
inReplyToId = null,
inReplyToAccountId = null,
language = "ja_JP",
text = "Test",
editedAt = null
) )
), null, null
) )
@Test @Test
@ -156,10 +164,7 @@ class MastodonTimelineApiControllerTest {
whenever( whenever(
timelineApiService.homeTimeline( timelineApiService.homeTimeline(
eq(1234), eq(1234),
eq(123456), any()
eq(54321),
eq(1234567),
eq(20)
) )
).doReturn(statusList) ).doReturn(statusList)
@ -183,10 +188,7 @@ class MastodonTimelineApiControllerTest {
whenever( whenever(
timelineApiService.homeTimeline( timelineApiService.homeTimeline(
eq(1234), eq(1234),
isNull(), any()
isNull(),
isNull(),
eq(20)
) )
).doReturn(statusList) ).doReturn(statusList)
@ -213,10 +215,7 @@ class MastodonTimelineApiControllerTest {
localOnly = eq(false), localOnly = eq(false),
remoteOnly = eq(true), remoteOnly = eq(true),
mediaOnly = eq(false), mediaOnly = eq(false),
maxId = eq(1234), any()
minId = eq(4321),
sinceId = eq(12345),
limit = eq(20)
) )
).doAnswer { ).doAnswer {
println(it.arguments.joinToString()) println(it.arguments.joinToString())
@ -245,10 +244,7 @@ class MastodonTimelineApiControllerTest {
localOnly = eq(false), localOnly = eq(false),
remoteOnly = eq(false), remoteOnly = eq(false),
mediaOnly = eq(false), mediaOnly = eq(false),
maxId = isNull(), any()
minId = isNull(),
sinceId = isNull(),
limit = eq(20)
) )
).doAnswer { ).doAnswer {
println(it.arguments.joinToString()) println(it.arguments.joinToString())

144
src/test/kotlin/dev/usbharu/hideout/mastodon/service/account/AccountApiServiceImplTest.kt
View File

@ -1,6 +1,8 @@
package dev.usbharu.hideout.mastodon.service.account package dev.usbharu.hideout.mastodon.service.account
import dev.usbharu.hideout.application.external.Transaction import dev.usbharu.hideout.application.external.Transaction
import dev.usbharu.hideout.application.infrastructure.exposed.Page
import dev.usbharu.hideout.application.infrastructure.exposed.PaginationList
import dev.usbharu.hideout.core.domain.model.actor.ActorRepository import dev.usbharu.hideout.core.domain.model.actor.ActorRepository
import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository import dev.usbharu.hideout.core.domain.model.relationship.RelationshipRepository
import dev.usbharu.hideout.core.query.FollowerQueryService import dev.usbharu.hideout.core.query.FollowerQueryService
@ -48,63 +50,65 @@ class AccountApiServiceImplTest {
@Mock @Mock
private lateinit var relationshipRepository: RelationshipRepository private lateinit var relationshipRepository: RelationshipRepository
@Mock @Mock
private lateinit var mediaService: MediaService private lateinit var mediaService: MediaService
@InjectMocks @InjectMocks
private lateinit var accountApiServiceImpl: AccountApiServiceImpl private lateinit var accountApiServiceImpl: AccountApiServiceImpl
private val statusList = listOf( private val statusList = PaginationList<Status, Long>(
Status( listOf(
id = "", Status(
uri = "",
createdAt = "",
account = Account(
id = "", id = "",
username = "", uri = "",
acct = "",
url = "",
displayName = "",
note = "",
avatar = "",
avatarStatic = "",
header = "",
headerStatic = "",
locked = false,
fields = emptyList(),
emojis = emptyList(),
bot = false,
group = false,
discoverable = true,
createdAt = "", createdAt = "",
lastStatusAt = "", account = Account(
statusesCount = 0, id = "",
followersCount = 0, username = "",
noindex = false, acct = "",
moved = false, url = "",
suspendex = false, displayName = "",
limited = false, note = "",
followingCount = 0 avatar = "",
), avatarStatic = "",
content = "", header = "",
visibility = Status.Visibility.public, headerStatic = "",
sensitive = false, locked = false,
spoilerText = "", fields = emptyList(),
mediaAttachments = emptyList(), emojis = emptyList(),
mentions = emptyList(), bot = false,
tags = emptyList(), group = false,
emojis = emptyList(), discoverable = true,
reblogsCount = 0, createdAt = "",
favouritesCount = 0, lastStatusAt = "",
repliesCount = 0, statusesCount = 0,
url = "https://example.com", followersCount = 0,
inReplyToId = null, noindex = false,
inReplyToAccountId = null, moved = false,
language = "ja_JP", suspendex = false,
text = "Test", limited = false,
editedAt = null followingCount = 0
) ),
content = "",
visibility = Status.Visibility.public,
sensitive = false,
spoilerText = "",
mediaAttachments = emptyList(),
mentions = emptyList(),
tags = emptyList(),
emojis = emptyList(),
reblogsCount = 0,
favouritesCount = 0,
repliesCount = 0,
url = "https://example.com",
inReplyToId = null,
inReplyToAccountId = null,
language = "ja_JP",
text = "Test",
editedAt = null
)
), null, null
) )
@Test @Test
@ -114,16 +118,13 @@ class AccountApiServiceImplTest {
whenever( whenever(
statusQueryService.accountsStatus( statusQueryService.accountsStatus(
accountId = eq(userId), accountId = eq(userId),
maxId = isNull(),
sinceId = isNull(),
minId = isNull(),
limit = eq(20),
onlyMedia = eq(false), onlyMedia = eq(false),
excludeReplies = eq(false), excludeReplies = eq(false),
excludeReblogs = eq(false), excludeReblogs = eq(false),
pinned = eq(false), pinned = eq(false),
tagged = isNull(), tagged = isNull(),
includeFollowers = eq(false) includeFollowers = eq(false),
page = any()
) )
).doReturn( ).doReturn(
statusList statusList
@ -132,16 +133,13 @@ class AccountApiServiceImplTest {
val accountsStatuses = accountApiServiceImpl.accountsStatuses( val accountsStatuses = accountApiServiceImpl.accountsStatuses(
userid = userId, userid = userId,
maxId = null,
sinceId = null,
minId = null,
limit = 20,
onlyMedia = false, onlyMedia = false,
excludeReplies = false, excludeReplies = false,
excludeReblogs = false, excludeReblogs = false,
pinned = false, pinned = false,
tagged = null, tagged = null,
loginUser = null loginUser = null,
Page.of()
) )
assertThat(accountsStatuses).hasSize(1) assertThat(accountsStatuses).hasSize(1)
@ -156,31 +154,25 @@ class AccountApiServiceImplTest {
whenever( whenever(
statusQueryService.accountsStatus( statusQueryService.accountsStatus(
accountId = eq(userId), accountId = eq(userId),
maxId = isNull(),
sinceId = isNull(),
minId = isNull(),
limit = eq(20),
onlyMedia = eq(false), onlyMedia = eq(false),
excludeReplies = eq(false), excludeReplies = eq(false),
excludeReblogs = eq(false), excludeReblogs = eq(false),
pinned = eq(false), pinned = eq(false),
tagged = isNull(), tagged = isNull(),
includeFollowers = eq(false) includeFollowers = eq(false),
page = any()
) )
).doReturn(statusList) ).doReturn(statusList)
val accountsStatuses = accountApiServiceImpl.accountsStatuses( val accountsStatuses = accountApiServiceImpl.accountsStatuses(
userid = userId, userid = userId,
maxId = null,
sinceId = null,
minId = null,
limit = 20,
onlyMedia = false, onlyMedia = false,
excludeReplies = false, excludeReplies = false,
excludeReblogs = false, excludeReblogs = false,
pinned = false, pinned = false,
tagged = null, tagged = null,
loginUser = loginUser loginUser = loginUser,
Page.of()
) )
assertThat(accountsStatuses).hasSize(1) assertThat(accountsStatuses).hasSize(1)
@ -193,16 +185,13 @@ class AccountApiServiceImplTest {
whenever( whenever(
statusQueryService.accountsStatus( statusQueryService.accountsStatus(
accountId = eq(userId), accountId = eq(userId),
maxId = isNull(),
sinceId = isNull(),
minId = isNull(),
limit = eq(20),
onlyMedia = eq(false), onlyMedia = eq(false),
excludeReplies = eq(false), excludeReplies = eq(false),
excludeReblogs = eq(false), excludeReblogs = eq(false),
pinned = eq(false), pinned = eq(false),
tagged = isNull(), tagged = isNull(),
includeFollowers = eq(true) includeFollowers = eq(true),
page = any()
) )
).doReturn(statusList) ).doReturn(statusList)
@ -221,16 +210,13 @@ class AccountApiServiceImplTest {
val accountsStatuses = accountApiServiceImpl.accountsStatuses( val accountsStatuses = accountApiServiceImpl.accountsStatuses(
userid = userId, userid = userId,
maxId = null,
sinceId = null,
minId = null,
limit = 20,
onlyMedia = false, onlyMedia = false,
excludeReplies = false, excludeReplies = false,
excludeReblogs = false, excludeReblogs = false,
pinned = false, pinned = false,
tagged = null, tagged = null,
loginUser = loginUser loginUser = loginUser,
Page.of()
) )
assertThat(accountsStatuses).hasSize(1) assertThat(accountsStatuses).hasSize(1)