From b129913a82d944f13ff9c5a1da35f0ba9ed18c91 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 5 Apr 2022 19:20:39 +0500 Subject: [PATCH] Clear unused and fix tests --- .../data/storage/PreferencesStorage.kt | 2 - .../data/storage/PreferencesStorageImpl.kt | 2 - .../gq/kirmanak/mealient/di/AuthModule.kt | 3 +- .../mealient/ui/auth/AuthenticatorActivity.kt | 9 ----- .../res/layout/authenticator_activity.xml | 38 ------------------- .../res/navigation/authenticator_graph.xml | 13 ------- .../data/auth/impl/AuthDataSourceImplTest.kt | 6 ++- .../network/RetrofitServiceFactoryTest.kt | 8 ++-- .../storage/PreferencesStorageImplTest.kt | 18 ++++----- 9 files changed, 19 insertions(+), 80 deletions(-) delete mode 100644 app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticatorActivity.kt delete mode 100644 app/src/main/res/layout/authenticator_activity.xml delete mode 100644 app/src/main/res/navigation/authenticator_graph.xml diff --git a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt b/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt index f63dc9b..31e9174 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorage.kt @@ -7,8 +7,6 @@ interface PreferencesStorage { val baseUrlKey: Preferences.Key - val authHeaderKey: Preferences.Key - val isDisclaimerAcceptedKey: Preferences.Key suspend fun getValue(key: Preferences.Key): T? diff --git a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt index a382682..de71ff0 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImpl.kt @@ -17,8 +17,6 @@ class PreferencesStorageImpl @Inject constructor( override val baseUrlKey = stringPreferencesKey("baseUrl") - override val authHeaderKey = stringPreferencesKey("authHeader") - override val isDisclaimerAcceptedKey = booleanPreferencesKey("isDisclaimedAccepted") override suspend fun getValue(key: Preferences.Key): T? { diff --git a/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt index 7a5a272..ac5d54d 100644 --- a/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt +++ b/app/src/main/java/gq/kirmanak/mealient/di/AuthModule.kt @@ -31,7 +31,8 @@ interface AuthModule { @Provides @Singleton - fun provideAuthServiceFactory(retrofitBuilder: RetrofitBuilder, + fun provideAuthServiceFactory( + retrofitBuilder: RetrofitBuilder, baseURLStorage: BaseURLStorage, ): ServiceFactory = retrofitBuilder.createServiceFactory(baseURLStorage) diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticatorActivity.kt b/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticatorActivity.kt deleted file mode 100644 index 69692d7..0000000 --- a/app/src/main/java/gq/kirmanak/mealient/ui/auth/AuthenticatorActivity.kt +++ /dev/null @@ -1,9 +0,0 @@ -package gq.kirmanak.mealient.ui.auth - -import androidx.appcompat.app.AppCompatActivity -import dagger.hilt.android.AndroidEntryPoint - -@AndroidEntryPoint -class AuthenticatorActivity : AppCompatActivity() { - -} \ No newline at end of file diff --git a/app/src/main/res/layout/authenticator_activity.xml b/app/src/main/res/layout/authenticator_activity.xml deleted file mode 100644 index 515be2e..0000000 --- a/app/src/main/res/layout/authenticator_activity.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/navigation/authenticator_graph.xml b/app/src/main/res/navigation/authenticator_graph.xml deleted file mode 100644 index 12e281c..0000000 --- a/app/src/main/res/navigation/authenticator_graph.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImplTest.kt index 5f414d4..10a405f 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthDataSourceImplTest.kt @@ -32,7 +32,7 @@ class AuthDataSourceImplTest { fun setUp() { MockKAnnotations.init(this) subject = AuthDataSourceImpl(authServiceFactory, NetworkModule.createJson()) - coEvery { authServiceFactory.provideService() } returns authService + coEvery { authServiceFactory.provideService(any(), eq(false)) } returns authService } @Test @@ -71,7 +71,9 @@ class AuthDataSourceImplTest { @Test(expected = MalformedUrl::class) fun `when authenticate and provideService throws then MalformedUrl`() = runTest { - coEvery { authServiceFactory.provideService() } throws MalformedUrl(RuntimeException()) + coEvery { + authServiceFactory.provideService(any(), eq(false)) + } throws MalformedUrl(RuntimeException()) callAuthenticate() } diff --git a/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt index 2fc42c0..aacd515 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt @@ -33,7 +33,7 @@ class RetrofitServiceFactoryTest { fun setUp() { MockKAnnotations.init(this) subject = retrofitBuilder.createServiceFactory(baseURLStorage) - coEvery { retrofitBuilder.buildRetrofit(any()) } returns retrofit + coEvery { retrofitBuilder.buildRetrofit(any(), eq(true)) } returns retrofit every { retrofit.create(eq(VersionService::class.java)) } returns versionService coEvery { baseURLStorage.requireBaseURL() } returns TEST_BASE_URL } @@ -53,7 +53,7 @@ class RetrofitServiceFactoryTest { fun `when provideService called twice then builder called once`() = runTest { subject.provideService() subject.provideService() - coVerifyAll { retrofitBuilder.buildRetrofit(eq(TEST_BASE_URL)) } + coVerifyAll { retrofitBuilder.buildRetrofit(eq(TEST_BASE_URL), eq(true)) } } @Test @@ -61,8 +61,8 @@ class RetrofitServiceFactoryTest { subject.provideService() subject.provideService("new url") coVerifyAll { - retrofitBuilder.buildRetrofit(eq(TEST_BASE_URL)) - retrofitBuilder.buildRetrofit(eq("new url")) + retrofitBuilder.buildRetrofit(eq(TEST_BASE_URL), eq(true)) + retrofitBuilder.buildRetrofit(eq("new url"), eq(true)) } } } \ No newline at end of file diff --git a/app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt index b250045..e9ecca5 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/storage/PreferencesStorageImplTest.kt @@ -18,30 +18,30 @@ class PreferencesStorageImplTest : HiltRobolectricTest() { @Test fun `when getValue without writes then null`() = runTest { - assertThat(subject.getValue(subject.authHeaderKey)).isNull() + assertThat(subject.getValue(subject.baseUrlKey)).isNull() } @Test(expected = IllegalStateException::class) fun `when requireValue without writes then throws IllegalStateException`() = runTest { - subject.requireValue(subject.authHeaderKey) + subject.requireValue(subject.baseUrlKey) } @Test fun `when getValue after write then returns value`() = runTest { - subject.storeValues(Pair(subject.authHeaderKey, "test")) - assertThat(subject.getValue(subject.authHeaderKey)).isEqualTo("test") + subject.storeValues(Pair(subject.baseUrlKey, "test")) + assertThat(subject.getValue(subject.baseUrlKey)).isEqualTo("test") } @Test fun `when storeValue then valueUpdates emits`() = runTest { - subject.storeValues(Pair(subject.authHeaderKey, "test")) - assertThat(subject.valueUpdates(subject.authHeaderKey).first()).isEqualTo("test") + subject.storeValues(Pair(subject.baseUrlKey, "test")) + assertThat(subject.valueUpdates(subject.baseUrlKey).first()).isEqualTo("test") } @Test fun `when remove value then getValue returns null`() = runTest { - subject.storeValues(Pair(subject.authHeaderKey, "test")) - subject.removeValues(subject.authHeaderKey) - assertThat(subject.getValue(subject.authHeaderKey)).isNull() + subject.storeValues(Pair(subject.baseUrlKey, "test")) + subject.removeValues(subject.baseUrlKey) + assertThat(subject.getValue(subject.baseUrlKey)).isNull() } } \ No newline at end of file