From 91ab3aab43920578d15e118d194da5cd359223ff Mon Sep 17 00:00:00 2001 From: "h.malik144@gmail.com" Date: Tue, 29 Aug 2023 20:53:02 +0100 Subject: [PATCH] - Local unit tests added - Optomized imports --- .../h_mal/farmr/data/ShiftProviderTest.kt | 2 +- .../com/appttude/h_mal/farmr/ui/BaseTest.kt | 3 - .../farmr/ui/robots/FilterScreenRobot.kt | 2 +- .../h_mal/farmr/ui/robots/HomeScreenRobot.kt | 1 - .../farmr/ui/robots/ViewItemScreenRobot.kt | 2 +- .../h_mal/farmr/ui/tests/ShiftTests.kt | 1 - .../appttude/h_mal/farmr/base/BaseFragment.kt | 2 - .../h_mal/farmr/base/BaseViewModel.kt | 1 - .../farmr/data/legacydb/LegacyDatabase.kt | 2 - .../farmr/data/legacydb/ShiftsContract.kt | 1 - .../h_mal/farmr/di/ShiftApplication.kt | 9 -- .../com/appttude/h_mal/farmr/model/Shift.kt | 3 - .../appttude/h_mal/farmr/ui/FragmentMain.kt | 2 - .../h_mal/farmr/ui/FurtherInfoFragment.kt | 1 - .../appttude/h_mal/farmr/ui/MainActivity.kt | 7 -- .../appttude/h_mal/farmr/ui/SplashScreen.kt | 3 - .../appttude/h_mal/farmr/utils/ViewUtils.kt | 2 - .../h_mal/farmr/viewmodel/MainViewModel.kt | 1 - .../h_mal/farmr/viewmodel/ShiftViewModel.kt | 2 +- .../h_mal/farmr/data/RepositoryImplTest.kt | 1 - .../appttude/h_mal/farmr/utils/testUtils.kt | 112 +++++++++++++++++- .../farmr/viewmodel/MainViewModelTest.kt | 111 +---------------- 22 files changed, 116 insertions(+), 155 deletions(-) diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/data/ShiftProviderTest.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/data/ShiftProviderTest.kt index 7a11af7..31f500e 100644 --- a/app/src/androidTest/java/com/appttude/h_mal/farmr/data/ShiftProviderTest.kt +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/data/ShiftProviderTest.kt @@ -3,6 +3,7 @@ package com.appttude.h_mal.farmr.data import android.content.ContentResolver import android.content.ContentValues import androidx.test.rule.provider.ProviderTestRule +import com.appttude.h_mal.farmr.data.legacydb.ShiftProvider import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.CONTENT_AUTHORITY import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.COLUMN_SHIFT_BREAK import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.COLUMN_SHIFT_DATE @@ -16,7 +17,6 @@ import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.COLUMN_ import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.COLUMN_SHIFT_UNIT import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.CONTENT_URI import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry._ID -import com.appttude.h_mal.farmr.data.legacydb.ShiftProvider import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNull import org.junit.After diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTest.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTest.kt index 0536254..8d4ebb8 100644 --- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTest.kt +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/BaseTest.kt @@ -6,9 +6,7 @@ import android.content.Intent import android.os.Build import android.os.Bundle import android.view.View -import androidx.lifecycle.Lifecycle import androidx.test.core.app.ActivityScenario -import androidx.test.core.app.ApplicationProvider import androidx.test.espresso.Espresso import androidx.test.espresso.UiController import androidx.test.espresso.ViewAction @@ -18,7 +16,6 @@ import androidx.test.espresso.matcher.ViewMatchers import androidx.test.platform.app.InstrumentationRegistry import androidx.test.rule.GrantPermissionRule import com.appttude.h_mal.farmr.application.TestAppClass -import com.appttude.h_mal.farmr.di.ShiftApplication import com.appttude.h_mal.farmr.ui.utils.getShifts import kotlinx.coroutines.runBlocking import org.hamcrest.Matcher diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/FilterScreenRobot.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/FilterScreenRobot.kt index 5907ac6..acd6f63 100644 --- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/FilterScreenRobot.kt +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/FilterScreenRobot.kt @@ -1,8 +1,8 @@ package com.appttude.h_mal.farmr.ui.robots import com.appttude.h_mal.farmr.R -import com.appttude.h_mal.farmr.ui.BaseTestRobot import com.appttude.h_mal.farmr.model.ShiftType +import com.appttude.h_mal.farmr.ui.BaseTestRobot fun filterScreen(func: FilterScreenRobot.() -> Unit) = FilterScreenRobot().apply { func() } class FilterScreenRobot : BaseTestRobot() { diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/HomeScreenRobot.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/HomeScreenRobot.kt index 4584b4a..81bf480 100644 --- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/HomeScreenRobot.kt +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/HomeScreenRobot.kt @@ -1,6 +1,5 @@ package com.appttude.h_mal.farmr.ui.robots -import androidx.test.espresso.matcher.RootMatchers.isDialog import com.appttude.h_mal.farmr.R import com.appttude.h_mal.farmr.base.BaseRecyclerAdapter.CurrentViewHolder import com.appttude.h_mal.farmr.model.Order diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/ViewItemScreenRobot.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/ViewItemScreenRobot.kt index 0dbcdad..b56d799 100644 --- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/ViewItemScreenRobot.kt +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/robots/ViewItemScreenRobot.kt @@ -1,8 +1,8 @@ package com.appttude.h_mal.farmr.ui.robots import com.appttude.h_mal.farmr.R -import com.appttude.h_mal.farmr.ui.BaseTestRobot import com.appttude.h_mal.farmr.model.ShiftType +import com.appttude.h_mal.farmr.ui.BaseTestRobot fun viewScreen(func: ViewItemScreenRobot.() -> Unit) = ViewItemScreenRobot().apply { func() } class ViewItemScreenRobot : BaseTestRobot() { diff --git a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt index e5f4a2f..a7decde 100644 --- a/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt +++ b/app/src/androidTest/java/com/appttude/h_mal/farmr/ui/tests/ShiftTests.kt @@ -9,7 +9,6 @@ import com.appttude.h_mal.farmr.ui.robots.addScreen import com.appttude.h_mal.farmr.ui.robots.filterScreen import com.appttude.h_mal.farmr.ui.robots.homeScreen import com.appttude.h_mal.farmr.ui.robots.viewScreen -import com.appttude.h_mal.farmr.utils.ID import org.junit.Test class ShiftTests : BaseTest(MainActivity::class.java) { diff --git a/app/src/main/java/com/appttude/h_mal/farmr/base/BaseFragment.kt b/app/src/main/java/com/appttude/h_mal/farmr/base/BaseFragment.kt index 3a25089..a74edba 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/base/BaseFragment.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/base/BaseFragment.kt @@ -4,14 +4,12 @@ import android.os.Bundle import android.view.View import androidx.annotation.LayoutRes import androidx.fragment.app.Fragment -import androidx.fragment.app.createViewModelLazy import androidx.lifecycle.ViewModelLazy import com.appttude.h_mal.farmr.model.ViewState import com.appttude.h_mal.farmr.utils.getGenericClassAt import com.appttude.h_mal.farmr.utils.popBackStack import com.appttude.h_mal.farmr.viewmodel.ApplicationViewModelFactory import org.kodein.di.KodeinAware -import org.kodein.di.android.kodein import org.kodein.di.android.x.kodein import org.kodein.di.generic.instance import kotlin.properties.Delegates diff --git a/app/src/main/java/com/appttude/h_mal/farmr/base/BaseViewModel.kt b/app/src/main/java/com/appttude/h_mal/farmr/base/BaseViewModel.kt index 40c0b5c..8ff7475 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/base/BaseViewModel.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/base/BaseViewModel.kt @@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import com.appttude.h_mal.farmr.model.ViewState -import java.lang.Exception open class BaseViewModel: ViewModel() { diff --git a/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/LegacyDatabase.kt b/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/LegacyDatabase.kt index 57e019e..729ea9a 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/LegacyDatabase.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/LegacyDatabase.kt @@ -3,7 +3,6 @@ package com.appttude.h_mal.farmr.data.legacydb import android.content.ContentResolver import android.content.ContentUris import android.content.ContentValues -import android.content.Context import android.database.Cursor import android.net.Uri import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.COLUMN_SHIFT_BREAK @@ -19,7 +18,6 @@ import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.COLUMN_ import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry.CONTENT_URI import com.appttude.h_mal.farmr.data.legacydb.ShiftsContract.ShiftsEntry._ID import com.appttude.h_mal.farmr.model.Shift -import com.appttude.h_mal.farmr.model.ShiftType class LegacyDatabase(private val resolver: ContentResolver) { diff --git a/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/ShiftsContract.kt b/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/ShiftsContract.kt index 51d1976..9fa0a96 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/ShiftsContract.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/data/legacydb/ShiftsContract.kt @@ -3,7 +3,6 @@ package com.appttude.h_mal.farmr.data.legacydb import android.content.ContentResolver import android.net.Uri import android.provider.BaseColumns -import com.appttude.h_mal.farmr.BuildConfig /** * Created by h_mal on 26/12/2017. diff --git a/app/src/main/java/com/appttude/h_mal/farmr/di/ShiftApplication.kt b/app/src/main/java/com/appttude/h_mal/farmr/di/ShiftApplication.kt index 3b0cd5f..cc4b998 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/di/ShiftApplication.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/di/ShiftApplication.kt @@ -1,17 +1,8 @@ package com.appttude.h_mal.farmr.di import com.appttude.h_mal.farmr.base.BaseApplication -import com.appttude.h_mal.farmr.data.RepositoryImpl import com.appttude.h_mal.farmr.data.legacydb.LegacyDatabase import com.appttude.h_mal.farmr.data.prefs.PreferenceProvider -import com.appttude.h_mal.farmr.viewmodel.ApplicationViewModelFactory -import org.kodein.di.Kodein -import org.kodein.di.KodeinAware -import org.kodein.di.android.x.androidXModule -import org.kodein.di.generic.bind -import org.kodein.di.generic.instance -import org.kodein.di.generic.provider -import org.kodein.di.generic.singleton class ShiftApplication: BaseApplication() { diff --git a/app/src/main/java/com/appttude/h_mal/farmr/model/Shift.kt b/app/src/main/java/com/appttude/h_mal/farmr/model/Shift.kt index 2f87159..4df1de5 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/model/Shift.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/model/Shift.kt @@ -1,10 +1,7 @@ package com.appttude.h_mal.farmr.model -import com.appttude.h_mal.farmr.data.legacydb.ShiftObject import com.appttude.h_mal.farmr.utils.calculateDuration -import com.appttude.h_mal.farmr.utils.convertTimeStringToHourMinutesPair import com.appttude.h_mal.farmr.utils.formatToTwoDp -import java.io.IOException data class Shift( val type: ShiftType, diff --git a/app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentMain.kt b/app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentMain.kt index 8e420e0..5e1866b 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentMain.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentMain.kt @@ -1,12 +1,10 @@ package com.appttude.h_mal.farmr.ui import android.Manifest -import android.annotation.SuppressLint import android.app.Activity import android.app.AlertDialog import android.content.Intent import android.content.pm.PackageManager -import android.net.Uri import android.os.Bundle import android.view.MenuItem import android.view.View diff --git a/app/src/main/java/com/appttude/h_mal/farmr/ui/FurtherInfoFragment.kt b/app/src/main/java/com/appttude/h_mal/farmr/ui/FurtherInfoFragment.kt index e536e10..be79fa7 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/ui/FurtherInfoFragment.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/ui/FurtherInfoFragment.kt @@ -12,7 +12,6 @@ import com.appttude.h_mal.farmr.data.legacydb.ShiftObject import com.appttude.h_mal.farmr.model.ShiftType import com.appttude.h_mal.farmr.utils.CURRENCY import com.appttude.h_mal.farmr.utils.formatAsCurrencyString -import com.appttude.h_mal.farmr.utils.formatToTwoDpString import com.appttude.h_mal.farmr.utils.hide import com.appttude.h_mal.farmr.utils.navigateToFragment import com.appttude.h_mal.farmr.utils.show diff --git a/app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt b/app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt index 245b54f..2bb2763 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt @@ -1,11 +1,7 @@ package com.appttude.h_mal.farmr.ui import android.Manifest -import android.R.string.cancel -import android.R.string.ok import android.app.Activity -import android.app.AlertDialog -import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle import android.view.Menu @@ -14,10 +10,7 @@ import androidx.core.app.ActivityCompat import com.appttude.h_mal.farmr.R import com.appttude.h_mal.farmr.base.BackPressedListener import com.appttude.h_mal.farmr.base.BaseActivity -import com.appttude.h_mal.farmr.utils.createDialog import com.appttude.h_mal.farmr.utils.popBackStack -import com.appttude.h_mal.farmr.viewmodel.MainViewModel -import kotlin.system.exitProcess class MainActivity : BaseActivity() { private lateinit var toolbar: Toolbar diff --git a/app/src/main/java/com/appttude/h_mal/farmr/ui/SplashScreen.kt b/app/src/main/java/com/appttude/h_mal/farmr/ui/SplashScreen.kt index f0fefb2..5f8cfd8 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/ui/SplashScreen.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/ui/SplashScreen.kt @@ -6,9 +6,6 @@ import android.content.Intent import android.os.Bundle import android.os.Handler import android.os.Looper -import android.view.View -import android.widget.RelativeLayout -import androidx.core.app.ActivityOptionsCompat import com.appttude.h_mal.farmr.R /** diff --git a/app/src/main/java/com/appttude/h_mal/farmr/utils/ViewUtils.kt b/app/src/main/java/com/appttude/h_mal/farmr/utils/ViewUtils.kt index b863b69..1e68035 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/utils/ViewUtils.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/utils/ViewUtils.kt @@ -19,9 +19,7 @@ import androidx.annotation.AnimRes import androidx.annotation.IdRes import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentTransaction import com.appttude.h_mal.farmr.R -import com.appttude.h_mal.farmr.ui.FragmentAddItem import java.util.Calendar fun View.show() { diff --git a/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/MainViewModel.kt b/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/MainViewModel.kt index f07cb9d..7929615 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/MainViewModel.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/MainViewModel.kt @@ -22,7 +22,6 @@ import com.appttude.h_mal.farmr.model.Order import com.appttude.h_mal.farmr.model.ShiftType import com.appttude.h_mal.farmr.model.Sortable import com.appttude.h_mal.farmr.model.Success -import com.appttude.h_mal.farmr.utils.CURRENCY import com.appttude.h_mal.farmr.utils.convertDateString import com.appttude.h_mal.farmr.utils.formatAsCurrencyString import com.appttude.h_mal.farmr.utils.sortedByOrder diff --git a/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/ShiftViewModel.kt b/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/ShiftViewModel.kt index 33c7ea5..abcc710 100644 --- a/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/ShiftViewModel.kt +++ b/app/src/main/java/com/appttude/h_mal/farmr/viewmodel/ShiftViewModel.kt @@ -2,9 +2,9 @@ package com.appttude.h_mal.farmr.viewmodel import com.appttude.h_mal.farmr.base.BaseViewModel import com.appttude.h_mal.farmr.data.Repository -import com.appttude.h_mal.farmr.data.prefs.DESCRIPTION import com.appttude.h_mal.farmr.data.prefs.DATE_IN import com.appttude.h_mal.farmr.data.prefs.DATE_OUT +import com.appttude.h_mal.farmr.data.prefs.DESCRIPTION import com.appttude.h_mal.farmr.data.prefs.TYPE import com.appttude.h_mal.farmr.model.FilterStore diff --git a/app/src/test/java/com/appttude/h_mal/farmr/data/RepositoryImplTest.kt b/app/src/test/java/com/appttude/h_mal/farmr/data/RepositoryImplTest.kt index 4c53925..4688aa6 100644 --- a/app/src/test/java/com/appttude/h_mal/farmr/data/RepositoryImplTest.kt +++ b/app/src/test/java/com/appttude/h_mal/farmr/data/RepositoryImplTest.kt @@ -10,7 +10,6 @@ import io.mockk.mockk import org.junit.Before import org.junit.Test import org.mockito.ArgumentMatchers.anyLong -import java.util.UUID import kotlin.test.assertEquals import kotlin.test.assertIs diff --git a/app/src/test/java/com/appttude/h_mal/farmr/utils/testUtils.kt b/app/src/test/java/com/appttude/h_mal/farmr/utils/testUtils.kt index 4d64b8d..e04e3ce 100644 --- a/app/src/test/java/com/appttude/h_mal/farmr/utils/testUtils.kt +++ b/app/src/test/java/com/appttude/h_mal/farmr/utils/testUtils.kt @@ -2,9 +2,12 @@ package com.appttude.h_mal.farmr.utils import androidx.lifecycle.LiveData import androidx.lifecycle.Observer +import com.appttude.h_mal.farmr.data.legacydb.ShiftObject +import com.appttude.h_mal.farmr.model.ShiftType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking +import org.mockito.ArgumentMatchers import java.util.concurrent.CountDownLatch import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException @@ -36,4 +39,111 @@ fun LiveData.getOrAwaitValue( fun sleep(millis: Long = 1000) { runBlocking(Dispatchers.Default) { delay(millis) } -} \ No newline at end of file +} + +fun getShifts() = listOf( + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.HOURLY.type, + "Day one", + "2023-08-01", + "12:00", + "13:00", + 1f, + ArgumentMatchers.anyInt(), + ArgumentMatchers.anyFloat(), + 10f, + 10f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.HOURLY.type, + "Day two", + "2023-08-02", + "12:00", + "13:00", + 1f, + ArgumentMatchers.anyInt(), + ArgumentMatchers.anyFloat(), + 10f, + 10f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.HOURLY.type, + "Day three", + "2023-08-03", + "12:00", + "13:00", + 1f, + 30, + ArgumentMatchers.anyFloat(), + 10f, + 5f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.HOURLY.type, + "Day four", + "2023-08-04", + "12:00", + "13:00", + 1f, + 30, + ArgumentMatchers.anyFloat(), + 10f, + 5f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.PIECE.type, + "Day five", + "2023-08-05", + ArgumentMatchers.anyString(), + ArgumentMatchers.anyString(), + ArgumentMatchers.anyFloat(), + ArgumentMatchers.anyInt(), + 1f, + 10f, + 10f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.PIECE.type, + "Day six", + "2023-08-06", + ArgumentMatchers.anyString(), + ArgumentMatchers.anyString(), + ArgumentMatchers.anyFloat(), + ArgumentMatchers.anyInt(), + 1f, + 10f, + 10f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.PIECE.type, + "Day seven", + "2023-08-07", + ArgumentMatchers.anyString(), + ArgumentMatchers.anyString(), + ArgumentMatchers.anyFloat(), + ArgumentMatchers.anyInt(), + 1f, + 10f, + 10f + ), + ShiftObject( + ArgumentMatchers.anyLong(), + ShiftType.PIECE.type, + "Day eight", + "2023-08-08", + ArgumentMatchers.anyString(), + ArgumentMatchers.anyString(), + ArgumentMatchers.anyFloat(), + ArgumentMatchers.anyInt(), + 1f, + 10f, + 10f + ), +) \ No newline at end of file diff --git a/app/src/test/java/com/appttude/h_mal/farmr/viewmodel/MainViewModelTest.kt b/app/src/test/java/com/appttude/h_mal/farmr/viewmodel/MainViewModelTest.kt index 127dab4..4ba2d24 100644 --- a/app/src/test/java/com/appttude/h_mal/farmr/viewmodel/MainViewModelTest.kt +++ b/app/src/test/java/com/appttude/h_mal/farmr/viewmodel/MainViewModelTest.kt @@ -10,17 +10,14 @@ import com.appttude.h_mal.farmr.data.prefs.TYPE import com.appttude.h_mal.farmr.model.ShiftType import com.appttude.h_mal.farmr.model.ViewState import com.appttude.h_mal.farmr.utils.getOrAwaitValue +import com.appttude.h_mal.farmr.utils.getShifts import io.mockk.every import io.mockk.mockk import org.junit.Assert.assertThrows import org.junit.Before import org.junit.Rule import org.junit.Test -import org.mockito.ArgumentMatchers.anyFloat -import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.anyList -import org.mockito.ArgumentMatchers.anyLong -import org.mockito.ArgumentMatchers.anyString import java.util.concurrent.TimeoutException import kotlin.test.assertEquals @@ -130,110 +127,4 @@ class MainViewModelTest { Pair(TYPE, type) ) - private fun getShifts() = listOf( - ShiftObject( - anyLong(), - ShiftType.HOURLY.type, - "Day one", - "2023-08-01", - "12:00", - "13:00", - 1f, - anyInt(), - anyFloat(), - 10f, - 10f - ), - ShiftObject( - anyLong(), - ShiftType.HOURLY.type, - "Day two", - "2023-08-02", - "12:00", - "13:00", - 1f, - anyInt(), - anyFloat(), - 10f, - 10f - ), - ShiftObject( - anyLong(), - ShiftType.HOURLY.type, - "Day three", - "2023-08-03", - "12:00", - "13:00", - 1f, - 30, - anyFloat(), - 10f, - 5f - ), - ShiftObject( - anyLong(), - ShiftType.HOURLY.type, - "Day four", - "2023-08-04", - "12:00", - "13:00", - 1f, - 30, - anyFloat(), - 10f, - 5f - ), - ShiftObject( - anyLong(), - ShiftType.PIECE.type, - "Day five", - "2023-08-05", - anyString(), - anyString(), - anyFloat(), - anyInt(), - 1f, - 10f, - 10f - ), - ShiftObject( - anyLong(), - ShiftType.PIECE.type, - "Day six", - "2023-08-06", - anyString(), - anyString(), - anyFloat(), - anyInt(), - 1f, - 10f, - 10f - ), - ShiftObject( - anyLong(), - ShiftType.PIECE.type, - "Day seven", - "2023-08-07", - anyString(), - anyString(), - anyFloat(), - anyInt(), - 1f, - 10f, - 10f - ), - ShiftObject( - anyLong(), - ShiftType.PIECE.type, - "Day eight", - "2023-08-08", - anyString(), - anyString(), - anyFloat(), - anyInt(), - 1f, - 10f, - 10f - ), - ) } \ No newline at end of file