From 56bc156aa22cc53ba1138ff35c45b699e6af3780 Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 3 Jun 2023 11:31:07 +0900 Subject: [PATCH] =?UTF-8?q?test:=20=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../usbharu/hideout/service/{ => auth}/JwtServiceImplTest.kt | 3 +-- .../hideout/service/{ => core}/MetaServiceImplTest.kt | 3 +-- .../service/{ => core}/ServerInitialiseServiceImplTest.kt | 3 +-- .../{ => core}/TwitterSnowflakeIdGenerateServiceTest.kt | 3 +-- .../hideout/service/{impl => post}/PostServiceTest.kt | 3 +-- .../hideout/service/{impl => user}/UserServiceTest.kt | 5 +---- 6 files changed, 6 insertions(+), 14 deletions(-) rename src/test/kotlin/dev/usbharu/hideout/service/{ => auth}/JwtServiceImplTest.kt (98%) rename src/test/kotlin/dev/usbharu/hideout/service/{ => core}/MetaServiceImplTest.kt (96%) rename src/test/kotlin/dev/usbharu/hideout/service/{ => core}/ServerInitialiseServiceImplTest.kt (95%) rename src/test/kotlin/dev/usbharu/hideout/service/{ => core}/TwitterSnowflakeIdGenerateServiceTest.kt (89%) rename src/test/kotlin/dev/usbharu/hideout/service/{impl => post}/PostServiceTest.kt (98%) rename src/test/kotlin/dev/usbharu/hideout/service/{impl => user}/UserServiceTest.kt (95%) diff --git a/src/test/kotlin/dev/usbharu/hideout/service/JwtServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/auth/JwtServiceImplTest.kt similarity index 98% rename from src/test/kotlin/dev/usbharu/hideout/service/JwtServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/auth/JwtServiceImplTest.kt index ee52c03f..f5cc0ec6 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/JwtServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/auth/JwtServiceImplTest.kt @@ -1,6 +1,6 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service +package dev.usbharu.hideout.service.auth import com.auth0.jwt.JWT import com.auth0.jwt.algorithms.Algorithm @@ -13,7 +13,6 @@ import dev.usbharu.hideout.domain.model.hideout.entity.User import dev.usbharu.hideout.domain.model.hideout.form.RefreshToken import dev.usbharu.hideout.exception.InvalidRefreshTokenException import dev.usbharu.hideout.repository.IJwtRefreshTokenRepository -import dev.usbharu.hideout.service.auth.JwtServiceImpl import dev.usbharu.hideout.service.core.IMetaService import dev.usbharu.hideout.service.user.IUserService import dev.usbharu.hideout.util.Base64Util diff --git a/src/test/kotlin/dev/usbharu/hideout/service/MetaServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/core/MetaServiceImplTest.kt similarity index 96% rename from src/test/kotlin/dev/usbharu/hideout/service/MetaServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/core/MetaServiceImplTest.kt index 90534a60..52899fb0 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/MetaServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/core/MetaServiceImplTest.kt @@ -1,12 +1,11 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service +package dev.usbharu.hideout.service.core import dev.usbharu.hideout.domain.model.hideout.entity.Jwt import dev.usbharu.hideout.domain.model.hideout.entity.Meta import dev.usbharu.hideout.exception.NotInitException import dev.usbharu.hideout.repository.IMetaRepository -import dev.usbharu.hideout.service.core.MetaServiceImpl import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/dev/usbharu/hideout/service/ServerInitialiseServiceImplTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/core/ServerInitialiseServiceImplTest.kt similarity index 95% rename from src/test/kotlin/dev/usbharu/hideout/service/ServerInitialiseServiceImplTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/core/ServerInitialiseServiceImplTest.kt index b19b9f8b..68367c14 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/ServerInitialiseServiceImplTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/core/ServerInitialiseServiceImplTest.kt @@ -1,11 +1,10 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service +package dev.usbharu.hideout.service.core import dev.usbharu.hideout.domain.model.hideout.entity.Jwt import dev.usbharu.hideout.domain.model.hideout.entity.Meta import dev.usbharu.hideout.repository.IMetaRepository -import dev.usbharu.hideout.service.core.ServerInitialiseServiceImpl import dev.usbharu.hideout.util.ServerUtil import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest diff --git a/src/test/kotlin/dev/usbharu/hideout/service/TwitterSnowflakeIdGenerateServiceTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/core/TwitterSnowflakeIdGenerateServiceTest.kt similarity index 89% rename from src/test/kotlin/dev/usbharu/hideout/service/TwitterSnowflakeIdGenerateServiceTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/core/TwitterSnowflakeIdGenerateServiceTest.kt index 7d1969f4..92bf53bb 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/TwitterSnowflakeIdGenerateServiceTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/core/TwitterSnowflakeIdGenerateServiceTest.kt @@ -1,7 +1,6 @@ -package dev.usbharu.hideout.service +package dev.usbharu.hideout.service.core // import kotlinx.coroutines.NonCancellable.message -import dev.usbharu.hideout.service.core.TwitterSnowflakeIdGenerateService import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.launch diff --git a/src/test/kotlin/dev/usbharu/hideout/service/impl/PostServiceTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/post/PostServiceTest.kt similarity index 98% rename from src/test/kotlin/dev/usbharu/hideout/service/impl/PostServiceTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/post/PostServiceTest.kt index 938f7aac..92c517a6 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/impl/PostServiceTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/post/PostServiceTest.kt @@ -1,13 +1,12 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service.impl +package dev.usbharu.hideout.service.post import dev.usbharu.hideout.domain.model.hideout.entity.Post import dev.usbharu.hideout.domain.model.hideout.entity.Visibility import dev.usbharu.hideout.repository.Posts import dev.usbharu.hideout.repository.UsersFollowers import dev.usbharu.hideout.service.core.TwitterSnowflakeIdGenerateService -import dev.usbharu.hideout.service.post.PostService import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.jetbrains.exposed.sql.Database diff --git a/src/test/kotlin/dev/usbharu/hideout/service/impl/UserServiceTest.kt b/src/test/kotlin/dev/usbharu/hideout/service/user/UserServiceTest.kt similarity index 95% rename from src/test/kotlin/dev/usbharu/hideout/service/impl/UserServiceTest.kt rename to src/test/kotlin/dev/usbharu/hideout/service/user/UserServiceTest.kt index 8bf83071..4fcdedb3 100644 --- a/src/test/kotlin/dev/usbharu/hideout/service/impl/UserServiceTest.kt +++ b/src/test/kotlin/dev/usbharu/hideout/service/user/UserServiceTest.kt @@ -1,15 +1,12 @@ @file:OptIn(ExperimentalCoroutinesApi::class) -package dev.usbharu.hideout.service.impl +package dev.usbharu.hideout.service.user import dev.usbharu.hideout.config.Config import dev.usbharu.hideout.config.ConfigData import dev.usbharu.hideout.domain.model.hideout.dto.RemoteUserCreateDto import dev.usbharu.hideout.domain.model.hideout.dto.UserCreateDto import dev.usbharu.hideout.repository.IUserRepository -import dev.usbharu.hideout.service.user.IUserAuthService -import dev.usbharu.hideout.service.user.UserService -import dev.usbharu.hideout.service.user.toPem import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import org.junit.jupiter.api.Test