diff --git a/app/src/main/java/com/carlosjimz87/funwithflags/factory/ViewModelsFactory.kt b/app/src/main/java/com/carlosjimz87/funwithflags/factories/ViewModelsFactory.kt similarity index 94% rename from app/src/main/java/com/carlosjimz87/funwithflags/factory/ViewModelsFactory.kt rename to app/src/main/java/com/carlosjimz87/funwithflags/factories/ViewModelsFactory.kt index e156de3..7d428cd 100644 --- a/app/src/main/java/com/carlosjimz87/funwithflags/factory/ViewModelsFactory.kt +++ b/app/src/main/java/com/carlosjimz87/funwithflags/factories/ViewModelsFactory.kt @@ -1,4 +1,4 @@ -package com.carlosjimz87.funwithflags.factory +package com.carlosjimz87.funwithflags.factories import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider diff --git a/app/src/main/java/com/carlosjimz87/funwithflags/fragments/details/DetailsFragment.kt b/app/src/main/java/com/carlosjimz87/funwithflags/fragments/details/DetailsFragment.kt index c96fb22..2561f81 100644 --- a/app/src/main/java/com/carlosjimz87/funwithflags/fragments/details/DetailsFragment.kt +++ b/app/src/main/java/com/carlosjimz87/funwithflags/fragments/details/DetailsFragment.kt @@ -13,9 +13,8 @@ import androidx.navigation.fragment.navArgs import com.carlosjimz87.funwithflags.App import com.carlosjimz87.funwithflags.R import com.carlosjimz87.funwithflags.databinding.DetailsFragmentBinding -import com.carlosjimz87.funwithflags.factory.ViewModelsFactory +import com.carlosjimz87.funwithflags.factories.ViewModelsFactory import com.carlosjimz87.funwithflags.fragments.BaseFragment -import com.carlosjimz87.funwithflags.repositories.CountriesRepositoryImpl import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.OnMapReadyCallback diff --git a/app/src/main/java/com/carlosjimz87/funwithflags/fragments/list/ListFragment.kt b/app/src/main/java/com/carlosjimz87/funwithflags/fragments/list/ListFragment.kt index 4a26bdd..5d053ca 100644 --- a/app/src/main/java/com/carlosjimz87/funwithflags/fragments/list/ListFragment.kt +++ b/app/src/main/java/com/carlosjimz87/funwithflags/fragments/list/ListFragment.kt @@ -15,7 +15,7 @@ import com.carlosjimz87.funwithflags.App import com.carlosjimz87.funwithflags.R import com.carlosjimz87.funwithflags.adapters.CountryListAdapter import com.carlosjimz87.funwithflags.databinding.ListFragmentBinding -import com.carlosjimz87.funwithflags.factory.ViewModelsFactory +import com.carlosjimz87.funwithflags.factories.ViewModelsFactory import com.carlosjimz87.funwithflags.fragments.BaseFragment import com.carlosjimz87.funwithflags.utils.addDividerShape import timber.log.Timber diff --git a/app/src/test/java/com/carlosjimz87/funwithflags/fragments/details/DetailsViewModelTest.kt b/app/src/test/java/com/carlosjimz87/funwithflags/fragments/details/DetailsViewModelTest.kt deleted file mode 100644 index 00e07e7..0000000 --- a/app/src/test/java/com/carlosjimz87/funwithflags/fragments/details/DetailsViewModelTest.kt +++ /dev/null @@ -1,56 +0,0 @@ -package com.carlosjimz87.funwithflags.fragments.details - -import android.content.Context -import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import androidx.test.platform.app.InstrumentationRegistry -import com.carlosjimz87.funwithflags.App -import com.carlosjimz87.funwithflags.CoroutineTestRule -import com.carlosjimz87.funwithflags.network.FakeCountriesRepository -import com.carlosjimz87.funwithflags.repositories.CountriesRepository -import com.carlosjimz87.funwithflags.utils.formatCurrencyHelper -import com.carlosjimz87.funwithflags.utils.formatPopulationHelper -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.runBlocking -import org.junit.Assert -import org.junit.Before -import org.junit.Rule -import org.junit.Test - -@ExperimentalCoroutinesApi -class DetailsViewModelTest { - - private val appContext: Context = InstrumentationRegistry.getInstrumentation().targetContext - - @get:Rule - val rule = InstantTaskExecutorRule() - - @get:Rule - var coroutinesTestRule = CoroutineTestRule() - - private lateinit var fakeCountriesRepository: CountriesRepository - - // Class under test - private lateinit var detailsViewModel: DetailsViewModel - - @Before - fun setup() { - fakeCountriesRepository = FakeCountriesRepository() - detailsViewModel = DetailsViewModel(appContext as App, fakeCountriesRepository) - } - - @Test - fun getCountryDetailsTest(): Unit = runBlocking { - - detailsViewModel.countryDetails.observeForever { - Assert.assertEquals(FakeCountriesRepository.countryDetails.name, it.name) - Assert.assertEquals(FakeCountriesRepository.countryDetails.flag, it.flag) - } - detailsViewModel.countryProps.observeForever { - - Assert.assertEquals(formatPopulationHelper(FakeCountriesRepository.countryDetails.population!!), - it.population) - Assert.assertEquals(formatCurrencyHelper(FakeCountriesRepository.countryDetails.currencies[0].code!!), - it.currency) - } - } -} \ No newline at end of file