diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTestUtils.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTestUtils.kt index c0cc53f3..7de66d6a 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTestUtils.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/GoalsTestUtils.kt @@ -6,6 +6,7 @@ import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText import com.example.util.simpletimetracker.core.utils.TestUtils +import com.example.util.simpletimetracker.domain.model.DayOfWeek import com.example.util.simpletimetracker.domain.model.RecordTypeGoal import com.example.util.simpletimetracker.feature_change_record.R import com.example.util.simpletimetracker.utils.checkViewDoesNotExist @@ -153,7 +154,7 @@ object GoalsTestUtils { idData = RecordTypeGoal.IdData.Type(0), range = range, type = RecordTypeGoal.Type.Duration(duration), - daysOfWeek = emptyList(), + daysOfWeek = DayOfWeek.values().toList(), ) } @@ -173,7 +174,7 @@ object GoalsTestUtils { idData = RecordTypeGoal.IdData.Type(0), range = range, type = RecordTypeGoal.Type.Count(count), - daysOfWeek = emptyList(), + daysOfWeek = DayOfWeek.values().toList(), ) } diff --git a/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt b/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt index 939abe41..9f49c2a4 100644 --- a/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt +++ b/app/src/androidTest/java/com/example/util/simpletimetracker/StatisticsRangesTest.kt @@ -619,6 +619,8 @@ class StatisticsRangesTest : BaseUiTest() { var calendar = Calendar.getInstance().apply { add(Calendar.DATE, -1) set(Calendar.HOUR_OF_DAY, 15) + set(Calendar.MINUTE, 0) + set(Calendar.SECOND, 0) } testUtils.addRecord( typeName = name1, @@ -628,6 +630,8 @@ class StatisticsRangesTest : BaseUiTest() { calendar = Calendar.getInstance().apply { add(Calendar.DATE, -2) set(Calendar.HOUR_OF_DAY, 15) + set(Calendar.MINUTE, 0) + set(Calendar.SECOND, 0) } testUtils.addRecord( typeName = name2, @@ -702,7 +706,7 @@ class StatisticsRangesTest : BaseUiTest() { dayEnded = calendar.get(Calendar.DAY_OF_MONTH), ) - checkStatisticsItem(nameResId = coreR.string.untracked_time_name, hours = 69) + checkStatisticsItem(nameResId = coreR.string.untracked_time_name, hours = 30) checkStatisticsItem(name = name1, hours = 1) checkStatisticsItem(name = name2, hours = 2) @@ -731,7 +735,7 @@ class StatisticsRangesTest : BaseUiTest() { dayEnded = calendar.get(Calendar.DAY_OF_MONTH), ) - checkStatisticsItem(nameResId = coreR.string.untracked_time_name, hours = 240) + checkViewDoesNotExist(allOf(withText(coreR.string.untracked_time_name), isCompletelyDisplayed())) checkViewDoesNotExist(allOf(withText(name1), isCompletelyDisplayed())) checkViewDoesNotExist(allOf(withText(name2), isCompletelyDisplayed())) diff --git a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/utils/PrefsUtils.kt b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/utils/PrefsUtils.kt index 67dd6a4f..a97e30a2 100644 --- a/data_local/src/main/java/com/example/util/simpletimetracker/data_local/utils/PrefsUtils.kt +++ b/data_local/src/main/java/com/example/util/simpletimetracker/data_local/utils/PrefsUtils.kt @@ -13,7 +13,7 @@ import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty @Suppress("UNCHECKED_CAST") -internal inline fun SharedPreferences.delegate( +internal inline fun SharedPreferences.delegate( key: String, default: T, cache: MutableMap,