From 965b488eb4e28dd4e0b94a1916181b6b2ded8118 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 20 Nov 2021 21:09:12 +0300 Subject: [PATCH] Move shared test classes to root package --- .../data/auth/impl/AuthDataSourceImplTest.kt | 14 +++++----- .../data/auth/impl/AuthRepoImplTest.kt | 12 ++++---- .../data/auth/impl/AuthStorageImplTest.kt | 6 ++-- .../disclaimer/DisclaimerStorageImplTest.kt | 2 +- .../mealient/data/impl/OkHttpBuilderTest.kt | 4 +-- .../data/recipes/db/RecipeStorageImplTest.kt | 28 +++++++++---------- .../data/recipes/impl/RecipeRepoImplTest.kt | 10 +++---- .../recipes/impl/RecipesRemoteMediatorTest.kt | 12 ++++---- .../{data => }/test/AuthImplTestData.kt | 2 +- .../{data => }/test/HiltRobolectricTest.kt | 2 +- .../{data => }/test/MockServerTest.kt | 2 +- .../{data => }/test/MockServerWithAuthTest.kt | 8 +++--- .../{data => }/test/RecipeImplTestData.kt | 2 +- .../ui/disclaimer/DisclaimerViewModelTest.kt | 2 +- 14 files changed, 53 insertions(+), 53 deletions(-) rename app/src/test/java/gq/kirmanak/mealient/{data => }/test/AuthImplTestData.kt (96%) rename app/src/test/java/gq/kirmanak/mealient/{data => }/test/HiltRobolectricTest.kt (96%) rename app/src/test/java/gq/kirmanak/mealient/{data => }/test/MockServerTest.kt (92%) rename app/src/test/java/gq/kirmanak/mealient/{data => }/test/MockServerWithAuthTest.kt (63%) rename app/src/test/java/gq/kirmanak/mealient/{data => }/test/RecipeImplTestData.kt (99%) 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 cfad98a..5ff1eaf 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 @@ -2,13 +2,13 @@ package gq.kirmanak.mealient.data.auth.impl import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_PASSWORD -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_USERNAME -import gq.kirmanak.mealient.data.test.AuthImplTestData.body -import gq.kirmanak.mealient.data.test.AuthImplTestData.enqueueSuccessfulAuthResponse -import gq.kirmanak.mealient.data.test.AuthImplTestData.enqueueUnsuccessfulAuthResponse -import gq.kirmanak.mealient.data.test.MockServerTest +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_PASSWORD +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_USERNAME +import gq.kirmanak.mealient.test.AuthImplTestData.body +import gq.kirmanak.mealient.test.AuthImplTestData.enqueueSuccessfulAuthResponse +import gq.kirmanak.mealient.test.AuthImplTestData.enqueueUnsuccessfulAuthResponse +import gq.kirmanak.mealient.test.MockServerTest import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.runBlocking import kotlinx.serialization.ExperimentalSerializationApi diff --git a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt index f9b6e38..026518f 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthRepoImplTest.kt @@ -2,12 +2,12 @@ package gq.kirmanak.mealient.data.auth.impl import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_PASSWORD -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_USERNAME -import gq.kirmanak.mealient.data.test.AuthImplTestData.enqueueSuccessfulAuthResponse -import gq.kirmanak.mealient.data.test.AuthImplTestData.enqueueUnsuccessfulAuthResponse -import gq.kirmanak.mealient.data.test.MockServerTest +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_PASSWORD +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_USERNAME +import gq.kirmanak.mealient.test.AuthImplTestData.enqueueSuccessfulAuthResponse +import gq.kirmanak.mealient.test.AuthImplTestData.enqueueUnsuccessfulAuthResponse +import gq.kirmanak.mealient.test.MockServerTest import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import org.junit.Test diff --git a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt index a005e71..5ac3050 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/auth/impl/AuthStorageImplTest.kt @@ -2,9 +2,9 @@ package gq.kirmanak.mealient.data.auth.impl import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_URL -import gq.kirmanak.mealient.data.test.HiltRobolectricTest +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_URL +import gq.kirmanak.mealient.test.HiltRobolectricTest import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking diff --git a/app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt index 03c6b68..0eeafd4 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/disclaimer/DisclaimerStorageImplTest.kt @@ -2,7 +2,7 @@ package gq.kirmanak.mealient.data.disclaimer import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest -import gq.kirmanak.mealient.data.test.HiltRobolectricTest +import gq.kirmanak.mealient.test.HiltRobolectricTest import kotlinx.coroutines.runBlocking import org.junit.Test import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/impl/OkHttpBuilderTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/impl/OkHttpBuilderTest.kt index 50ab9d0..4be5e63 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/impl/OkHttpBuilderTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/impl/OkHttpBuilderTest.kt @@ -3,8 +3,8 @@ package gq.kirmanak.mealient.data.impl import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest import gq.kirmanak.mealient.data.auth.impl.AUTHORIZATION_HEADER -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_TOKEN -import gq.kirmanak.mealient.data.test.MockServerTest +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_TOKEN +import gq.kirmanak.mealient.test.MockServerTest import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.mockwebserver.MockResponse diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImplTest.kt index 0a9d413..3b829a4 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/recipes/db/RecipeStorageImplTest.kt @@ -7,20 +7,20 @@ import gq.kirmanak.mealient.data.recipes.db.entity.CategoryEntity import gq.kirmanak.mealient.data.recipes.db.entity.CategoryRecipeEntity import gq.kirmanak.mealient.data.recipes.db.entity.TagEntity import gq.kirmanak.mealient.data.recipes.db.entity.TagRecipeEntity -import gq.kirmanak.mealient.data.test.HiltRobolectricTest -import gq.kirmanak.mealient.data.test.RecipeImplTestData.BREAD_INGREDIENT -import gq.kirmanak.mealient.data.test.RecipeImplTestData.CAKE_BREAD_RECIPE_INGREDIENT_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.CAKE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.FULL_CAKE_INFO_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.FULL_PORRIDGE_INFO_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.GET_CAKE_RESPONSE -import gq.kirmanak.mealient.data.test.RecipeImplTestData.GET_PORRIDGE_RESPONSE -import gq.kirmanak.mealient.data.test.RecipeImplTestData.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.MIX_INSTRUCTION -import gq.kirmanak.mealient.data.test.RecipeImplTestData.PORRIDGE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.RECIPE_SUMMARY_CAKE -import gq.kirmanak.mealient.data.test.RecipeImplTestData.RECIPE_SUMMARY_PORRIDGE -import gq.kirmanak.mealient.data.test.RecipeImplTestData.TEST_RECIPE_SUMMARIES +import gq.kirmanak.mealient.test.HiltRobolectricTest +import gq.kirmanak.mealient.test.RecipeImplTestData.BREAD_INGREDIENT +import gq.kirmanak.mealient.test.RecipeImplTestData.CAKE_BREAD_RECIPE_INGREDIENT_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.CAKE_RECIPE_SUMMARY_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.FULL_CAKE_INFO_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.FULL_PORRIDGE_INFO_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.GET_CAKE_RESPONSE +import gq.kirmanak.mealient.test.RecipeImplTestData.GET_PORRIDGE_RESPONSE +import gq.kirmanak.mealient.test.RecipeImplTestData.MIX_CAKE_RECIPE_INSTRUCTION_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.MIX_INSTRUCTION +import gq.kirmanak.mealient.test.RecipeImplTestData.PORRIDGE_RECIPE_SUMMARY_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.RECIPE_SUMMARY_CAKE +import gq.kirmanak.mealient.test.RecipeImplTestData.RECIPE_SUMMARY_PORRIDGE +import gq.kirmanak.mealient.test.RecipeImplTestData.TEST_RECIPE_SUMMARIES import kotlinx.coroutines.runBlocking import org.junit.Test import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImplTest.kt index cf1b2a0..195318d 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImplTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipeRepoImplTest.kt @@ -5,11 +5,11 @@ import dagger.hilt.android.testing.HiltAndroidTest import gq.kirmanak.mealient.data.AppDb import gq.kirmanak.mealient.data.recipes.RecipeRepo import gq.kirmanak.mealient.data.recipes.db.RecipeStorage -import gq.kirmanak.mealient.data.test.MockServerWithAuthTest -import gq.kirmanak.mealient.data.test.RecipeImplTestData.FULL_CAKE_INFO_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.RECIPE_SUMMARY_CAKE -import gq.kirmanak.mealient.data.test.RecipeImplTestData.enqueueSuccessfulGetRecipe -import gq.kirmanak.mealient.data.test.RecipeImplTestData.enqueueUnsuccessfulRecipeResponse +import gq.kirmanak.mealient.test.MockServerWithAuthTest +import gq.kirmanak.mealient.test.RecipeImplTestData.FULL_CAKE_INFO_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.RECIPE_SUMMARY_CAKE +import gq.kirmanak.mealient.test.RecipeImplTestData.enqueueSuccessfulGetRecipe +import gq.kirmanak.mealient.test.RecipeImplTestData.enqueueUnsuccessfulRecipeResponse import kotlinx.coroutines.runBlocking import org.junit.Test import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt index 812cc3b..57732fd 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/data/recipes/impl/RecipesRemoteMediatorTest.kt @@ -6,12 +6,12 @@ import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest import gq.kirmanak.mealient.data.AppDb import gq.kirmanak.mealient.data.recipes.db.entity.RecipeSummaryEntity -import gq.kirmanak.mealient.data.test.MockServerWithAuthTest -import gq.kirmanak.mealient.data.test.RecipeImplTestData.CAKE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.PORRIDGE_RECIPE_SUMMARY_ENTITY -import gq.kirmanak.mealient.data.test.RecipeImplTestData.TEST_RECIPE_ENTITIES -import gq.kirmanak.mealient.data.test.RecipeImplTestData.enqueueSuccessfulRecipeSummaryResponse -import gq.kirmanak.mealient.data.test.RecipeImplTestData.enqueueUnsuccessfulRecipeResponse +import gq.kirmanak.mealient.test.MockServerWithAuthTest +import gq.kirmanak.mealient.test.RecipeImplTestData.CAKE_RECIPE_SUMMARY_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.PORRIDGE_RECIPE_SUMMARY_ENTITY +import gq.kirmanak.mealient.test.RecipeImplTestData.TEST_RECIPE_ENTITIES +import gq.kirmanak.mealient.test.RecipeImplTestData.enqueueSuccessfulRecipeSummaryResponse +import gq.kirmanak.mealient.test.RecipeImplTestData.enqueueUnsuccessfulRecipeResponse import kotlinx.coroutines.runBlocking import org.junit.Test import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/test/AuthImplTestData.kt b/app/src/test/java/gq/kirmanak/mealient/test/AuthImplTestData.kt similarity index 96% rename from app/src/test/java/gq/kirmanak/mealient/data/test/AuthImplTestData.kt rename to app/src/test/java/gq/kirmanak/mealient/test/AuthImplTestData.kt index e30c9bb..26d68e8 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/test/AuthImplTestData.kt +++ b/app/src/test/java/gq/kirmanak/mealient/test/AuthImplTestData.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.test +package gq.kirmanak.mealient.test import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.MockWebServer diff --git a/app/src/test/java/gq/kirmanak/mealient/data/test/HiltRobolectricTest.kt b/app/src/test/java/gq/kirmanak/mealient/test/HiltRobolectricTest.kt similarity index 96% rename from app/src/test/java/gq/kirmanak/mealient/data/test/HiltRobolectricTest.kt rename to app/src/test/java/gq/kirmanak/mealient/test/HiltRobolectricTest.kt index 780848e..80f50bc 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/test/HiltRobolectricTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/test/HiltRobolectricTest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.test +package gq.kirmanak.mealient.test import androidx.test.ext.junit.runners.AndroidJUnit4 import dagger.hilt.android.testing.HiltAndroidRule diff --git a/app/src/test/java/gq/kirmanak/mealient/data/test/MockServerTest.kt b/app/src/test/java/gq/kirmanak/mealient/test/MockServerTest.kt similarity index 92% rename from app/src/test/java/gq/kirmanak/mealient/data/test/MockServerTest.kt rename to app/src/test/java/gq/kirmanak/mealient/test/MockServerTest.kt index 42b2476..c92c7ab 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/test/MockServerTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/test/MockServerTest.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.test +package gq.kirmanak.mealient.test import okhttp3.mockwebserver.MockWebServer import org.junit.After diff --git a/app/src/test/java/gq/kirmanak/mealient/data/test/MockServerWithAuthTest.kt b/app/src/test/java/gq/kirmanak/mealient/test/MockServerWithAuthTest.kt similarity index 63% rename from app/src/test/java/gq/kirmanak/mealient/data/test/MockServerWithAuthTest.kt rename to app/src/test/java/gq/kirmanak/mealient/test/MockServerWithAuthTest.kt index 8a518f0..05e7532 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/test/MockServerWithAuthTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/test/MockServerWithAuthTest.kt @@ -1,9 +1,9 @@ -package gq.kirmanak.mealient.data.test +package gq.kirmanak.mealient.test import gq.kirmanak.mealient.data.auth.AuthRepo -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_PASSWORD -import gq.kirmanak.mealient.data.test.AuthImplTestData.TEST_USERNAME -import gq.kirmanak.mealient.data.test.AuthImplTestData.enqueueSuccessfulAuthResponse +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_PASSWORD +import gq.kirmanak.mealient.test.AuthImplTestData.TEST_USERNAME +import gq.kirmanak.mealient.test.AuthImplTestData.enqueueSuccessfulAuthResponse import kotlinx.coroutines.runBlocking import org.junit.Before import javax.inject.Inject diff --git a/app/src/test/java/gq/kirmanak/mealient/data/test/RecipeImplTestData.kt b/app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt similarity index 99% rename from app/src/test/java/gq/kirmanak/mealient/data/test/RecipeImplTestData.kt rename to app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt index 91da82e..19c385d 100644 --- a/app/src/test/java/gq/kirmanak/mealient/data/test/RecipeImplTestData.kt +++ b/app/src/test/java/gq/kirmanak/mealient/test/RecipeImplTestData.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.data.test +package gq.kirmanak.mealient.test import gq.kirmanak.mealient.data.recipes.db.entity.RecipeEntity import gq.kirmanak.mealient.data.recipes.db.entity.RecipeIngredientEntity diff --git a/app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt b/app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt index 093ed2c..ee1c301 100644 --- a/app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt +++ b/app/src/test/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModelTest.kt @@ -3,7 +3,7 @@ package gq.kirmanak.mealient.ui.disclaimer import com.google.common.truth.Truth.assertThat import dagger.hilt.android.testing.HiltAndroidTest import gq.kirmanak.mealient.data.disclaimer.DisclaimerStorage -import gq.kirmanak.mealient.data.test.HiltRobolectricTest +import gq.kirmanak.mealient.test.HiltRobolectricTest import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.take