diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/DaysSinceOnsetOfSymptomsVectorDeterminatorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/DaysSinceOnsetOfSymptomsVectorDeterminatorTest.kt index b2023e36fb23c98bf2ef5cecf1d2560fa5e64278..782116fd0e313bef35b80a0fad1ae1a0e6568723 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/DaysSinceOnsetOfSymptomsVectorDeterminatorTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/DaysSinceOnsetOfSymptomsVectorDeterminatorTest.kt @@ -98,8 +98,6 @@ class DaysSinceOnsetOfSymptomsVectorDeterminatorTest { ) shouldBe intArrayOf(3000, 2999, 2998, 2997, 2996, 2995, 2994, 2993, 2992, 2991, 2990, 2989, 2988, 2987, 2986) } - private fun Instant.startMinusDays(days: Int): Symptoms.StartOf = Symptoms.StartOf.Date(this.toLocalDate().minusDays(days)) } - diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/TransmissionRiskVectorDeterminatorTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/TransmissionRiskVectorDeterminatorTest.kt index ab76adafc02aaa3c8222fdea5aaab709875dd809..39424b5dec9f7bc867af91fceceade206da516d6 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/TransmissionRiskVectorDeterminatorTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/submission/TransmissionRiskVectorDeterminatorTest.kt @@ -28,7 +28,7 @@ class TransmissionRiskVectorDeterminatorTest { MockKAnnotations.init(this) DateTime(2012, 10, 15, 10, 0, DateTimeZone.UTC).apply { every { timeStamper.nowUTC } returns this.toInstant() - now = this.toLocalDate() + now = this.toLocalDate() } } diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/main/home/MainFragmentViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/main/home/MainFragmentViewModelTest.kt index 4d2f97fd4c6bda38b952345fb62ef168853552eb..5422956790145a432cb9fd5639db48d1810615ac 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/main/home/MainFragmentViewModelTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/main/home/MainFragmentViewModelTest.kt @@ -1,2 +1 @@ package de.rki.coronawarnapp.ui.main.home - diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsTracingStateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsTracingStateTest.kt index 5cda6d7ff6ebbc6b456be7397ffd697773121c86..f3ecbf62e907e9035175a51105d900ddb5517321 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsTracingStateTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/settings/start/SettingsTracingStateTest.kt @@ -90,5 +90,4 @@ class SettingsTracingStateTest : BaseTest() { verify { context.getString(R.string.settings_tracing_status_active) } } } - } diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt index c9bcb6d8a0c85e435ffbb5bf4522ae4b82e0d93f..a5a0bf6d8d0efcf0aeda2a70db304c0b17545f07 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/tracing/card/TracingCardStateTest.kt @@ -3,12 +3,12 @@ package de.rki.coronawarnapp.ui.tracing.card import android.content.Context import de.rki.coronawarnapp.R import de.rki.coronawarnapp.risk.RiskLevelConstants -import de.rki.coronawarnapp.tracing.GeneralTracingStatus import de.rki.coronawarnapp.risk.RiskLevelConstants.INCREASED_RISK import de.rki.coronawarnapp.risk.RiskLevelConstants.LOW_LEVEL_RISK import de.rki.coronawarnapp.risk.RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF import de.rki.coronawarnapp.risk.RiskLevelConstants.UNKNOWN_RISK_INITIAL import de.rki.coronawarnapp.risk.RiskLevelConstants.UNKNOWN_RISK_OUTDATED_RESULTS +import de.rki.coronawarnapp.tracing.GeneralTracingStatus import io.kotest.matchers.shouldBe import io.mockk.MockKAnnotations import io.mockk.clearAllMocks @@ -18,7 +18,6 @@ import io.mockk.verify import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.mockito.ArgumentMatchers.anyString import testhelpers.BaseTest import java.util.Date @@ -74,7 +73,6 @@ class TracingCardStateTest : BaseTest() { verify { context.getColor(R.color.colorTextSemanticNeutral) } } - createInstance(riskLevel = NO_CALCULATION_POSSIBLE_TRACING_OFF).apply { getStableIconColor(context) verify { context.getColor(R.color.colorTextSemanticNeutral) } @@ -263,7 +261,6 @@ class TracingCardStateTest : BaseTest() { .format(context.getString(R.string.risk_card_increased_risk_headline)) } } - createInstance( riskLevel = UNKNOWN_RISK_OUTDATED_RESULTS, riskLevelLastSuccessfulCalculation = UNKNOWN_RISK_INITIAL @@ -706,7 +703,6 @@ class TracingCardStateTest : BaseTest() { showUpdateButton() shouldBe false } - createInstance( riskLevel = UNKNOWN_RISK_OUTDATED_RESULTS, isBackgroundJobEnabled = false).apply { diff --git a/Corona-Warn-App/src/test/java/testhelpers/coroutines/FlowTest.kt b/Corona-Warn-App/src/test/java/testhelpers/coroutines/FlowTest.kt index 2a8f0b5a33e8960f7c0d1e530763d845bdf68fdf..8ca8366ca8a0ec167479e505b2ed9ec0b2f43140 100644 --- a/Corona-Warn-App/src/test/java/testhelpers/coroutines/FlowTest.kt +++ b/Corona-Warn-App/src/test/java/testhelpers/coroutines/FlowTest.kt @@ -50,7 +50,6 @@ class TestCollector<T>( } .launchIn(scope) .also { job = it } - } suspend fun awaitFinal() = apply { diff --git a/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModelTest.kt b/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModelTest.kt index b54765d667c86b0982e70ce7be28accfc838080f..d375d845247ab0d43918afb07792929fe63d84b1 100644 --- a/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModelTest.kt +++ b/Corona-Warn-App/src/testDeviceForTesters/java/de/rki/coronawarnapp/test/api/ui/TestForApiFragmentViewModelTest.kt @@ -95,7 +95,6 @@ class TestForApiFragmentViewModelTest : BaseTest() { } events[0] shouldBe EnvironmentSetup.Type.DEV - states[2].apply { current shouldBe EnvironmentSetup.Type.WRU_XA }