From 7164bb89faab81c6c8ce236506ac666db88ec70f Mon Sep 17 00:00:00 2001 From: murjune Date: Sat, 10 Feb 2024 05:15:28 +0900 Subject: [PATCH] [chore] ktFormat --- .../local/LocalUserDataSourceImpl.kt | 2 +- .../java/com/moya/funch/model/ProfileModel.kt | 1 - .../local/LocalUserDataSourceImplTest.kt | 19 ++++++++++++------- .../remote/RemoteUserDataSourceImplTest.kt | 13 ++++++------- .../repository/MemberRepositoryImplTest.kt | 18 +++++++++--------- .../funch/usecase/CreateUserProfileUseCase.kt | 10 ++-------- .../funch/usecase/LoadUserProfileUseCase.kt | 1 - .../moya/funch/entity/profile/ProfileTest.kt | 3 +-- .../network/service/MatchingServiceTest.kt | 2 +- 9 files changed, 32 insertions(+), 37 deletions(-) diff --git a/core/data/src/main/java/com/moya/funch/datasource/local/LocalUserDataSourceImpl.kt b/core/data/src/main/java/com/moya/funch/datasource/local/LocalUserDataSourceImpl.kt index 1654e54f..f6127fa8 100644 --- a/core/data/src/main/java/com/moya/funch/datasource/local/LocalUserDataSourceImpl.kt +++ b/core/data/src/main/java/com/moya/funch/datasource/local/LocalUserDataSourceImpl.kt @@ -2,8 +2,8 @@ package com.moya.funch.datasource.local import com.moya.funch.datastore.UserDataStore import com.moya.funch.model.ProfileModel -import timber.log.Timber import javax.inject.Inject +import timber.log.Timber class LocalUserDataSourceImpl @Inject constructor( private val userDataStore: UserDataStore diff --git a/core/data/src/main/java/com/moya/funch/model/ProfileModel.kt b/core/data/src/main/java/com/moya/funch/model/ProfileModel.kt index c05bbaa9..ea460c47 100644 --- a/core/data/src/main/java/com/moya/funch/model/ProfileModel.kt +++ b/core/data/src/main/java/com/moya/funch/model/ProfileModel.kt @@ -8,7 +8,6 @@ import com.moya.funch.entity.SubwayLine import com.moya.funch.entity.SubwayStation import com.moya.funch.entity.profile.Profile import com.moya.funch.network.dto.request.MemberRequest -import com.moya.funch.network.dto.response.match.SubwayResponse import com.moya.funch.network.dto.response.member.MemberResponse data class ProfileModel( diff --git a/core/data/src/test/java/com/moya/funch/datasource/local/LocalUserDataSourceImplTest.kt b/core/data/src/test/java/com/moya/funch/datasource/local/LocalUserDataSourceImplTest.kt index 5130a115..4e4cd97d 100644 --- a/core/data/src/test/java/com/moya/funch/datasource/local/LocalUserDataSourceImplTest.kt +++ b/core/data/src/test/java/com/moya/funch/datasource/local/LocalUserDataSourceImplTest.kt @@ -59,11 +59,13 @@ internal class LocalUserDataSourceImplTest { // when val actualResult: Result = localUserDataSource.fetchUserProfile() // then - assertAll({ coVerify(exactly = 1) { userDataStore.hasUserId() } }, + assertAll( + { coVerify(exactly = 1) { userDataStore.hasUserId() } }, { coVerify(exactly = 1) { userDataStore.userCode } }, { coVerify(exactly = 1) { userDataStore.mbti } }, { assertThat(actualResult.isSuccess).isTrue() }, - { assertThat(actualResult.getOrNull()).isEqualTo(expectedProfile) }) + { assertThat(actualResult.getOrNull()).isEqualTo(expectedProfile) } + ) } @Test @@ -73,9 +75,10 @@ internal class LocalUserDataSourceImplTest { // when val actualResult: Result = localUserDataSource.fetchUserProfile() // then - assertAll({ coVerify(exactly = 1) { userDataStore.hasUserId() } }, - { assertThat(actualResult.isFailure).isTrue() }) - + assertAll( + { coVerify(exactly = 1) { userDataStore.hasUserId() } }, + { assertThat(actualResult.isFailure).isTrue() } + ) } @Test @@ -95,10 +98,12 @@ internal class LocalUserDataSourceImplTest { // when val actualResult: Result = localUserDataSource.saveUserProfile(profile) // then - assertAll({ coVerify(exactly = 1) { userDataStore.clear() } }, + assertAll( + { coVerify(exactly = 1) { userDataStore.clear() } }, { coVerify(exactly = 1) { userDataStore.userCode = profile.userCode } }, { coVerify(exactly = 1) { userDataStore.mbti = profile.mbti } }, - { assertThat(actualResult.isSuccess).isTrue() }) + { assertThat(actualResult.isSuccess).isTrue() } + ) } companion object { diff --git a/core/data/src/test/java/com/moya/funch/datasource/remote/RemoteUserDataSourceImplTest.kt b/core/data/src/test/java/com/moya/funch/datasource/remote/RemoteUserDataSourceImplTest.kt index 4f82c13e..bf213ec7 100644 --- a/core/data/src/test/java/com/moya/funch/datasource/remote/RemoteUserDataSourceImplTest.kt +++ b/core/data/src/test/java/com/moya/funch/datasource/remote/RemoteUserDataSourceImplTest.kt @@ -36,11 +36,11 @@ internal class RemoteUserDataSourceImplTest { @Test fun `id가 있으면 id로 profile을 불러온다`() = runTest { - //given + // given coEvery { userDataStore.hasUserId() } returns true - //when + // when remoteUserDataSource.fetchUserProfile() - //then + // then assertAll( { coVerify(exactly = 1) { memberService.findMemberById(any()) } }, { coVerify(exactly = 0) { memberService.findMemberByDeviceNumber(any()) } } @@ -49,11 +49,11 @@ internal class RemoteUserDataSourceImplTest { @Test fun `id가 없으면 device id로 profile을 불러온다`() = runTest { - //given + // given coEvery { userDataStore.hasUserId() } returns false - //when + // when remoteUserDataSource.fetchUserProfile() - //then + // then assertAll( { coVerify(exactly = 0) { memberService.findMemberById(any()) } }, { coVerify(exactly = 1) { memberService.findMemberByDeviceNumber(any()) } } @@ -66,4 +66,3 @@ internal class RemoteUserDataSourceImplTest { val coroutineExtension = CoroutinesTestExtension() } } - diff --git a/core/data/src/test/java/com/moya/funch/repository/MemberRepositoryImplTest.kt b/core/data/src/test/java/com/moya/funch/repository/MemberRepositoryImplTest.kt index 97cd4760..704dd268 100644 --- a/core/data/src/test/java/com/moya/funch/repository/MemberRepositoryImplTest.kt +++ b/core/data/src/test/java/com/moya/funch/repository/MemberRepositoryImplTest.kt @@ -43,7 +43,7 @@ internal class MemberRepositoryImplTest { @Test fun `local에 User Profile이 있으면 불러온다`() = runTest { - //given + // given coEvery { localUserDataSource.fetchUserProfile() } returns Result.success( ProfileModel( userCode = "NONE", @@ -57,9 +57,9 @@ internal class MemberRepositoryImplTest { mbti = "INTJ" ) ) - //when + // when val result = memberRepository.fetchUserProfile() - //then + // then assertAll( { coVerify(exactly = 1) { localUserDataSource.fetchUserProfile() } }, { coVerify(exactly = 0) { remoteUserDataSource.fetchUserProfile() } }, @@ -70,7 +70,7 @@ internal class MemberRepositoryImplTest { @Test fun `local에 User Profile이 없으면 remote에서 불러온다`() = runTest { - //given + // given coEvery { localUserDataSource.fetchUserProfile() } returns Result.failure( Exception("User Profile not found") ) @@ -90,9 +90,9 @@ internal class MemberRepositoryImplTest { coEvery { localUserDataSource.saveUserProfile(any()) } returns Result.success( Unit ) - //when + // when val result = memberRepository.fetchUserProfile() - //then + // then assertAll( { coVerify(exactly = 1) { localUserDataSource.fetchUserProfile() } }, { coVerify(exactly = 1) { remoteUserDataSource.fetchUserProfile() } }, @@ -103,7 +103,7 @@ internal class MemberRepositoryImplTest { @Test fun `User Profile을 만들고 local에 저장한다`() = runTest { - //given + // given val profile = Profile() coEvery { remoteUserDataSource.createUserProfile(any()) } returns Result.success( ProfileModel( @@ -118,9 +118,9 @@ internal class MemberRepositoryImplTest { mbti = "INTJ" ) ) - //when + // when val profileResult = memberRepository.createUserProfile(profile) - //then + // then assertAll( { coVerify(exactly = 1) { remoteUserDataSource.createUserProfile(any()) } }, { coVerify(exactly = 1) { localUserDataSource.saveUserProfile(any()) } }, diff --git a/core/domain/src/main/java/com/moya/funch/usecase/CreateUserProfileUseCase.kt b/core/domain/src/main/java/com/moya/funch/usecase/CreateUserProfileUseCase.kt index 9ef131dd..0ae07abd 100644 --- a/core/domain/src/main/java/com/moya/funch/usecase/CreateUserProfileUseCase.kt +++ b/core/domain/src/main/java/com/moya/funch/usecase/CreateUserProfileUseCase.kt @@ -7,17 +7,11 @@ import javax.inject.Inject class CreateUserProfileUseCaseImpl @Inject constructor( private val memberRepository: MemberRepository ) : CreateUserProfileUseCase { - override suspend operator fun invoke( - profile: Profile - ): Result { + override suspend operator fun invoke(profile: Profile): Result { return memberRepository.createUserProfile(profile) } } fun interface CreateUserProfileUseCase { - suspend operator fun invoke( - profile: Profile - ): Result + suspend operator fun invoke(profile: Profile): Result } - - diff --git a/core/domain/src/main/java/com/moya/funch/usecase/LoadUserProfileUseCase.kt b/core/domain/src/main/java/com/moya/funch/usecase/LoadUserProfileUseCase.kt index cdecc9a0..c9603748 100644 --- a/core/domain/src/main/java/com/moya/funch/usecase/LoadUserProfileUseCase.kt +++ b/core/domain/src/main/java/com/moya/funch/usecase/LoadUserProfileUseCase.kt @@ -16,4 +16,3 @@ fun interface LoadUserProfileUseCase { suspend operator fun invoke(): Result } - diff --git a/core/domain/src/test/java/com/moya/funch/entity/profile/ProfileTest.kt b/core/domain/src/test/java/com/moya/funch/entity/profile/ProfileTest.kt index c6d9cbdc..38afe6fe 100644 --- a/core/domain/src/test/java/com/moya/funch/entity/profile/ProfileTest.kt +++ b/core/domain/src/test/java/com/moya/funch/entity/profile/ProfileTest.kt @@ -9,7 +9,6 @@ class ProfileTest { @Test fun `code는 모두 숫자 혹은 대문자 알파벳이다`() { - assertThrows("Code must be all numbers or upper case alphabets") { Profile(code = "a123") } @@ -37,7 +36,7 @@ class ProfileTest { assertThrows("Code must not be blank") { Profile(code = "123") } - }, + } ) } diff --git a/core/network/src/test/java/com/moya/funch/network/service/MatchingServiceTest.kt b/core/network/src/test/java/com/moya/funch/network/service/MatchingServiceTest.kt index c810465a..e6a4f5b8 100644 --- a/core/network/src/test/java/com/moya/funch/network/service/MatchingServiceTest.kt +++ b/core/network/src/test/java/com/moya/funch/network/service/MatchingServiceTest.kt @@ -10,6 +10,7 @@ import com.moya.funch.network.dto.response.match.ProfileResponse import com.moya.funch.network.dto.response.match.RecommendResponse import com.moya.funch.rule.CoroutinesTestExtension import io.mockk.junit5.MockKExtension +import java.io.File import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runTest import kotlinx.serialization.json.Json @@ -22,7 +23,6 @@ import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.RegisterExtension import retrofit2.Retrofit import retrofit2.create -import java.io.File @OptIn(ExperimentalCoroutinesApi::class) @ExtendWith(MockKExtension::class)