From 351e99cbe95e52dc01245d33c57eb4d380fe023f Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Wed, 1 Nov 2023 13:51:11 +0900 Subject: [PATCH] =?UTF-8?q?test:=20=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC=E3=82=B8=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/ap => activitypub/domain/model}/UndoTest.kt | 4 +--- .../activity/accept}/APAcceptServiceImplTest.kt | 3 +-- .../activity/create}/APCreateServiceImplTest.kt | 3 +-- .../follow}/APReceiveFollowServiceImplTest.kt | 4 +--- .../activity/follow}/APSendFollowServiceImplTest.kt | 3 +-- .../service/activity/like}/APLikeServiceImplTest.kt | 3 +-- .../activity/like}/APReactionServiceImplTest.kt | 3 +-- .../activity/like}/ApReactionJobServiceImplTest.kt | 3 +-- .../service/activity/undo}/APUndoServiceImplTest.kt | 3 +-- .../service/common}/APRequestServiceImplTest.kt | 3 +-- .../common}/APResourceResolveServiceImplTest.kt | 11 +---------- .../service/common}/APServiceImplTest.kt | 4 +--- .../service/object/note}/APNoteServiceImplTest.kt | 7 +------ .../service/object/note}/ApNoteJobServiceImplTest.kt | 4 +--- .../id}/TwitterSnowflakeIdGenerateServiceTest.kt | 3 +-- .../service/init}/MetaServiceImplTest.kt | 3 +-- .../service/init}/ServerInitialiseServiceImplTest.kt | 3 +-- .../{ => core}/service/user/UserServiceTest.kt | 3 +-- 18 files changed, 18 insertions(+), 52 deletions(-) rename src/test/kotlin/dev/usbharu/hideout/{domain/model/ap => activitypub/domain/model}/UndoTest.kt (93%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/accept}/APAcceptServiceImplTest.kt (97%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/create}/APCreateServiceImplTest.kt (95%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/follow}/APReceiveFollowServiceImplTest.kt (96%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/follow}/APSendFollowServiceImplTest.kt (90%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/like}/APLikeServiceImplTest.kt (97%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/like}/APReactionServiceImplTest.kt (96%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap/job => activitypub/service/activity/like}/ApReactionJobServiceImplTest.kt (97%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/activity/undo}/APUndoServiceImplTest.kt (93%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/common}/APRequestServiceImplTest.kt (99%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap/resource => activitypub/service/common}/APResourceResolveServiceImplTest.kt (90%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/common}/APServiceImplTest.kt (97%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap => activitypub/service/object/note}/APNoteServiceImplTest.kt (98%) rename src/test/kotlin/dev/usbharu/hideout/{service/ap/job => activitypub/service/object/note}/ApNoteJobServiceImplTest.kt (93%) rename src/test/kotlin/dev/usbharu/hideout/{service/core => application/service/id}/TwitterSnowflakeIdGenerateServiceTest.kt (88%) rename src/test/kotlin/dev/usbharu/hideout/{service/core => application/service/init}/MetaServiceImplTest.kt (96%) rename src/test/kotlin/dev/usbharu/hideout/{service/core => application/service/init}/ServerInitialiseServiceImplTest.kt (95%) rename src/test/kotlin/dev/usbharu/hideout/{ => core}/service/user/UserServiceTest.kt (98%) diff --git a/src/test/kotlin/dev/usbharu/hideout/domain/model/ap/UndoTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt similarity index 93% rename from src/test/kotlin/dev/usbharu/hideout/domain/model/ap/UndoTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt index eb9a1f9e..97ba9bc4 100644 --- a/src/test/kotlin/dev/usbharu/hideout/domain/model/ap/UndoTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/domain/model/UndoTest.kt @@ -1,7 +1,5 @@ -package dev.usbharu.hideout.domain.model.ap +package dev.usbharu.hideout.activitypub.domain.model -import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.activitypub.domain.model.Undo import org.intellij.lang.annotations.Language import org.junit.jupiter.api.Test import utils.JsonObjectMapper diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APAcceptServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APAcceptServiceImplTest.kt similarity index 97% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APAcceptServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APAcceptServiceImplTest.kt index 14e8154f..77b3f74d 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APAcceptServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/accept/APAcceptServiceImplTest.kt @@ -1,11 +1,10 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.accept import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException import dev.usbharu.hideout.activitypub.domain.model.Accept import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Like import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse -import dev.usbharu.hideout.activitypub.service.activity.accept.APAcceptServiceImpl import dev.usbharu.hideout.core.query.FollowerQueryService import dev.usbharu.hideout.core.query.UserQueryService import dev.usbharu.hideout.core.service.user.UserService diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APCreateServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt similarity index 95% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APCreateServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt index ee0889fc..4ec47449 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APCreateServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/create/APCreateServiceImplTest.kt @@ -1,11 +1,10 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.create import dev.usbharu.hideout.activitypub.domain.exception.IllegalActivityPubObjectException import dev.usbharu.hideout.activitypub.domain.model.Create import dev.usbharu.hideout.activitypub.domain.model.Like import dev.usbharu.hideout.activitypub.domain.model.Note import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse -import dev.usbharu.hideout.activitypub.service.activity.create.APCreateServiceImpl import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService import io.ktor.http.* import kotlinx.coroutines.test.runTest diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt similarity index 96% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt index 77df2f55..c01f2570 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReceiveFollowServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APReceiveFollowServiceImplTest.kt @@ -1,14 +1,12 @@ @file:OptIn(ExperimentalCoroutinesApi::class) @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.follow import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Image import dev.usbharu.hideout.activitypub.domain.model.Key import dev.usbharu.hideout.activitypub.domain.model.Person -import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowJobServiceImpl -import dev.usbharu.hideout.activitypub.service.activity.follow.APReceiveFollowServiceImpl import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.application.config.CharacterLimit diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APSendFollowServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt similarity index 90% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APSendFollowServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt index f6b6ce3c..6ce3a084 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APSendFollowServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/follow/APSendFollowServiceImplTest.kt @@ -1,7 +1,6 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.follow import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.activitypub.service.activity.follow.APSendFollowServiceImpl import dev.usbharu.hideout.activitypub.service.common.APRequestService import dev.usbharu.hideout.core.service.follow.SendFollowDto import kotlinx.coroutines.test.runTest diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APLikeServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt similarity index 97% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APLikeServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt index 17ad28f3..2f4ce89a 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APLikeServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APLikeServiceImplTest.kt @@ -1,11 +1,10 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.like import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException import dev.usbharu.hideout.activitypub.domain.model.Like import dev.usbharu.hideout.activitypub.domain.model.Note import dev.usbharu.hideout.activitypub.domain.model.Person import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse -import dev.usbharu.hideout.activitypub.service.activity.like.APLikeServiceImpl import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteService import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService import dev.usbharu.hideout.core.query.PostQueryService diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReactionServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt similarity index 96% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APReactionServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt index c95ff088..beffd8e0 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APReactionServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/APReactionServiceImplTest.kt @@ -1,7 +1,6 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.like -import dev.usbharu.hideout.activitypub.service.activity.like.APReactionServiceImpl import dev.usbharu.hideout.application.service.id.TwitterSnowflakeIdGenerateService import dev.usbharu.hideout.core.domain.model.reaction.Reaction import dev.usbharu.hideout.core.external.job.DeliverReactionJob diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/job/ApReactionJobServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobServiceImplTest.kt similarity index 97% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/job/ApReactionJobServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobServiceImplTest.kt index 25fcd7f0..22763ca8 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/job/ApReactionJobServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/like/ApReactionJobServiceImplTest.kt @@ -1,10 +1,9 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package dev.usbharu.hideout.service.ap.job +package dev.usbharu.hideout.activitypub.service.activity.like import dev.usbharu.hideout.activitypub.domain.model.Like import dev.usbharu.hideout.activitypub.domain.model.Undo -import dev.usbharu.hideout.activitypub.service.activity.like.ApReactionJobServiceImpl import dev.usbharu.hideout.activitypub.service.common.APRequestService import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.external.job.DeliverReactionJob diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APUndoServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoServiceImplTest.kt similarity index 93% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APUndoServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoServiceImplTest.kt index 49e91303..fb187aec 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APUndoServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/activity/undo/APUndoServiceImplTest.kt @@ -1,9 +1,8 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.activity.undo import dev.usbharu.hideout.activitypub.domain.model.Follow import dev.usbharu.hideout.activitypub.domain.model.Undo import dev.usbharu.hideout.activitypub.interfaces.api.common.ActivityPubStringResponse -import dev.usbharu.hideout.activitypub.service.activity.undo.APUndoServiceImpl import dev.usbharu.hideout.core.query.UserQueryService import io.ktor.http.* import kotlinx.coroutines.test.runTest diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APRequestServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt similarity index 99% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APRequestServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt index a8cdd101..ec36d233 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APRequestServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APRequestServiceImplTest.kt @@ -1,8 +1,7 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.common import com.fasterxml.jackson.module.kotlin.readValue import dev.usbharu.hideout.activitypub.domain.model.Follow -import dev.usbharu.hideout.activitypub.service.common.APRequestServiceImpl import dev.usbharu.hideout.util.Base64Util import dev.usbharu.httpsignature.common.HttpHeaders import dev.usbharu.httpsignature.common.HttpMethod diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/resource/APResourceResolveServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt similarity index 90% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/resource/APResourceResolveServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt index 83225972..4d02925a 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/resource/APResourceResolveServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APResourceResolveServiceImplTest.kt @@ -1,13 +1,5 @@ -package dev.usbharu.hideout.service.ap.resource +package dev.usbharu.hideout.activitypub.service.common -import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.activitypub.service.common.APResourceResolveServiceImpl -import dev.usbharu.hideout.activitypub.service.common.InMemoryCacheManager -import dev.usbharu.hideout.activitypub.service.common.resolve -import dev.usbharu.hideout.application.config.ApplicationConfig -import dev.usbharu.hideout.application.config.CharacterLimit -import dev.usbharu.hideout.core.domain.model.post.Post -import dev.usbharu.hideout.core.domain.model.user.User import dev.usbharu.hideout.core.domain.model.user.UserRepository import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll @@ -17,7 +9,6 @@ import org.junit.jupiter.api.extension.ExtendWith import org.mockito.junit.jupiter.MockitoExtension import org.mockito.kotlin.* import utils.UserBuilder -import java.net.URL import dev.usbharu.hideout.activitypub.domain.model.`object`.Object as APObject @ExtendWith(MockitoExtension::class) diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt similarity index 97% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt index ac8ebb99..0ddef889 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/common/APServiceImplTest.kt @@ -1,8 +1,6 @@ -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.common import dev.usbharu.hideout.activitypub.domain.exception.JsonParseException -import dev.usbharu.hideout.activitypub.service.common.APServiceImpl -import dev.usbharu.hideout.activitypub.service.common.ActivityType import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.mockito.kotlin.mock diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteServiceImplTest.kt similarity index 98% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteServiceImplTest.kt index 134432dd..775fd9b3 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/APNoteServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/APNoteServiceImplTest.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalCoroutinesApi::class) @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package dev.usbharu.hideout.service.ap +package dev.usbharu.hideout.activitypub.service.`object`.note import dev.usbharu.hideout.activitypub.domain.exception.FailedToGetActivityPubResourceException import dev.usbharu.hideout.activitypub.domain.model.Image @@ -8,9 +8,7 @@ import dev.usbharu.hideout.activitypub.domain.model.Key import dev.usbharu.hideout.activitypub.domain.model.Note import dev.usbharu.hideout.activitypub.domain.model.Person import dev.usbharu.hideout.activitypub.service.common.APResourceResolveService -import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl.Companion.public -import dev.usbharu.hideout.activitypub.service.`object`.note.ApNoteJobServiceImpl import dev.usbharu.hideout.activitypub.service.`object`.user.APUserService import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.application.config.CharacterLimit @@ -37,12 +35,10 @@ import io.ktor.http.* import io.ktor.http.content.* import io.ktor.util.* import io.ktor.util.date.* -import kjob.core.job.JobProps import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job import kotlinx.coroutines.test.runTest -import kotlinx.serialization.json.Json import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows @@ -50,7 +46,6 @@ import org.mockito.Mockito.anyLong import org.mockito.kotlin.* import utils.JsonObjectMapper.objectMapper import utils.PostBuilder -import utils.TestTransaction import utils.UserBuilder import java.net.URL import java.time.Instant diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ap/job/ApNoteJobServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImplTest.kt similarity index 93% rename from src/test/kotlin/dev/usbharu/hideout/service/ap/job/ApNoteJobServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImplTest.kt index 43c6a71d..202db338 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ap/job/ApNoteJobServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/activitypub/service/object/note/ApNoteJobServiceImplTest.kt @@ -1,12 +1,10 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package dev.usbharu.hideout.service.ap.job +package dev.usbharu.hideout.activitypub.service.`object`.note import dev.usbharu.hideout.activitypub.domain.model.Create import dev.usbharu.hideout.activitypub.domain.model.Note import dev.usbharu.hideout.activitypub.service.common.APRequestService -import dev.usbharu.hideout.activitypub.service.`object`.note.APNoteServiceImpl -import dev.usbharu.hideout.activitypub.service.`object`.note.ApNoteJobServiceImpl import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.core.external.job.DeliverPostJob import dev.usbharu.hideout.core.query.UserQueryService diff --git a/src/test/kotlin/dev/usbharu/hideout/service/core/TwitterSnowflakeIdGenerateServiceTest.kt b/src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt similarity index 88% rename from src/test/kotlin/dev/usbharu/hideout/service/core/TwitterSnowflakeIdGenerateServiceTest.kt rename to src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt index cf15303e..b0f75b19 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/core/TwitterSnowflakeIdGenerateServiceTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/application/service/id/TwitterSnowflakeIdGenerateServiceTest.kt @@ -1,7 +1,6 @@ -package dev.usbharu.hideout.service.core +package dev.usbharu.hideout.application.service.id // import kotlinx.coroutines.NonCancellable.message -import dev.usbharu.hideout.application.service.id.TwitterSnowflakeIdGenerateService import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch diff --git a/src/test/kotlin/dev/usbharu/hideout/service/core/MetaServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt similarity index 96% rename from src/test/kotlin/dev/usbharu/hideout/service/core/MetaServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt index 6432ead4..f809087d 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/core/MetaServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/application/service/init/MetaServiceImplTest.kt @@ -1,8 +1,7 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service.core +package dev.usbharu.hideout.application.service.init -import dev.usbharu.hideout.application.service.init.MetaServiceImpl import dev.usbharu.hideout.core.domain.exception.NotInitException import dev.usbharu.hideout.core.domain.model.meta.Jwt import dev.usbharu.hideout.core.domain.model.meta.Meta diff --git a/src/test/kotlin/dev/usbharu/hideout/service/core/ServerInitialiseServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt similarity index 95% rename from src/test/kotlin/dev/usbharu/hideout/service/core/ServerInitialiseServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt index 18e7ced6..33b28e59 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/core/ServerInitialiseServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/application/service/init/ServerInitialiseServiceImplTest.kt @@ -1,8 +1,7 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service.core +package dev.usbharu.hideout.application.service.init -import dev.usbharu.hideout.application.service.init.ServerInitialiseServiceImpl import dev.usbharu.hideout.core.domain.model.meta.Jwt import dev.usbharu.hideout.core.domain.model.meta.Meta import dev.usbharu.hideout.core.domain.model.meta.MetaRepository diff --git a/src/test/kotlin/dev/usbharu/hideout/service/user/UserServiceTest.kt b/src/test/kotlin/dev/usbharu/hideout/core/service/user/UserServiceTest.kt similarity index 98% rename from src/test/kotlin/dev/usbharu/hideout/service/user/UserServiceTest.kt rename to src/test/kotlin/dev/usbharu/hideout/core/service/user/UserServiceTest.kt index e0664f2c..a39dbd70 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/user/UserServiceTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/core/service/user/UserServiceTest.kt @@ -1,13 +1,12 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service.user +package dev.usbharu.hideout.core.service.user import dev.usbharu.hideout.application.config.ApplicationConfig import dev.usbharu.hideout.application.config.CharacterLimit import dev.usbharu.hideout.core.domain.model.post.Post import dev.usbharu.hideout.core.domain.model.user.User import dev.usbharu.hideout.core.domain.model.user.UserRepository -import dev.usbharu.hideout.core.service.user.* import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Test