diff --git a/hideout/build.gradle.kts b/hideout/build.gradle.kts index 6b2fb989..4bd572f4 100644 --- a/hideout/build.gradle.kts +++ b/hideout/build.gradle.kts @@ -46,12 +46,10 @@ allprojects { subprojects { apply { plugin(rootProject.libs.plugins.kotlin.jvm.get().pluginId) - plugin(rootProject.libs.plugins.detekt.get().pluginId) } dependencies { testImplementation(kotlin("test")) - detektPlugins(rootProject.libs.detekt.formatting) } } @@ -61,7 +59,6 @@ tasks { } withType { exclude("**/generated/**") - setSource("src/main/kotlin") exclude("build/") configureEach { exclude("**/org/koin/ksp/generated/**", "**/generated/**") @@ -82,6 +79,7 @@ dependencies { implementation(project(":hideout-core")) implementation(project(":hideout-mastodon")) implementation(project(":hideout-activitypub")) + detektPlugins(rootProject.libs.detekt.formatting) } springBoot { @@ -104,6 +102,6 @@ detekt { parallel = true config.setFrom(files("../detekt.yml")) buildUponDefaultConfig = true - basePath = "${rootDir.absolutePath}/src/main/kotlin" + source.setFrom(files(subprojects.map { "${it.projectDir}/src/main/kotlin" })) autoCorrect = true } \ No newline at end of file diff --git a/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt b/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt index fc2410e3..c3636879 100644 --- a/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt +++ b/hideout/hideout-core/src/main/kotlin/dev/usbharu/hideout/core/infrastructure/exposedquery/ExposedUserTimelineQueryService.kt @@ -54,8 +54,14 @@ class ExposedUserTimelineQueryService : UserTimelineQueryService, AbstractReposi .where { Posts.visibility eq Visibility.PUBLIC.name or (Posts.visibility eq Visibility.UNLISTED.name) or - (Posts.visibility eq Visibility.DIRECT.name and (PostsVisibleActors.actorId eq principal.actorId.id)) or - (Posts.visibility eq Visibility.FOLLOWERS.name and (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true))) or + ( + Posts.visibility eq Visibility.DIRECT.name and + (PostsVisibleActors.actorId eq principal.actorId.id) + ) or + ( + Posts.visibility eq Visibility.FOLLOWERS.name and + (Relationships.blocking eq false and (relationshipsAlias[Relationships.following] eq true)) + ) or (Posts.actorId eq principal.actorId.id) } .alias("authorized_table") diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationServiceTest.kt index 494a381c..54eb61da 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/GetUserDetailApplicationServiceTest.kt @@ -44,7 +44,8 @@ class GetUserDetailApplicationServiceTest { fun userDetailを取得できる() = runTest { whenever(userDetailRepository.findById(UserDetailId(1))).doReturn( UserDetail.create( - UserDetailId(1), ActorId(1), + UserDetailId(1), + ActorId(1), UserDetailHashedPassword("") ) ) @@ -56,7 +57,6 @@ class GetUserDetailApplicationServiceTest { @Test fun userDetailが存在しない場合失敗() = runTest { - assertThrows { service.execute(GetUserDetail(2), Anonymous) } @@ -66,7 +66,8 @@ class GetUserDetailApplicationServiceTest { fun userDetailが存在するけどActorが存在しない場合はInternalServerException() = runTest { whenever(userDetailRepository.findById(UserDetailId(2))).doReturn( UserDetail.create( - UserDetailId(2), ActorId(2), + UserDetailId(2), + ActorId(2), UserDetailHashedPassword("") ) ) @@ -75,4 +76,4 @@ class GetUserDetailApplicationServiceTest { service.execute(GetUserDetail(2), Anonymous) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationServiceTest.kt index 0dad132b..d4b74046 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/MigrationLocalActorApplicationServiceTest.kt @@ -57,7 +57,8 @@ class MigrationLocalActorApplicationServiceTest { fun fromのactorが見つからなかったら失敗() = runTest { val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword + ActorId(1), + UserDetailHashedPassword ("") ) whenever(userDetailRepository.findById(UserDetailId(1))).doReturn(userDetail) @@ -73,7 +74,8 @@ class MigrationLocalActorApplicationServiceTest { fun toのactorが見つからなかったら失敗() = runTest { val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword + ActorId(1), + UserDetailHashedPassword ("") ) whenever(actorRepository.findById(ActorId(1))).doReturn(TestActorFactory.create(1)) @@ -102,7 +104,8 @@ class MigrationLocalActorApplicationServiceTest { val to = TestActorFactory.create(2) val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword + ActorId(1), + UserDetailHashedPassword ("") ) whenever(actorRepository.findById(ActorId(1))).doReturn(from) @@ -136,7 +139,8 @@ class MigrationLocalActorApplicationServiceTest { val to = TestActorFactory.create(2) val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword + ActorId(1), + UserDetailHashedPassword ("") ) @@ -168,4 +172,4 @@ class MigrationLocalActorApplicationServiceTest { verify(actorRepository, never()).save(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationServiceTest.kt index 309f41cf..a15a42f6 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/RegisterLocalActorApplicationServiceTest.kt @@ -73,6 +73,4 @@ class RegisterLocalActorApplicationServiceTest { service.execute(RegisterLocalActor("test", "password"), Anonymous) } } - - -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationServiceTest.kt index 27fac11f..889a0697 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/actor/StartDeleteLocalActorApplicationServiceTest.kt @@ -61,4 +61,4 @@ class StartDeleteLocalActorApplicationServiceTest { ) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationServiceTest.kt index e1f73b83..1541646c 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/application/RegisterApplicationApplicationServiceTest.kt @@ -60,8 +60,9 @@ class RegisterApplicationApplicationServiceTest { argumentCaptor { verify(registeredClientRepository).save(capture()) val first = allValues.first() - assertThat(first.tokenSettings.accessTokenTimeToLive).isGreaterThanOrEqualTo(Duration.ofSeconds(31536000000)) - + assertThat( + first.tokenSettings.accessTokenTimeToLive + ).isGreaterThanOrEqualTo(Duration.ofSeconds(31536000000)) } } @@ -78,7 +79,6 @@ class RegisterApplicationApplicationServiceTest { verify(registeredClientRepository).save(capture()) val first = allValues.first() assertThat(first.authorizationGrantTypes).contains(AuthorizationGrantType.REFRESH_TOKEN) - } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationServiceTest.kt index fe2546f6..8a0bd3e5 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserDeleteFilterApplicationServiceTest.kt @@ -34,17 +34,26 @@ class UserDeleteFilterApplicationServiceTest { @Test fun フィルターを削除できる() = runTest { val filter = Filter( - FilterId(1), UserDetailId(1), FilterName("filter"), setOf(FilterContext.HOME), FilterAction.HIDE, setOf( + FilterId(1), + UserDetailId(1), + FilterName("filter"), + setOf(FilterContext.HOME), + FilterAction.HIDE, + setOf( FilterKeyword( - FilterKeywordId(1), FilterKeywordKeyword("aaa"), FilterMode.NONE + FilterKeywordId(1), + FilterKeywordKeyword("aaa"), + FilterMode.NONE ) ) ) whenever(filterRepository.findByFilterId(FilterId(1))).doReturn(filter) service.execute( - DeleteFilter(1), LocalUser( - ActorId(1), UserDetailId(1), + DeleteFilter(1), + LocalUser( + ActorId(1), + UserDetailId(1), Acct("test", "example.com") ) ) @@ -56,8 +65,10 @@ class UserDeleteFilterApplicationServiceTest { fun フィルターが見つからない場合失敗() = runTest { assertThrows { service.execute( - DeleteFilter(1), LocalUser( - ActorId(1), UserDetailId(1), + DeleteFilter(1), + LocalUser( + ActorId(1), + UserDetailId(1), Acct("test", "example.com") ) ) @@ -67,9 +78,16 @@ class UserDeleteFilterApplicationServiceTest { @Test fun フィルターのオーナー以外は失敗() = runTest { val filter = Filter( - FilterId(1), UserDetailId(1), FilterName("filter"), setOf(FilterContext.HOME), FilterAction.HIDE, setOf( + FilterId(1), + UserDetailId(1), + FilterName("filter"), + setOf(FilterContext.HOME), + FilterAction.HIDE, + setOf( FilterKeyword( - FilterKeywordId(1), FilterKeywordKeyword("aaa"), FilterMode.NONE + FilterKeywordId(1), + FilterKeywordKeyword("aaa"), + FilterMode.NONE ) ) ) @@ -77,8 +95,10 @@ class UserDeleteFilterApplicationServiceTest { assertThrows { service.execute( - DeleteFilter(1), LocalUser( - ActorId(3), UserDetailId(3), + DeleteFilter(1), + LocalUser( + ActorId(3), + UserDetailId(3), Acct("test", "example.com") ) ) @@ -86,4 +106,4 @@ class UserDeleteFilterApplicationServiceTest { verify(filterRepository, never()).delete(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationServiceTest.kt index f7d2e01f..c657cbc7 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/filter/UserGetFilterApplicationServiceTest.kt @@ -34,17 +34,26 @@ class UserGetFilterApplicationServiceTest { @Test fun オーナーのみ取得できる() = runTest { val filter = Filter( - FilterId(1), UserDetailId(1), FilterName("filter"), setOf(FilterContext.HOME), FilterAction.HIDE, setOf( + FilterId(1), + UserDetailId(1), + FilterName("filter"), + setOf(FilterContext.HOME), + FilterAction.HIDE, + setOf( FilterKeyword( - FilterKeywordId(1), FilterKeywordKeyword("aaa"), FilterMode.NONE + FilterKeywordId(1), + FilterKeywordKeyword("aaa"), + FilterMode.NONE ) ) ) whenever(filterRepository.findByFilterId(FilterId(1))).doReturn(filter) service.execute( - GetFilter(1), LocalUser( - ActorId(1), UserDetailId(1), + GetFilter(1), + LocalUser( + ActorId(1), + UserDetailId(1), Acct("test", "example.com") ) ) @@ -53,19 +62,27 @@ class UserGetFilterApplicationServiceTest { @Test fun オーナー以外は失敗() = runTest { val filter = Filter( - FilterId(1), UserDetailId(1), FilterName("filter"), setOf(FilterContext.HOME), FilterAction.HIDE, setOf( + FilterId(1), + UserDetailId(1), + FilterName("filter"), + setOf(FilterContext.HOME), + FilterAction.HIDE, + setOf( FilterKeyword( - FilterKeywordId(1), FilterKeywordKeyword("aaa"), FilterMode.NONE + FilterKeywordId(1), + FilterKeywordKeyword("aaa"), + FilterMode.NONE ) ) ) whenever(filterRepository.findByFilterId(FilterId(1))).doReturn(filter) - assertThrows { service.execute( - GetFilter(1), LocalUser( - ActorId(3), UserDetailId(3), + GetFilter(1), + LocalUser( + ActorId(3), + UserDetailId(3), Acct("test", "example.com") ) ) @@ -76,11 +93,13 @@ class UserGetFilterApplicationServiceTest { fun フィルターが見つからない場合失敗() = runTest { assertThrows { service.execute( - GetFilter(1), LocalUser( - ActorId(3), UserDetailId(3), + GetFilter(1), + LocalUser( + ActorId(3), + UserDetailId(3), Acct("test", "example.com") ) ) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/DeleteLocalPostApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/DeleteLocalPostApplicationServiceTest.kt index 4a804882..5147b6f9 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/DeleteLocalPostApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/DeleteLocalPostApplicationServiceTest.kt @@ -52,4 +52,4 @@ class DeleteLocalPostApplicationServiceTest { service.execute(DeleteLocalPost(1), LocalUser(ActorId(3), UserDetailId(3), Acct("test", "example.com"))) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/RegisterLocalPostApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/RegisterLocalPostApplicationServiceTest.kt index cd4c11e7..5771ba21 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/RegisterLocalPostApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/RegisterLocalPostApplicationServiceTest.kt @@ -59,8 +59,11 @@ class RegisterLocalPostApplicationServiceTest { ).doReturn(post) service.execute( - RegisterLocalPost("content test", null, Visibility.PUBLIC, null, null, false, emptyList()), LocalUser( - ActorId(1), UserDetailId(1), Acct("test", "example.com") + RegisterLocalPost("content test", null, Visibility.PUBLIC, null, null, false, emptyList()), + LocalUser( + ActorId(1), + UserDetailId(1), + Acct("test", "example.com") ) ) @@ -71,10 +74,13 @@ class RegisterLocalPostApplicationServiceTest { fun actorが見つからないと失敗() = runTest { assertThrows { service.execute( - RegisterLocalPost("content test", null, Visibility.PUBLIC, null, null, false, emptyList()), LocalUser( - ActorId(1), UserDetailId(1), Acct("test", "example.com") + RegisterLocalPost("content test", null, Visibility.PUBLIC, null, null, false, emptyList()), + LocalUser( + ActorId(1), + UserDetailId(1), + Acct("test", "example.com") ) ) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/UpdateLocalNoteApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/UpdateLocalNoteApplicationServiceTest.kt index 7cb0e206..70c62507 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/UpdateLocalNoteApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/post/UpdateLocalNoteApplicationServiceTest.kt @@ -46,7 +46,6 @@ class UpdateLocalNoteApplicationServiceTest { @Spy val transaction = TestTransaction - @Test fun Post主はPostを編集できる() = runTest { val post = TestPostFactory.create() @@ -54,7 +53,8 @@ class UpdateLocalNoteApplicationServiceTest { whenever(postRepository.findById(post.id)).doReturn(post) whenever(userDetailRepository.findById(UserDetailId(1))).doReturn( UserDetail.create( - UserDetailId(1), post.actorId, + UserDetailId(1), + post.actorId, UserDetailHashedPassword("") ) ) @@ -63,7 +63,8 @@ class UpdateLocalNoteApplicationServiceTest { whenever(postContentFactoryImpl.create(eq("test"))).doReturn(content) service.execute( - UpdateLocalNote(post.id.id, null, "test", false, emptyList()), LocalUser( + UpdateLocalNote(post.id.id, null, "test", false, emptyList()), + LocalUser( post.actorId, UserDetailId(1), Acct("test", "example.com") @@ -75,7 +76,8 @@ class UpdateLocalNoteApplicationServiceTest { val first = allValues.first() assertEquals( - content, first.content + content, + first.content ) } } @@ -84,9 +86,11 @@ class UpdateLocalNoteApplicationServiceTest { fun postが見つからない場合失敗() = runTest { assertThrows { service.execute( - UpdateLocalNote(1, null, "test", false, emptyList()), LocalUser( + UpdateLocalNote(1, null, "test", false, emptyList()), + LocalUser( ActorId(1), - UserDetailId(1), Acct("test", "example.com") + UserDetailId(1), + Acct("test", "example.com") ) ) } @@ -98,9 +102,11 @@ class UpdateLocalNoteApplicationServiceTest { assertThrows { service.execute( - UpdateLocalNote(1, null, "test", false, emptyList()), LocalUser( + UpdateLocalNote(1, null, "test", false, emptyList()), + LocalUser( ActorId(1), - UserDetailId(1), Acct("test", "example.com") + UserDetailId(1), + Acct("test", "example.com") ) ) } @@ -112,9 +118,11 @@ class UpdateLocalNoteApplicationServiceTest { assertThrows { service.execute( - UpdateLocalNote(1, null, "test", false, emptyList()), LocalUser( + UpdateLocalNote(1, null, "test", false, emptyList()), + LocalUser( ActorId(1), - UserDetailId(1), Acct("test", "example.com") + UserDetailId(1), + Acct("test", "example.com") ) ) } @@ -130,15 +138,16 @@ class UpdateLocalNoteApplicationServiceTest { whenever(postRepository.findById(post.id)).doReturn(post) whenever(userDetailRepository.findById(UserDetailId(1))).doReturn( UserDetail.create( - UserDetailId(1), post.actorId, + UserDetailId(1), + post.actorId, UserDetailHashedPassword("") ) ) - assertThrows { service.execute( - UpdateLocalNote(post.id.id, null, "test", false, emptyList()), LocalUser( + UpdateLocalNote(post.id.id, null, "test", false, emptyList()), + LocalUser( post.actorId, UserDetailId(1), Acct("test", "example.com") @@ -149,4 +158,4 @@ class UpdateLocalNoteApplicationServiceTest { verify(actorRepository, times(1)).findById(ActorId(1)) verify(postRepository, never()).save(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/relationship/acceptfollowrequest/UserAcceptFollowRequestApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/relationship/acceptfollowrequest/UserAcceptFollowRequestApplicationServiceTest.kt index e8af07c6..3809dcec 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/relationship/acceptfollowrequest/UserAcceptFollowRequestApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/relationship/acceptfollowrequest/UserAcceptFollowRequestApplicationServiceTest.kt @@ -62,12 +62,14 @@ class UserAcceptFollowRequestApplicationServiceTest { whenever(actorRepository.findById(ActorId(2))).doReturn(TestActorFactory.create(id = 2)) whenever(relationshipRepository.findByActorIdAndTargetId(ActorId(1), ActorId(2))).doReturn( Relationship( - actorId = ActorId(1), targetActorId = ActorId + actorId = ActorId(1), + targetActorId = ActorId (2), following = false, blocking = false, muting = false, - followRequesting = true, mutingFollowRequest = false + followRequesting = true, + mutingFollowRequest = false ) ) service.execute(AcceptFollowRequest(1), LocalUser(ActorId(2), UserDetailId(2), Acct("test", "example.com"))) @@ -80,4 +82,4 @@ class UserAcceptFollowRequestApplicationServiceTest { assertTrue(first.following) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/shared/LocalUserAbstractApplicationServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/shared/LocalUserAbstractApplicationServiceTest.kt index ee8c84ec..618b54ff 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/shared/LocalUserAbstractApplicationServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/application/shared/LocalUserAbstractApplicationServiceTest.kt @@ -14,7 +14,6 @@ class LocalUserAbstractApplicationServiceTest { val logger = LoggerFactory.getLogger(javaClass) val value = object : LocalUserAbstractApplicationService(TestTransaction, logger) { override suspend fun internalExecute(command: Unit, principal: LocalUser) { - } } @@ -22,4 +21,4 @@ class LocalUserAbstractApplicationServiceTest { value.execute(Unit, Anonymous) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorDescriptionTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorDescriptionTest.kt index c61538b0..a6fc6b1f 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorDescriptionTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorDescriptionTest.kt @@ -10,4 +10,4 @@ class ActorDescriptionTest { assertEquals(ActorDescription.LENGTH, actorScreenName.description.length) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorIdTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorIdTest.kt index 12c57c0c..4e5f7a02 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorIdTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorIdTest.kt @@ -9,4 +9,4 @@ class ActorIdTest { ActorId(-1) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorKeyIdTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorKeyIdTest.kt index 8de564da..d0c9c38d 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorKeyIdTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorKeyIdTest.kt @@ -22,4 +22,4 @@ class ActorKeyIdTest { ActorKeyId("aiueo") } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorNameTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorNameTest.kt index 477f799d..2b2e70fa 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorNameTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorNameTest.kt @@ -32,4 +32,4 @@ class ActorNameTest { ActorName("test-user") } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPostsCountTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPostsCountTest.kt index 451913b5..a1692748 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPostsCountTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPostsCountTest.kt @@ -17,4 +17,4 @@ class ActorPostsCountTest { ActorPostsCount(1) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPrivateKeyTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPrivateKeyTest.kt index 68ff6877..b20bb001 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPrivateKeyTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPrivateKeyTest.kt @@ -15,4 +15,4 @@ class ActorPrivateKeyTest { .joinToString("\n") + "\n-----END PRIVATE KEY-----" assertEquals(key, actorPrivateKey.privateKey) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPublicKeyTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPublicKeyTest.kt index a2ec7f79..e571adb4 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPublicKeyTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorPublicKeyTest.kt @@ -15,4 +15,4 @@ class ActorPublicKeyTest { .joinToString("\n") + "\n-----END PUBLIC KEY-----" assertEquals(key, actorPublicKey.publicKey) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRelationshipCountTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRelationshipCountTest.kt index 340d1563..9fb0e4d7 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRelationshipCountTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorRelationshipCountTest.kt @@ -18,4 +18,4 @@ class ActorRelationshipCountTest { ActorRelationshipCount(1) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorScreenNameTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorScreenNameTest.kt index 4c4fa1f2..da29933b 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorScreenNameTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorScreenNameTest.kt @@ -10,4 +10,4 @@ class ActorScreenNameTest { assertEquals(ActorScreenName.LENGTH, actorScreenName.screenName.length) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorsTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorsTest.kt index e98a7113..cfcd8fcf 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorsTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/ActorsTest.kt @@ -43,7 +43,6 @@ class ActorsTest { fun moveToに自分自身が設定された場合moveイベントが発生し更新される() { val actor = TestActorFactory.create(publicKey = ActorPublicKey("")) - actor.setMoveTo(ActorId(100)) assertContainsEvent(actor, ActorEvent.MOVE.eventName) @@ -146,4 +145,4 @@ class ActorsTest { assertContainsEvent(actor, ActorEvent.UPDATE.eventName) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/TestActorFactory.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/TestActorFactory.kt index 8d87592a..29ff0d14 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/TestActorFactory.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actor/TestActorFactory.kt @@ -80,4 +80,4 @@ object TestActorFactory { private fun generateId(): Long = runBlocking { idGenerateService.generateId() } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actorinstancerelationship/ActorInstanceRelationshipTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actorinstancerelationship/ActorInstanceRelationshipTest.kt index c24c559d..fb02142a 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actorinstancerelationship/ActorInstanceRelationshipTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/actorinstancerelationship/ActorInstanceRelationshipTest.kt @@ -74,4 +74,4 @@ class ActorInstanceRelationshipTest { assertFalse(default.blocking) assertFalse(default.doNotSendPrivate) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationIdTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationIdTest.kt index e8c08c9d..5454a5b5 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationIdTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationIdTest.kt @@ -17,4 +17,4 @@ class ApplicationIdTest { ApplicationId(1) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationTest.kt index af51c836..6b971c44 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/application/ApplicationTest.kt @@ -10,4 +10,4 @@ class ApplicationTest { ApplicationName("aiueo") ) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiIdTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiIdTest.kt index e9383cdb..fc9476ae 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiIdTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/emoji/CustomEmojiIdTest.kt @@ -17,4 +17,4 @@ class CustomEmojiIdTest { CustomEmojiId(1) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterIdTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterIdTest.kt index f91e4d5f..540506dd 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterIdTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterIdTest.kt @@ -17,4 +17,4 @@ class FilterIdTest { FilterId(1) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterNameTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterNameTest.kt index 00bd6c84..087660dd 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterNameTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterNameTest.kt @@ -10,4 +10,4 @@ class FilterNameTest { assertEquals(FilterName.LENGTH, filterName.name.length) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterTest.kt index 48d26605..ce1c98de 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/filter/FilterTest.kt @@ -36,10 +36,10 @@ class FilterTest { FilterKeywordKeyword("keyword"), FilterMode.NONE ) - ), userDetail + ), + userDetail ) } - } @Test @@ -60,7 +60,6 @@ class FilterTest { ) kotlin.test.assertEquals("(hoge)", filter.compileFilter().pattern) - } @Test @@ -81,7 +80,6 @@ class FilterTest { ) kotlin.test.assertEquals("\\b(hoge)\\b", filter.compileFilter().pattern) - } @Test @@ -102,7 +100,6 @@ class FilterTest { ) kotlin.test.assertEquals("(hoge)", filter.compileFilter().pattern) - } @Test @@ -133,7 +130,5 @@ class FilterTest { ) kotlin.test.assertEquals("\\b(hoge)\\b|(hoge)|(hoge)", filter.compileFilter().pattern) - } } - diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/PostTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/PostTest.kt index a07a0b0d..1d55f26b 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/PostTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/PostTest.kt @@ -134,7 +134,6 @@ class PostTest { val actor = TestActorFactory.create(id = post.actorId.id, publicKey = ActorPublicKey("")) post.setVisibility(Visibility.UNLISTED, actor) assertEmpty(post) - } @Test @@ -392,9 +391,7 @@ class PostTest { fun `create 作成できる`() { val actor = TestActorFactory.create(suspend = true) - assertDoesNotThrow { - Post.create( id = PostId(1), actorId = actor.id, @@ -422,9 +419,7 @@ class PostTest { fun `create 作成できる2`() { val actor = TestActorFactory.create(suspend = true) - assertDoesNotThrow { - Post.create( id = PostId(1), actorId = actor.id, @@ -467,7 +462,6 @@ class PostTest { ) assertEquals(PostContent.empty.emojiIds, post.emojiIds) - } @Test @@ -532,7 +526,6 @@ class PostTest { ) assertEquals(emptyList(), post.mediaIds) - } @Test @@ -563,7 +556,6 @@ class PostTest { @Test fun `delete deleteイベントが発生する`() { - val actor = TestActorFactory.create() val post = TestPostFactory.create(deleted = false, actorId = actor.id.id) post.delete(actor) @@ -572,7 +564,6 @@ class PostTest { @Test fun `delete すでにdeletedがtrueの時deleteイベントは発生しない`() { - val actor = TestActorFactory.create() val post = TestPostFactory.create(deleted = true, actorId = actor.id.id) post.delete(actor) diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/TestPostFactory.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/TestPostFactory.kt index 8dea9878..47b7e9e9 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/TestPostFactory.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/post/TestPostFactory.kt @@ -56,4 +56,4 @@ object TestPostFactory { private fun generateId(): Long = runBlocking { idGenerateService.generateId() } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipTest.kt index 7a9c514b..ea562d94 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/relationship/RelationshipTest.kt @@ -149,4 +149,4 @@ class RelationshipTest { assertFalse(relationship.followRequesting) assertContainsEvent(relationship, RelationshipEvent.REJECT_FOLLOW.eventName) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/support/domain/DomainTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/support/domain/DomainTest.kt index 861d2857..e4d77565 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/support/domain/DomainTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/model/support/domain/DomainTest.kt @@ -3,7 +3,6 @@ package dev.usbharu.hideout.core.domain.model.support.domain import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows - class DomainTest { @Test fun `1000超過の長さは失敗`() { @@ -11,4 +10,4 @@ class DomainTest { Domain("a".repeat(1001)) } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/RemoteActorCheckDomainServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/RemoteActorCheckDomainServiceTest.kt index 1eb4af84..ea0aa1b4 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/RemoteActorCheckDomainServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/RemoteActorCheckDomainServiceTest.kt @@ -38,4 +38,4 @@ class RemoteActorCheckDomainServiceTest { assertFalse(localActor) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorDomainServiceImplTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorDomainServiceImplTest.kt index 4116b0e2..5c9f522e 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorDomainServiceImplTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorDomainServiceImplTest.kt @@ -48,4 +48,4 @@ class LocalActorDomainServiceImplTest { fun generateKeyPair() = runTest { service.generateKeyPair() } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorMigrationCheckDomainServiceImplTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorMigrationCheckDomainServiceImplTest.kt index 3617fae9..bb6369c8 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorMigrationCheckDomainServiceImplTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/actor/local/LocalActorMigrationCheckDomainServiceImplTest.kt @@ -20,7 +20,8 @@ class LocalActorMigrationCheckDomainServiceImplTest { val to = TestActorFactory.create() val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) userDetail.lastMigration = Instant.now().minusSeconds(100) @@ -33,12 +34,12 @@ class LocalActorMigrationCheckDomainServiceImplTest { @Test fun 自分自身に引っ越しできない(): Unit = runTest { - val from = TestActorFactory.create() val to = TestActorFactory.create() val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) val localActorMigrationCheckDomainServiceImpl = LocalActorMigrationCheckDomainServiceImpl() @@ -49,12 +50,12 @@ class LocalActorMigrationCheckDomainServiceImplTest { @Test fun 引越し先が引っ越している場合は引っ越しできない(): Unit = runTest { - val from = TestActorFactory.create() val to = TestActorFactory.create(moveTo = 100) val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) val localActorMigrationCheckDomainServiceImpl = LocalActorMigrationCheckDomainServiceImpl() @@ -69,7 +70,8 @@ class LocalActorMigrationCheckDomainServiceImplTest { val to = TestActorFactory.create() val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) val localActorMigrationCheckDomainServiceImpl = LocalActorMigrationCheckDomainServiceImpl() @@ -84,7 +86,8 @@ class LocalActorMigrationCheckDomainServiceImplTest { val to = TestActorFactory.create(alsoKnownAs = setOf(ActorId(100))) val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) val localActorMigrationCheckDomainServiceImpl = LocalActorMigrationCheckDomainServiceImpl() @@ -99,7 +102,8 @@ class LocalActorMigrationCheckDomainServiceImplTest { val to = TestActorFactory.create(alsoKnownAs = setOf(from.id, ActorId(100))) val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) val localActorMigrationCheckDomainServiceImpl = LocalActorMigrationCheckDomainServiceImpl() @@ -114,7 +118,8 @@ class LocalActorMigrationCheckDomainServiceImplTest { val to = TestActorFactory.create(alsoKnownAs = setOf(from.id, ActorId(100))) val userDetail = UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) userDetail.lastMigration = Instant.now().minus(31.days.toJavaDuration()) val localActorMigrationCheckDomainServiceImpl = LocalActorMigrationCheckDomainServiceImpl() @@ -123,4 +128,4 @@ class LocalActorMigrationCheckDomainServiceImplTest { assertInstanceOf(AccountMigrationCheck.CanAccountMigration::class.java, canAccountMigration) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/filter/FilterDomainServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/filter/FilterDomainServiceTest.kt index 6d43550a..c9866019 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/filter/FilterDomainServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/filter/FilterDomainServiceTest.kt @@ -78,9 +78,8 @@ class FilterDomainServiceTest { setOf(FilterKeyword(FilterKeywordId(1), FilterKeywordKeyword("test"), FilterMode.NONE)) ) - val filteredPosts = FilterDomainService().applyAll(postList, FilterContext.HOME, filters = listOf(filter)) assertEquals(5, filteredPosts.size) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/post/DefaultPostReadAccessControlTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/post/DefaultPostReadAccessControlTest.kt index 16736b6c..89d547fa 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/post/DefaultPostReadAccessControlTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/post/DefaultPostReadAccessControlTest.kt @@ -111,7 +111,6 @@ class DefaultPostReadAccessControlTest { ) ) - val actual = service.isAllow( TestPostFactory.create(actorId = 1, visibility = Visibility.FOLLOWERS), LocalUser(ActorId(2), UserDetailId(2), Acct("test", "example.com")) @@ -150,7 +149,6 @@ class DefaultPostReadAccessControlTest { ) ) - val actual = service.isAllow( TestPostFactory.create(actorId = 1, visibility = Visibility.FOLLOWERS), LocalUser(ActorId(2), UserDetailId(2), Acct("test", "example.com")) @@ -234,7 +232,6 @@ class DefaultPostReadAccessControlTest { assertAll(actual.map { { assertEquals(1, it.actorId.id) } }) } - @Test fun areAllows_PUBLICとUNLISTEDは見れる() = runTest { whenever( @@ -265,7 +262,9 @@ class DefaultPostReadAccessControlTest { val actual = service.areAllows(postList, LocalUser(ActorId(1), UserDetailId(1), Acct("test", "example.com"))) assertEquals(2, actual.size) - kotlin.test.assertTrue(actual.all { it.visibility == Visibility.PUBLIC || it.visibility == Visibility.UNLISTED }) + kotlin.test.assertTrue( + actual.all { it.visibility == Visibility.PUBLIC || it.visibility == Visibility.UNLISTED } + ) } @Test @@ -298,7 +297,9 @@ class DefaultPostReadAccessControlTest { val actual = service.areAllows(postList, Anonymous) assertEquals(2, actual.size) - kotlin.test.assertTrue(actual.all { it.visibility == Visibility.PUBLIC || it.visibility == Visibility.UNLISTED }) + kotlin.test.assertTrue( + actual.all { it.visibility == Visibility.PUBLIC || it.visibility == Visibility.UNLISTED } + ) } @Test @@ -371,4 +372,4 @@ class DefaultPostReadAccessControlTest { assertEquals(1, actual.size) assertAll(actual.map { { assertEquals(2, it.actorId.id) } }) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/relationship/RelationshipDomainServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/relationship/RelationshipDomainServiceTest.kt index df5886da..be29c2e1 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/relationship/RelationshipDomainServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/relationship/RelationshipDomainServiceTest.kt @@ -133,4 +133,4 @@ class RelationshipDomainServiceTest { assertTrue(relationship.followRequesting) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/userdetail/UserDetailDomainServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/userdetail/UserDetailDomainServiceTest.kt index fa75ff66..233eb476 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/userdetail/UserDetailDomainServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/domain/service/userdetail/UserDetailDomainServiceTest.kt @@ -25,4 +25,4 @@ class UserDetailDomainServiceTest { assertNotEquals("password", hashedPassword.password) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/emojikt/EmojiKtUnicodeEmojiServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/emojikt/EmojiKtUnicodeEmojiServiceTest.kt index f589be2c..27d7c1cd 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/emojikt/EmojiKtUnicodeEmojiServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/emojikt/EmojiKtUnicodeEmojiServiceTest.kt @@ -11,6 +11,4 @@ class EmojiKtUnicodeEmojiServiceTest { fun 絵文字の判定ができる(s: String) { assertTrue(EmojiKtUnicodeEmojiService().isUnicodeEmoji(s)) } - - -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt index 6ed40eb6..328f3819 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorInstanceRelationshipRepositoryTest.kt @@ -93,9 +93,12 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac } }.launch() - val actorInstanceRelationship = ActorInstanceRelationship( - actorId = ActorId(1), instanceId = InstanceId(1), blocking = false, muting = false, doNotSendPrivate = false + actorId = ActorId(1), + instanceId = InstanceId(1), + blocking = false, + muting = false, + doNotSendPrivate = false ) repository.save(actorInstanceRelationship) @@ -173,9 +176,12 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac } }.launch() - val actorInstanceRelationship = ActorInstanceRelationship( - actorId = ActorId(1), instanceId = InstanceId(1), blocking = false, muting = false, doNotSendPrivate = false + actorId = ActorId(1), + instanceId = InstanceId(1), + blocking = false, + muting = false, + doNotSendPrivate = false ) repository.save(actorInstanceRelationship) @@ -201,7 +207,11 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac }.launch() val actorInstanceRelationship = ActorInstanceRelationship( - actorId = ActorId(1), instanceId = InstanceId(1), blocking = false, muting = false, doNotSendPrivate = false + actorId = ActorId(1), + instanceId = InstanceId(1), + blocking = false, + muting = false, + doNotSendPrivate = false ) change.setStartPointNow() @@ -228,7 +238,11 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac }.launch() val expected = ActorInstanceRelationship( - actorId = ActorId(1), instanceId = InstanceId(1), blocking = true, muting = true, doNotSendPrivate = true + actorId = ActorId(1), + instanceId = InstanceId(1), + blocking = true, + muting = true, + doNotSendPrivate = true ) val actual = repository.findByActorIdAndInstanceId(ActorId(1), InstanceId(1)) @@ -249,13 +263,16 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac @Test fun save_ドメインイベントがパブリッシュされる() = runTest { - dbSetup(to = dataSource) { execute(disableReferenceIntegrityConstraints) }.launch() val actorInstanceRelationship = ActorInstanceRelationship( - actorId = ActorId(1), instanceId = InstanceId(1), blocking = false, muting = false, doNotSendPrivate = false + actorId = ActorId(1), + instanceId = InstanceId(1), + blocking = false, + muting = false, + doNotSendPrivate = false ) actorInstanceRelationship.block() repository.save(actorInstanceRelationship) @@ -267,7 +284,6 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac @Test fun delete_ドメインイベントがパブリッシュされる() = runTest { - dbSetup(to = dataSource) { execute(disableReferenceIntegrityConstraints) insertInto(ActorInstanceRelationships.tableName) { @@ -277,7 +293,11 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac }.launch() val actorInstanceRelationship = ActorInstanceRelationship( - actorId = ActorId(1), instanceId = InstanceId(1), blocking = false, muting = false, doNotSendPrivate = false + actorId = ActorId(1), + instanceId = InstanceId(1), + blocking = false, + muting = false, + doNotSendPrivate = false ) actorInstanceRelationship.block() repository.delete(actorInstanceRelationship) @@ -286,4 +306,4 @@ class ExposedActorInstanceRelationshipRepositoryTest : AbstractRepositoryTest(Ac verify(domainEventPublisher, times(1)).publishEvent(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorRepositoryTest.kt index 2cbe8f22..385f6f1c 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedActorRepositoryTest.kt @@ -269,7 +269,9 @@ class ExposedActorRepositoryTest : AbstractRepositoryTest(Actors) { inbox = URI.create("https://test-hideout-dev.usbharu.dev/users/b/inbox"), outbox = URI.create("https://test-hideout-dev.usbharu.dev/users/b/outbox"), uri = URI.create("https://test-hideout-dev.usbharu.dev/users/b"), - publicKey = ActorPublicKey("-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyuMjzmQBsSxzK6NkOpZh\nWuohaUbzCY7AafXt+3+tiL6LulYNg/YRIqKc7Q/vTJE6CHrqo7RA/OqYrSMxF/LC\nf8aX5aHwJE1A2gSgCcs1IL5GJaYRlp4NcuazpBC9NO4xIrvH//jcVnZGXGWsCbls\nHXZGZdurWOF0Bl3mYN8CdupVumrGuOPs+wbI/Gh+OHw611TcXMyAwFwU2UjvPEgk\nEACW9OvJaq1K40jVCAa3b1nXt53vlXXZEUlL78L0C9xuFbJG0K/GKMBN44GyftJO\nhA95Rf1Nhd0vKDLBiRocGcARmBo9PaSCR5651gJEk5/wfLUnNAf0xj3R8LBoOhnT\nCQIDAQAB\n-----END PUBLIC KEY-----"), + publicKey = ActorPublicKey( + "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyuMjzmQBsSxzK6NkOpZh\nWuohaUbzCY7AafXt+3+tiL6LulYNg/YRIqKc7Q/vTJE6CHrqo7RA/OqYrSMxF/LC\nf8aX5aHwJE1A2gSgCcs1IL5GJaYRlp4NcuazpBC9NO4xIrvH//jcVnZGXGWsCbls\nHXZGZdurWOF0Bl3mYN8CdupVumrGuOPs+wbI/Gh+OHw611TcXMyAwFwU2UjvPEgk\nEACW9OvJaq1K40jVCAa3b1nXt53vlXXZEUlL78L0C9xuFbJG0K/GKMBN44GyftJO\nhA95Rf1Nhd0vKDLBiRocGcARmBo9PaSCR5651gJEk5/wfLUnNAf0xj3R8LBoOhnT\nCQIDAQAB\n-----END PUBLIC KEY-----" + ), privateKey = ActorPrivateKey( "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDK4yPOZAGxLHMr\no2Q6lmFa6iFpRvMJjsBp9e37f62Ivou6Vg2D9hEiopztD+9MkToIeuqjtED86pit\nIzEX8sJ/xpflofAkTUDaBKAJyzUgvkYlphGWng1y5rOkEL007jEiu8f/+NxWdkZc\nZawJuWwddkZl26tY4XQGXeZg3wJ26lW6asa44+z7Bsj8aH44fDrXVNxczIDAXBTZ\nSO88SCQQAJb068lqrUrjSNUIBrdvWde3ne+VddkRSUvvwvQL3G4VskbQr8YowE3j\ngbJ+0k6ED3lF/U2F3S8oMsGJGhwZwBGYGj09pIJHnrnWAkSTn/B8tSc0B/TGPdHw\nsGg6GdMJAgMBAAECggEAHkEhLEb70kdOGgJLUR9D/5zYBE0eXdz/MsMyd1AH+Shs\n9AmetKsYzWDmuhp9Cp5swyn328Hmn7B+DvInVn+5YvjNhY07SbaJcVls4g5UQFXk\nu6WC4ZfKap7IyAeaUg54858r8677xcWXuByN5dn+1iU2hJGYK3Cx7rx0PRrUURYG\n2BRaEEwkcPNm9u679OOTyvTmA3NhewUuDaTMkZnnAml87uYYnmFKjQcR+S2UqOm6\nvBZ/devG4TfPBeKEAya/ba8JJ8frGOtjmR9EIliTQoxI2izeAfoGs1OsCSpuPy6s\nV5f0X3HYM7CA+Fpkt2pnixuwg96LaVr4OpVxujhNlwKBgQD1827VuKFGrneNO+c+\n4EIvh+vLh462bJiaVsMHfRhNZF1/5i8gfNJ16ST60hJo11E4riHPzi3q6GWuxOYl\nCkVKvhJ2g3mgnhoehcgnT7UBkasaC7JYd+LsFDnWOTVSJOy2OqfLdLDGAuSTN3kO\nBF4p0ZqQ/AouFNin57WNRGVZ7wKBgQDTLUZtfTkOU3G1nIMTRKmZjqdER5glzHCm\n9o/1ZsQktL+nzSXqYeoWh9fr7fkmC0k/07+SHzzfWvOhWWWlRenUVL5mj7FRq+L9\n9kDjChLR3Jr4L6Sj1iaQ+0uqDSQNYSYO9ctMjAVjFiNhiAd+S6B451Q1VbDKTCHt\nkRW9omz6hwKBgBFTsgY6eJorJl77zmG+mMsSb0kqZqJxahrNa/X2GSUyoeelxsIq\nKQWHhERrUkKykJVGpzkllFSNRMSYOIJ5g8ItO82/m2z2Vm66DAzA78aJhZ1TH6Bd\n6c2p6x0tcJU15rs7zKBnuyBoCcRZTxzur9eQXaxDJVBzxYOmrkKig+VfAoGBAMCP\n2Fiehxh5HobsYNmBEuXjHsM0RZiyA0c8LakoPFL8PodUme5PupUw6cNJDJeUUwbQ\nny8vLOK+nMnUKsu6JK5pV/VNsfM3OZU6p5Bf7ylOcEE/sHF1JVWu0CAQO3+3xmx9\n1RPH2mGwHjMhRzPy4jFdP3wi10KgiY+HbLuvEJChAoGAYCsh3UhtTzGUOlPBkmLL\n17bD0wN4J/fOv8BoXPZ8H2CdqVgWy0s+s+QaPqRxNcA6YyGymBqrmQAn1Uii25r9\nKAwVAjg3S2KDEMSI2RbMMmQJSZ1u0GkxqOUC/MMeZqBYTYxVeqcQPoqJZ0Nk7IOA\nZPFif8bVfcZqeimxrFaV6YI=\n-----END PRIVATE KEY-----", ), @@ -382,7 +384,9 @@ class ExposedActorRepositoryTest : AbstractRepositoryTest(Actors) { inbox = URI.create("https://test-hideout-dev.usbharu.dev/users/b/inbox"), outbox = URI.create("https://test-hideout-dev.usbharu.dev/users/b/outbox"), uri = URI.create("https://test-hideout-dev.usbharu.dev/users/b"), - publicKey = ActorPublicKey("-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyuMjzmQBsSxzK6NkOpZh\nWuohaUbzCY7AafXt+3+tiL6LulYNg/YRIqKc7Q/vTJE6CHrqo7RA/OqYrSMxF/LC\nf8aX5aHwJE1A2gSgCcs1IL5GJaYRlp4NcuazpBC9NO4xIrvH//jcVnZGXGWsCbls\nHXZGZdurWOF0Bl3mYN8CdupVumrGuOPs+wbI/Gh+OHw611TcXMyAwFwU2UjvPEgk\nEACW9OvJaq1K40jVCAa3b1nXt53vlXXZEUlL78L0C9xuFbJG0K/GKMBN44GyftJO\nhA95Rf1Nhd0vKDLBiRocGcARmBo9PaSCR5651gJEk5/wfLUnNAf0xj3R8LBoOhnT\nCQIDAQAB\n-----END PUBLIC KEY-----"), + publicKey = ActorPublicKey( + "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyuMjzmQBsSxzK6NkOpZh\nWuohaUbzCY7AafXt+3+tiL6LulYNg/YRIqKc7Q/vTJE6CHrqo7RA/OqYrSMxF/LC\nf8aX5aHwJE1A2gSgCcs1IL5GJaYRlp4NcuazpBC9NO4xIrvH//jcVnZGXGWsCbls\nHXZGZdurWOF0Bl3mYN8CdupVumrGuOPs+wbI/Gh+OHw611TcXMyAwFwU2UjvPEgk\nEACW9OvJaq1K40jVCAa3b1nXt53vlXXZEUlL78L0C9xuFbJG0K/GKMBN44GyftJO\nhA95Rf1Nhd0vKDLBiRocGcARmBo9PaSCR5651gJEk5/wfLUnNAf0xj3R8LBoOhnT\nCQIDAQAB\n-----END PUBLIC KEY-----" + ), privateKey = ActorPrivateKey( "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDK4yPOZAGxLHMr\no2Q6lmFa6iFpRvMJjsBp9e37f62Ivou6Vg2D9hEiopztD+9MkToIeuqjtED86pit\nIzEX8sJ/xpflofAkTUDaBKAJyzUgvkYlphGWng1y5rOkEL007jEiu8f/+NxWdkZc\nZawJuWwddkZl26tY4XQGXeZg3wJ26lW6asa44+z7Bsj8aH44fDrXVNxczIDAXBTZ\nSO88SCQQAJb068lqrUrjSNUIBrdvWde3ne+VddkRSUvvwvQL3G4VskbQr8YowE3j\ngbJ+0k6ED3lF/U2F3S8oMsGJGhwZwBGYGj09pIJHnrnWAkSTn/B8tSc0B/TGPdHw\nsGg6GdMJAgMBAAECggEAHkEhLEb70kdOGgJLUR9D/5zYBE0eXdz/MsMyd1AH+Shs\n9AmetKsYzWDmuhp9Cp5swyn328Hmn7B+DvInVn+5YvjNhY07SbaJcVls4g5UQFXk\nu6WC4ZfKap7IyAeaUg54858r8677xcWXuByN5dn+1iU2hJGYK3Cx7rx0PRrUURYG\n2BRaEEwkcPNm9u679OOTyvTmA3NhewUuDaTMkZnnAml87uYYnmFKjQcR+S2UqOm6\nvBZ/devG4TfPBeKEAya/ba8JJ8frGOtjmR9EIliTQoxI2izeAfoGs1OsCSpuPy6s\nV5f0X3HYM7CA+Fpkt2pnixuwg96LaVr4OpVxujhNlwKBgQD1827VuKFGrneNO+c+\n4EIvh+vLh462bJiaVsMHfRhNZF1/5i8gfNJ16ST60hJo11E4riHPzi3q6GWuxOYl\nCkVKvhJ2g3mgnhoehcgnT7UBkasaC7JYd+LsFDnWOTVSJOy2OqfLdLDGAuSTN3kO\nBF4p0ZqQ/AouFNin57WNRGVZ7wKBgQDTLUZtfTkOU3G1nIMTRKmZjqdER5glzHCm\n9o/1ZsQktL+nzSXqYeoWh9fr7fkmC0k/07+SHzzfWvOhWWWlRenUVL5mj7FRq+L9\n9kDjChLR3Jr4L6Sj1iaQ+0uqDSQNYSYO9ctMjAVjFiNhiAd+S6B451Q1VbDKTCHt\nkRW9omz6hwKBgBFTsgY6eJorJl77zmG+mMsSb0kqZqJxahrNa/X2GSUyoeelxsIq\nKQWHhERrUkKykJVGpzkllFSNRMSYOIJ5g8ItO82/m2z2Vm66DAzA78aJhZ1TH6Bd\n6c2p6x0tcJU15rs7zKBnuyBoCcRZTxzur9eQXaxDJVBzxYOmrkKig+VfAoGBAMCP\n2Fiehxh5HobsYNmBEuXjHsM0RZiyA0c8LakoPFL8PodUme5PupUw6cNJDJeUUwbQ\nny8vLOK+nMnUKsu6JK5pV/VNsfM3OZU6p5Bf7ylOcEE/sHF1JVWu0CAQO3+3xmx9\n1RPH2mGwHjMhRzPy4jFdP3wi10KgiY+HbLuvEJChAoGAYCsh3UhtTzGUOlPBkmLL\n17bD0wN4J/fOv8BoXPZ8H2CdqVgWy0s+s+QaPqRxNcA6YyGymBqrmQAn1Uii25r9\nKAwVAjg3S2KDEMSI2RbMMmQJSZ1u0GkxqOUC/MMeZqBYTYxVeqcQPoqJZ0Nk7IOA\nZPFif8bVfcZqeimxrFaV6YI=\n-----END PRIVATE KEY-----", ), @@ -555,4 +559,4 @@ class ExposedActorRepositoryTest : AbstractRepositoryTest(Actors) { verify(domainEventPublisher, times(1)).publishEvent(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedApplicationRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedApplicationRepositoryTest.kt index 619db4fd..c4b330b8 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedApplicationRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedApplicationRepositoryTest.kt @@ -64,7 +64,5 @@ class ExposedApplicationRepositoryTest : AbstractRepositoryTest(Applications) { .rowAtStartPoint() .value(Applications.id.name).isEqualTo(application.applicationId.id) .value(Applications.name.name).isEqualTo(application.name.name) - - } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedCustomEmojiRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedCustomEmojiRepositoryTest.kt index e32171d3..9e51ecaf 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedCustomEmojiRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedCustomEmojiRepositoryTest.kt @@ -118,7 +118,6 @@ class ExposedCustomEmojiRepositoryTest : AbstractRepositoryTest(CustomEmojis) { @Test fun delete_削除される() = runTest { - dbSetup(to = dataSource) { execute(disableReferenceIntegrityConstraints) insertInto(CustomEmojis.tableName) { @@ -145,7 +144,6 @@ class ExposedCustomEmojiRepositoryTest : AbstractRepositoryTest(CustomEmojis) { Instant.parse("2020-01-01T00:00:00Z") ) - change.withSuspend { ExposedCustomEmojiRepository().delete(customEmoji) } @@ -245,7 +243,8 @@ class ExposedCustomEmojiRepositoryTest : AbstractRepositoryTest(CustomEmojis) { URI.create("https://example.com/1"), null, Instant.parse("2020-01-01T00:00:00Z") - ), CustomEmoji( + ), + CustomEmoji( CustomEmojiId(2), "emoji2", Domain("example.com"), @@ -306,7 +305,8 @@ class ExposedCustomEmojiRepositoryTest : AbstractRepositoryTest(CustomEmojis) { URI.create("https://example.com/1"), null, Instant.parse("2020-01-01T00:00:00Z") - ), CustomEmoji( + ), + CustomEmoji( CustomEmojiId(3), "emoji3", Domain("example.com"), @@ -321,4 +321,4 @@ class ExposedCustomEmojiRepositoryTest : AbstractRepositoryTest(CustomEmojis) { assertContentEquals(expected, actual) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepositoryTest.kt index 952eb316..416444eb 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedFilterRepositoryTest.kt @@ -172,7 +172,8 @@ class ExposedFilterRepositoryTest : AbstractRepositoryTest(Filters) { } private fun assertEquals( - expected: Filter, actual: Filter? + expected: Filter, + actual: Filter? ) { kotlin.test.assertEquals(expected, actual) assertNotNull(actual) @@ -184,7 +185,6 @@ class ExposedFilterRepositoryTest : AbstractRepositoryTest(Filters) { assertContentEquals(expected.filterKeywords, actual.filterKeywords.asIterable()) } - @Test fun findByFilterKeywordId_指定された条件で存在しないとnull() = runTest { assertNull(repository.findByFilterKeywordId(FilterKeywordId(1))) @@ -249,11 +249,17 @@ class ExposedFilterRepositoryTest : AbstractRepositoryTest(Filters) { val expected = listOf( Filter( - FilterId(1), UserDetailId(1), FilterName("name"), setOf(FilterContext.PUBLIC), FilterAction.WARN, setOf( + FilterId(1), + UserDetailId(1), + FilterName("name"), + setOf(FilterContext.PUBLIC), + FilterAction.WARN, + setOf( FilterKeyword(FilterKeywordId(1), FilterKeywordKeyword("keyword"), FilterMode.REGEX), FilterKeyword(FilterKeywordId(3), FilterKeywordKeyword("keyword3"), FilterMode.REGEX) ) - ), Filter( + ), + Filter( FilterId(2), UserDetailId(1), FilterName("name2"), @@ -262,14 +268,14 @@ class ExposedFilterRepositoryTest : AbstractRepositoryTest(Filters) { setOf( FilterKeyword(FilterKeywordId(2), FilterKeywordKeyword("keyword2"), FilterMode.REGEX) ) - ), Filter( + ), + Filter( FilterId(3), UserDetailId(1), FilterName("name3"), setOf(FilterContext.PUBLIC), FilterAction.HIDE, - setOf( - ) + setOf() ) ) @@ -277,4 +283,4 @@ class ExposedFilterRepositoryTest : AbstractRepositoryTest(Filters) { assertContentEquals(expected, actual) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedInstanceRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedInstanceRepositoryTest.kt index 1b6c47b5..38c66889 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedInstanceRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedInstanceRepositoryTest.kt @@ -22,7 +22,6 @@ import dev.usbharu.hideout.core.infrastructure.exposedrepository.Instance as Ins @TestInstance(TestInstance.Lifecycle.PER_CLASS) class ExposedInstanceRepositoryTest : AbstractRepositoryTest(InstanceTable) { - @Test fun save_idが同じレコードがない場合はinsertされる() = runTest { ExposedInstanceRepository().save( @@ -77,7 +76,6 @@ class ExposedInstanceRepositoryTest : AbstractRepositoryTest(InstanceTable) { } }.launch() - ExposedInstanceRepository().save( Instance( id = InstanceId(1), @@ -252,7 +250,6 @@ class ExposedInstanceRepositoryTest : AbstractRepositoryTest(InstanceTable) { .changeOfDeletionOnTable(InstanceTable.tableName) .rowAtStartPoint() .value(InstanceTable.id.name).isEqualTo(1) - } companion object { @@ -272,4 +269,3 @@ class ExposedInstanceRepositoryTest : AbstractRepositoryTest(InstanceTable) { } } } - diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedMediaRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedMediaRepositoryTest.kt index a1f7f425..dd4c4a6a 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedMediaRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedMediaRepositoryTest.kt @@ -14,7 +14,6 @@ import kotlin.test.assertNotNull import kotlin.test.assertNull import dev.usbharu.hideout.core.domain.model.media.Media as EntityMedia - class ExposedMediaRepositoryTest : AbstractRepositoryTest(Media) { @Test fun save_idが同じレコードが存在しないとinsert() = runTest { @@ -360,4 +359,4 @@ class ExposedMediaRepositoryTest : AbstractRepositoryTest(Media) { assertThat(actual) .hasSize(2) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedPostRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedPostRepositoryTest.kt index 569432cd..527212c2 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedPostRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedPostRepositoryTest.kt @@ -385,7 +385,6 @@ class ExposedPostRepositoryTest : AbstractRepositoryTest(Posts) { assertEquals(expect.mediaIds, actual.mediaIds) assertEquals(expect.visibleActors, actual.visibleActors) assertEquals(expect.hide, actual.hide) - } @Test @@ -972,7 +971,6 @@ class ExposedPostRepositoryTest : AbstractRepositoryTest(Posts) { @Test fun saveAll_idがある場合はinsertなければupdateされる() = runTest { - dbSetup(to = dataSource) { execute(disableReferenceIntegrityConstraints) insertInto("public.posts") { @@ -1152,7 +1150,10 @@ class ExposedPostRepositoryTest : AbstractRepositoryTest(Posts) { repostId = 1, moveTo = 1 ) - ).map { it.checkUpdate();it } + ).map { + it.checkUpdate() + it + } repository.saveAll(pl) @@ -1185,7 +1186,6 @@ class ExposedPostRepositoryTest : AbstractRepositoryTest(Posts) { false, null ) - } }.launch() @@ -1197,4 +1197,4 @@ class ExposedPostRepositoryTest : AbstractRepositoryTest(Posts) { verify(domainEventPublisher, times(1)).publishEvent(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedReactionRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedReactionRepositoryTest.kt index 40dd62ed..ab8c59c6 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedReactionRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedReactionRepositoryTest.kt @@ -34,7 +34,6 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { @Mock lateinit var domainEventPublisher: DomainEventPublisher - @Test fun save_idが同じレコードがなければinsert() = runTest { dbSetup(to = dataSource) { @@ -231,7 +230,6 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { val actual = repository.findById(ReactionId(1)) assertEquals(expected, actual) - } private fun assertEquals( @@ -285,12 +283,16 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { val actual1 = repository.existsByPostIdAndActorIdAndCustomEmojiIdOrUnicodeEmoji( PostId(1), - ActorId(1), CustomEmojiId - (1), "❤" + ActorId(1), + CustomEmojiId + (1), + "❤" ) val actual2 = repository.existsByPostIdAndActorIdAndCustomEmojiIdOrUnicodeEmoji( PostId(3), - ActorId(2), null, "❤" + ActorId(2), + null, + "❤" ) assertTrue(actual1) @@ -311,12 +313,16 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { val actual1 = repository.existsByPostIdAndActorIdAndCustomEmojiIdOrUnicodeEmoji( PostId(3), - ActorId(1), CustomEmojiId - (1), "❤" + ActorId(1), + CustomEmojiId + (1), + "❤" ) val actual2 = repository.existsByPostIdAndActorIdAndCustomEmojiIdOrUnicodeEmoji( PostId(2), - ActorId(2), null, "❤" + ActorId(2), + null, + "❤" ) assertFalse(actual1) @@ -371,8 +377,10 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { val actual = repository.findByPostIdAndActorIdAndCustomEmojiIdOrUnicodeEmoji( PostId(1), - ActorId(1), CustomEmojiId - (1), "❤" + ActorId(1), + CustomEmojiId + (1), + "❤" ) assertEquals(expected, actual) @@ -383,8 +391,10 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { assertNull( repository.findByPostIdAndActorIdAndCustomEmojiIdOrUnicodeEmoji( PostId(1), - ActorId(1), CustomEmojiId - (1), "❤" + ActorId(1), + CustomEmojiId + (1), + "❤" ) ) } @@ -397,9 +407,13 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { repository.save( Reaction.create( ReactionId(1), - PostId(1), ActorId - (1), CustomEmojiId - (1), UnicodeEmoji("❤"), Instant.now + PostId(1), + ActorId + (1), + CustomEmojiId + (1), + UnicodeEmoji("❤"), + Instant.now () ) ) @@ -423,9 +437,13 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { val reaction = Reaction( ReactionId(1), - PostId(1), ActorId - (1), CustomEmojiId - (1), UnicodeEmoji("❤"), Instant.now + PostId(1), + ActorId + (1), + CustomEmojiId + (1), + UnicodeEmoji("❤"), + Instant.now () ) reaction.delete() @@ -437,4 +455,4 @@ class ExposedReactionRepositoryTest : AbstractRepositoryTest(Reactions) { verify(domainEventPublisher, times(1)).publishEvent(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedRelationshipRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedRelationshipRepositoryTest.kt index 01d0f5ef..d0776f9a 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedRelationshipRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedRelationshipRepositoryTest.kt @@ -98,7 +98,8 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) }.launch() val relationship = Relationship.default( - ActorId(1), ActorId(2) + ActorId(1), + ActorId(2) ) repository.save(relationship) @@ -280,7 +281,8 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) }.launch() val relationship = Relationship.default( - ActorId(1), ActorId(2) + ActorId(1), + ActorId(2) ) change.withSuspend { @@ -292,7 +294,6 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) .rowAtStartPoint() .value(Relationships.actorId.name).isEqualTo(relationship.actorId.id) .value(Relationships.targetActorId.name).isEqualTo(relationship.targetActorId.id) - } @Test @@ -364,7 +365,9 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) ) val actual = repository.findByActorIdsAndTargetIdAndBlocking( - listOf(ActorId(1), ActorId(4)), ActorId(3), blocking = true + listOf(ActorId(1), ActorId(4)), + ActorId(3), + blocking = true ) assertContentEquals(expected, actual) @@ -382,7 +385,9 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) ) val actual2 = repository.findByActorIdsAndTargetIdAndBlocking( - listOf(ActorId(1), ActorId(4)), ActorId(3), blocking = false + listOf(ActorId(1), ActorId(4)), + ActorId(3), + blocking = false ) assertContentEquals(expected2, actual2) @@ -412,7 +417,8 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) muting = true, followRequesting = true, mutingFollowRequest = false - ), Relationship( + ), + Relationship( actorId = ActorId(1), targetActorId = ActorId(4), following = false, @@ -424,7 +430,9 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) ) val actual = repository.findByActorIdAndTargetIdsAndFollowing( - ActorId(1), listOf(ActorId(2), ActorId(3), ActorId(4)), following = true + ActorId(1), + listOf(ActorId(2), ActorId(3), ActorId(4)), + following = true ) assertContentEquals(expected, actual) @@ -442,7 +450,9 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) ) val actual2 = repository.findByActorIdAndTargetIdsAndFollowing( - ActorId(1), listOf(ActorId(2), ActorId(3), ActorId(4)), following = false + ActorId(1), + listOf(ActorId(2), ActorId(3), ActorId(4)), + following = false ) assertContentEquals(expected2, actual2) @@ -500,4 +510,4 @@ class ExposedRelationshipRepositoryTest : AbstractRepositoryTest(Relationships) verify(domainEventPublisher, times(1)).publishEvent(any()) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRelationshipRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRelationshipRepositoryTest.kt index 60e8ae36..ff2c422e 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRelationshipRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRelationshipRepositoryTest.kt @@ -63,7 +63,10 @@ class ExposedTimelineRelationshipRepositoryTest : AbstractRepositoryTest(Timelin }.launch() val relationship = TimelineRelationship( - TimelineRelationshipId(1), TimelineId(1), ActorId(1), Visible.PUBLIC + TimelineRelationshipId(1), + TimelineId(1), + ActorId(1), + Visible.PUBLIC ) ExposedTimelineRelationshipRepository().save(relationship) @@ -125,7 +128,10 @@ class ExposedTimelineRelationshipRepositoryTest : AbstractRepositoryTest(Timelin }.launch() val relationship = TimelineRelationship( - TimelineRelationshipId(1), TimelineId(1), ActorId(1), Visible.PUBLIC + TimelineRelationshipId(1), + TimelineId(1), + ActorId(1), + Visible.PUBLIC ) ExposedTimelineRelationshipRepository().save(relationship) @@ -150,8 +156,10 @@ class ExposedTimelineRelationshipRepositoryTest : AbstractRepositoryTest(Timelin val timelineRelationship = TimelineRelationship( TimelineRelationshipId(1), - TimelineId(1), ActorId - (3), Visible.PUBLIC + TimelineId(1), + ActorId + (3), + Visible.PUBLIC ) change.withSuspend { @@ -177,7 +185,6 @@ class ExposedTimelineRelationshipRepositoryTest : AbstractRepositoryTest(Timelin execute(enableReferenceIntegrityConstraints) }.launch() - val findByActorId = ExposedTimelineRelationshipRepository().findByActorId(actorId = ActorId(3)) assertThat(findByActorId) @@ -251,4 +258,4 @@ class ExposedTimelineRelationshipRepositoryTest : AbstractRepositoryTest(Timelin fun findByTimelineIdAndActorId_指定された条件で存在しないとnull() = runTest { ExposedTimelineRelationshipRepository().findByTimelineIdAndActorId(TimelineId(1), ActorId(1)) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepositoryTest.kt index 82e7e5a7..cbe0f0c1 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedTimelineRepositoryTest.kt @@ -71,7 +71,6 @@ class ExposedTimelineRepositoryTest : AbstractRepositoryTest(Timelines) { columns(Timelines.columns) values(1, 1, "test-timeline", "PUBLIC", true) } - }.launch() val timeline = Timeline( id = TimelineId(1), @@ -100,7 +99,6 @@ class ExposedTimelineRepositoryTest : AbstractRepositoryTest(Timelines) { columns(Timelines.columns) values(1, 1, "test-timeline", "PUBLIC", true) } - }.launch() val timeline = Timeline( id = TimelineId(1), @@ -150,7 +148,11 @@ class ExposedTimelineRepositoryTest : AbstractRepositoryTest(Timelines) { val actual = repository.findById(TimelineId(1)) val expected = Timeline( - TimelineId(1), UserDetailId(1), TimelineName("test-timeline"), TimelineVisibility.PUBLIC, true + TimelineId(1), + UserDetailId(1), + TimelineName("test-timeline"), + TimelineVisibility.PUBLIC, + true ) assertEquals(expected, actual) @@ -199,8 +201,10 @@ class ExposedTimelineRepositoryTest : AbstractRepositoryTest(Timelines) { ) timeline.setVisibility( - TimelineVisibility.PUBLIC, UserDetail.create( - UserDetailId(1), ActorId(1), + TimelineVisibility.PUBLIC, + UserDetail.create( + UserDetailId(1), + ActorId(1), UserDetailHashedPassword("aaaaaa"), ) ) @@ -224,7 +228,6 @@ class ExposedTimelineRepositoryTest : AbstractRepositoryTest(Timelines) { columns(Timelines.columns) values(1, 1, "test-timeline", "PUBLIC", true) } - }.launch() val timeline = Timeline( id = TimelineId(1), @@ -235,8 +238,10 @@ class ExposedTimelineRepositoryTest : AbstractRepositoryTest(Timelines) { ) timeline.setVisibility( - TimelineVisibility.PUBLIC, UserDetail.create( - UserDetailId(1), ActorId(1), + TimelineVisibility.PUBLIC, + UserDetail.create( + UserDetailId(1), + ActorId(1), UserDetailHashedPassword("aaaaaa"), ) ) diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedUserDetailRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedUserDetailRepositoryTest.kt index 532cbda6..88177294 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedUserDetailRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/exposedrepository/ExposedUserDetailRepositoryTest.kt @@ -175,7 +175,12 @@ class ExposedUserDetailRepositoryTest : AbstractRepositoryTest(UserDetails) { }.launch() val userDetail = UserDetail( - UserDetailId(1), ActorId(1), UserDetailHashedPassword("VeeeeeeeeeeeeeryStrongPassword"), false, null, null + UserDetailId(1), + ActorId(1), + UserDetailHashedPassword("VeeeeeeeeeeeeeryStrongPassword"), + false, + null, + null ) change.withSuspend { @@ -267,7 +272,12 @@ class ExposedUserDetailRepositoryTest : AbstractRepositoryTest(UserDetails) { insertInto("public.user_details") { columns(UserDetails.columns) values( - 1, 1, "$2a$10\$EBj3lstVOv0wz3CxLpzYJu8FFrUJ2MPJW9Vlklyg.bfGEOn5sqIwm", false, null, null + 1, + 1, + "$2a$10\$EBj3lstVOv0wz3CxLpzYJu8FFrUJ2MPJW9Vlklyg.bfGEOn5sqIwm", + false, + null, + null ) values( 2, @@ -353,7 +363,8 @@ class ExposedUserDetailRepositoryTest : AbstractRepositoryTest(UserDetails) { } private fun assertEquals( - actual: UserDetail?, expect: UserDetail + actual: UserDetail?, + expect: UserDetail ) { assertNotNull(actual) kotlin.test.assertEquals(expect, actual) diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/DefaultPostContentFormatterTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/DefaultPostContentFormatterTest.kt index 91c6413f..600c6506 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/DefaultPostContentFormatterTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/DefaultPostContentFormatterTest.kt @@ -72,4 +72,4 @@ class DefaultPostContentFormatterTest { assertEquals(FormattedPostContent("

a

", "a"), actual) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/TwitterSnowflakeIdGenerateServiceTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/TwitterSnowflakeIdGenerateServiceTest.kt index 0c7cb432..dea9f727 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/TwitterSnowflakeIdGenerateServiceTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/other/TwitterSnowflakeIdGenerateServiceTest.kt @@ -10,7 +10,6 @@ import org.junit.jupiter.api.Test class TwitterSnowflakeIdGenerateServiceTest { @Test fun noDuplicateTest() = runBlocking { - val mutableListOf = coroutineScope { (1..10000).map { async { @@ -21,4 +20,4 @@ class TwitterSnowflakeIdGenerateServiceTest { assertEquals(0, mutableListOf.size - mutableListOf.toSet().size) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImplTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImplTest.kt index 652de5f0..8343f557 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImplTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/springframework/oauth2/UserDetailsServiceImplTest.kt @@ -59,7 +59,8 @@ class UserDetailsServiceImplTest { fun userDetailが見つからない場合失敗() = runTest { whenever(actorRepository.findByNameAndDomain(eq("test"), eq("example.com"))).doReturn( TestActorFactory.create( - id = 1, actorName = "test" + id = 1, + actorName = "test" ) ) assertThrows { @@ -80,7 +81,8 @@ class UserDetailsServiceImplTest { whenever(userDetailRepository.findByActorId(eq(1))).doReturn( UserDetail.create( UserDetailId(1), - ActorId(1), UserDetailHashedPassword("") + ActorId(1), + UserDetailHashedPassword("") ) ) @@ -88,4 +90,4 @@ class UserDetailsServiceImplTest { assertEquals(HideoutUserDetails(HashSet(), "", "test-1", 1), actual) } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/DefaultTimelineStoreTest.kt b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/DefaultTimelineStoreTest.kt index eca2165c..ced71fc0 100644 --- a/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/DefaultTimelineStoreTest.kt +++ b/hideout/hideout-core/src/test/kotlin/dev/usbharu/hideout/core/infrastructure/timeline/DefaultTimelineStoreTest.kt @@ -117,7 +117,8 @@ class DefaultTimelineStoreTest { whenever(filterDomainService.apply(post, FilterContext.HOME, filters)).doReturn( FilteredPost( - post, listOf( + post, + listOf( FilterResult(filters.first(), "aaa") ) ) @@ -331,7 +332,8 @@ class DefaultTimelineStoreTest { whenever(filterDomainService.apply(post, FilterContext.HOME, filters)).doReturn( FilteredPost( - post, listOf( + post, + listOf( FilterResult(filters.first(), "aaa") ) ) @@ -404,7 +406,8 @@ class DefaultTimelineStoreTest { whenever(filterDomainService.apply(post, FilterContext.HOME, filters)).doReturn( FilteredPost( - post, listOf( + post, + listOf( FilterResult(filters.first(), "aaa") ) ) @@ -477,7 +480,8 @@ class DefaultTimelineStoreTest { whenever(filterDomainService.apply(post, FilterContext.HOME, filters)).doReturn( FilteredPost( - post, listOf( + post, + listOf( FilterResult(filters.first(), "aaa") ) ) @@ -503,4 +507,4 @@ class DefaultTimelineStoreTest { } } } -} \ No newline at end of file +} diff --git a/hideout/hideout-core/src/test/kotlin/utils/AbstractRepositoryTest.kt b/hideout/hideout-core/src/test/kotlin/utils/AbstractRepositoryTest.kt index 4499081a..5d3f4299 100644 --- a/hideout/hideout-core/src/test/kotlin/utils/AbstractRepositoryTest.kt +++ b/hideout/hideout-core/src/test/kotlin/utils/AbstractRepositoryTest.kt @@ -69,12 +69,13 @@ abstract class AbstractRepositoryTest(private val exposedTable: org.jetbrains.ex hikariConfig.transactionIsolation = "TRANSACTION_READ_UNCOMMITTED" dataSource = HikariDataSource(hikariConfig) - flyway = Flyway.configure().cleanDisabled(false).dataSource(dataSource).load() - Database.connect(dataSource, databaseConfig = DatabaseConfig { - defaultMaxAttempts = 1 - - }) + Database.connect( + dataSource, + databaseConfig = DatabaseConfig { + defaultMaxAttempts = 1 + } + ) flyway.clean() flyway.migrate() } @@ -121,4 +122,4 @@ suspend fun Changes.withSuspend(block: suspend () -> Unit) { } val disableReferenceIntegrityConstraints = Operations.sql("SET REFERENTIAL_INTEGRITY FALSE") -val enableReferenceIntegrityConstraints = Operations.sql("SET REFERENTIAL_INTEGRITY TRUE") \ No newline at end of file +val enableReferenceIntegrityConstraints = Operations.sql("SET REFERENTIAL_INTEGRITY TRUE") diff --git a/hideout/hideout-core/src/test/kotlin/utils/AssertDomainEvent.kt b/hideout/hideout-core/src/test/kotlin/utils/AssertDomainEvent.kt index d1d2c049..1b1f0561 100644 --- a/hideout/hideout-core/src/test/kotlin/utils/AssertDomainEvent.kt +++ b/hideout/hideout-core/src/test/kotlin/utils/AssertDomainEvent.kt @@ -32,4 +32,4 @@ object AssertDomainEvent { throw AssertionError("Domain Event found") } } -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringAccountApi.kt b/hideout/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringAccountApi.kt index 7f984a77..13acbd7a 100644 --- a/hideout/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringAccountApi.kt +++ b/hideout/hideout-mastodon/src/main/kotlin/dev/usbharu/hideout/mastodon/interfaces/api/SpringAccountApi.kt @@ -162,7 +162,9 @@ class SpringAccountApi( override suspend fun apiV1AccountsPost(accountsCreateRequest: AccountsCreateRequest): ResponseEntity = super.apiV1AccountsPost(accountsCreateRequest) - override suspend fun apiV1AccountsUpdateCredentialsPatch(updateCredentials: UpdateCredentials?): ResponseEntity = + override suspend fun apiV1AccountsUpdateCredentialsPatch( + updateCredentials: UpdateCredentials? + ): ResponseEntity = super.apiV1AccountsUpdateCredentialsPatch(updateCredentials) override suspend fun apiV1AccountsVerifyCredentialsGet(): ResponseEntity { diff --git a/hideout/hideout-mastodon/src/test/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImplTest.kt b/hideout/hideout-mastodon/src/test/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImplTest.kt index abf5bea5..856568ef 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImplTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/dev/usbharu/hideout/mastodon/infrastructure/exposedquery/StatusQueryServiceImplTest.kt @@ -15,7 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest import org.springframework.test.context.jdbc.Sql import org.springframework.transaction.annotation.Transactional - @Sql("/sql/actors.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Sql("/sql/relationships.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD) @Transactional @@ -41,4 +40,4 @@ class StatusQueryServiceImplTest { flyway.migrate() } } -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiPaginationTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiPaginationTest.kt index b237714e..b9f6c7cd 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiPaginationTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiPaginationTest.kt @@ -99,7 +99,6 @@ class AccountApiPaginationTest { val value = jacksonObjectMapper().readValue(content, object : TypeReference>() {}) - assertThat(value).isEmpty() } @@ -178,4 +177,4 @@ class AccountApiPaginationTest { flyway.migrate() } } -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiTest.kt index 0bbff8fc..8d195c10 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/account/AccountApiTest.kt @@ -293,11 +293,9 @@ class AccountApiTest { .asyncDispatch() .andExpect { status { isOk() } } - val alreadyFollow = relationshipRepository.findByActorIdAndTargetId(ActorId(3733363), ActorId(37335363))?.following - assertThat(alreadyFollow).isTrue() } diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/apps/AppTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/apps/AppTest.kt index 1b80163c..76e71675 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/apps/AppTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/apps/AppTest.kt @@ -52,7 +52,6 @@ class AppTest { @Autowired lateinit var jdbcOperations: JdbcOperations - val registeredClientRepository: JdbcRegisteredClientRepository by lazy { JdbcRegisteredClientRepository( jdbcOperations @@ -85,7 +84,6 @@ class AppTest { val clientId = objectMapper().readTree(contentAsString)["client_id"].asText() - val registeredClient = registeredClientRepository.findByClientId(clientId) assertNotNull(registeredClient) @@ -115,7 +113,6 @@ class AppTest { val clientId = objectMapper().readTree(contentAsString)["client_id"].asText() - val registeredClient = registeredClientRepository.findByClientId(clientId) assertNotNull(registeredClient) diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/filter/FilterTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/filter/FilterTest.kt index efda67e9..fe613de8 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/filter/FilterTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/filter/FilterTest.kt @@ -217,7 +217,6 @@ class FilterTest { .andExpect { status { isOk() } } } - @Test fun `apiV2FiltersIdGet read_filters権限で取得できる`() { mockMvc @@ -713,4 +712,4 @@ class FilterTest { flyway.migrate() } } -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt index f428f8b2..128eec26 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/media/MediaTest.kt @@ -57,11 +57,8 @@ class MediaTest { @Test fun メディアをアップロードできる() = runTest { - - mockMvc .multipart("/api/v1/media") { - file( MockMultipartFile( "file", @@ -78,11 +75,8 @@ class MediaTest { @Test fun write_mediaスコープでメディアをアップロードできる() = runTest { - - mockMvc .multipart("/api/v1/media") { - file( MockMultipartFile( "file", @@ -99,11 +93,8 @@ class MediaTest { @Test fun 権限がないと403() = runTest { - - mockMvc .multipart("/api/v1/media") { - file( MockMultipartFile( "file", @@ -125,5 +116,4 @@ class MediaTest { flyway.migrate() } } - } diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt index 97f6f8f1..40212759 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/ExposedNotificationsApiPaginationTest.kt @@ -40,12 +40,12 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders import org.springframework.transaction.annotation.Transactional import org.springframework.web.context.WebApplicationContext +// @Sql("/sql/notification/test-notifications.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) +// @Sql("/sql/notification/test-mastodon_notifications.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) @SpringBootTest(classes = [SpringApplication::class], properties = ["hideout.use-mongodb=false"]) @AutoConfigureMockMvc @Transactional @Sql("/sql/actors.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) -//@Sql("/sql/notification/test-notifications.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) -//@Sql("/sql/notification/test-mastodon_notifications.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) class ExposedNotificationsApiPaginationTest { @Autowired private lateinit var context: WebApplicationContext @@ -106,7 +106,6 @@ class ExposedNotificationsApiPaginationTest { assertThat(value.first().id).isEqualTo("25") assertThat(value.last().id).isEqualTo("1") - } @Test @@ -176,4 +175,4 @@ class ExposedNotificationsApiPaginationTest { flyway.migrate() } } -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt index c0debcd5..ec9df207 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/notifications/MongodbNotificationsApiPaginationTest.kt @@ -40,11 +40,11 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders import org.springframework.transaction.annotation.Transactional import org.springframework.web.context.WebApplicationContext +// @Sql("/sql/notification/test-notifications.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) @SpringBootTest(classes = [SpringApplication::class], properties = ["hideout.use-mongodb=true"]) @AutoConfigureMockMvc @Transactional @Sql("/sql/actors.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) -//@Sql("/sql/notification/test-notifications.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_CLASS) class MongodbNotificationsApiPaginationTest { @Autowired private lateinit var context: WebApplicationContext @@ -106,7 +106,6 @@ class MongodbNotificationsApiPaginationTest { Assertions.assertThat(value.first().id).isEqualTo("25") Assertions.assertThat(value.last().id).isEqualTo("1") - } @Test @@ -176,4 +175,4 @@ class MongodbNotificationsApiPaginationTest { flyway.migrate() } } -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/test/kotlin/mastodon/status/StatusTest.kt b/hideout/hideout-mastodon/src/test/kotlin/mastodon/status/StatusTest.kt index 35a4a8a6..8249c4f1 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/mastodon/status/StatusTest.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/mastodon/status/StatusTest.kt @@ -59,7 +59,6 @@ class StatusTest { private lateinit var mockMvc: MockMvc - @BeforeEach fun setUp() { mockMvc = MockMvcBuilders.webAppContextSetup(context) @@ -218,7 +217,6 @@ class StatusTest { Reactions.leftJoin(CustomEmojis).selectAll().where { Reactions.postId eq 1 and (Reactions.actorId eq 1) } .single() .toReaction() - } companion object { diff --git a/hideout/hideout-mastodon/src/test/kotlin/util/Json.kt b/hideout/hideout-mastodon/src/test/kotlin/util/Json.kt index fe49c2ca..573c30af 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/util/Json.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/util/Json.kt @@ -5,4 +5,4 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper fun objectMapper(): ObjectMapper { return jacksonObjectMapper() -} \ No newline at end of file +} diff --git a/hideout/hideout-mastodon/src/test/kotlin/util/TestTransaction.kt b/hideout/hideout-mastodon/src/test/kotlin/util/TestTransaction.kt index 8830ba4e..0f8b6317 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/util/TestTransaction.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/util/TestTransaction.kt @@ -18,7 +18,6 @@ package util import dev.usbharu.hideout.core.application.shared.Transaction - object TestTransaction : Transaction { override suspend fun transaction(block: suspend () -> T): T = block() diff --git a/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignature.kt b/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignature.kt index d7e58abc..b5080b41 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignature.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignature.kt @@ -16,16 +16,16 @@ package util -//@Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE) -//@Retention(AnnotationRetention.RUNTIME) -//@Inherited -//@MustBeDocumented -//@WithSecurityContext(factory = WithHttpSignatureSecurityContextFactory::class) -//annotation class WithHttpSignature( +// @Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE) +// @Retention(AnnotationRetention.RUNTIME) +// @Inherited +// @MustBeDocumented +// @WithSecurityContext(factory = WithHttpSignatureSecurityContextFactory::class) +// annotation class WithHttpSignature( // @get:AliasFor( // annotation = WithSecurityContext::class // ) val setupBefore: TestExecutionEvent = TestExecutionEvent.TEST_METHOD, // val keyId: String = "https://example.com/users/test-user#pubkey", // val url: String = "https://example.com/inbox", // val method: String = "GET" -//) +// ) diff --git a/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignatureSecurityContextFactory.kt b/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignatureSecurityContextFactory.kt index 626cf79e..286b20c1 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignatureSecurityContextFactory.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/util/WithHttpSignatureSecurityContextFactory.kt @@ -16,10 +16,10 @@ package util -//class WithHttpSignatureSecurityContextFactory( +// class WithHttpSignatureSecurityContextFactory( // private val actorRepository: ActorRepository, // private val transaction: Transaction -//) : WithSecurityContextFactory { +// ) : WithSecurityContextFactory { // // private val securityContextStrategy = SecurityContextHolder.getContextHolderStrategy() // @@ -49,4 +49,4 @@ package util // return@runBlocking emptyContext // } // -//} +// } diff --git a/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignature.kt b/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignature.kt index fcaba839..7ea06e1a 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignature.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignature.kt @@ -17,12 +17,12 @@ package util // -//@Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE) -//@Retention(AnnotationRetention.RUNTIME) -//@Inherited -//@MustBeDocumented -//@WithSecurityContext(factory = WithMockHttpSignatureSecurityContextFactory::class) -//annotation class WithMockHttpSignature( +// @Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE) +// @Retention(AnnotationRetention.RUNTIME) +// @Inherited +// @MustBeDocumented +// @WithSecurityContext(factory = WithMockHttpSignatureSecurityContextFactory::class) +// annotation class WithMockHttpSignature( // @get:AliasFor( // annotation = WithSecurityContext::class // ) val setupBefore: TestExecutionEvent = TestExecutionEvent.TEST_METHOD, @@ -32,4 +32,4 @@ package util // val id: Long = 1234L, // val url: String = "https://example.com/inbox", // val method: String = "GET" -//) +// ) diff --git a/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt b/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt index bf5218f6..60cea36d 100644 --- a/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt +++ b/hideout/hideout-mastodon/src/test/kotlin/util/WithMockHttpSignatureSecurityContextFactory.kt @@ -16,17 +16,17 @@ package util // -//import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureUser -//import dev.usbharu.httpsignature.common.HttpHeaders -//import dev.usbharu.httpsignature.common.HttpMethod -//import dev.usbharu.httpsignature.common.HttpRequest -//import org.springframework.security.core.context.SecurityContext -//import org.springframework.security.core.context.SecurityContextHolder -//import org.springframework.security.test.context.support.WithSecurityContextFactory -//import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken -//import java.net.URL +// import dev.usbharu.hideout.core.infrastructure.springframework.httpsignature.HttpSignatureUser +// import dev.usbharu.httpsignature.common.HttpHeaders +// import dev.usbharu.httpsignature.common.HttpMethod +// import dev.usbharu.httpsignature.common.HttpRequest +// import org.springframework.security.core.context.SecurityContext +// import org.springframework.security.core.context.SecurityContextHolder +// import org.springframework.security.test.context.support.WithSecurityContextFactory +// import org.springframework.security.web.authentication.preauth.PreAuthenticatedAuthenticationToken +// import java.net.URL // -//class WithMockHttpSignatureSecurityContextFactory : +// class WithMockHttpSignatureSecurityContextFactory : // WithSecurityContextFactory { // // private val securityContextStrategy = SecurityContextHolder.getContextHolderStrategy() @@ -52,4 +52,4 @@ package util // emptyContext.authentication = preAuthenticatedAuthenticationToken // return emptyContext // } -//} +// }