From b3ec381f711439dd77826eae316762db09baae44 Mon Sep 17 00:00:00 2001
From: chris-cwa <69595386+chris-cwa@users.noreply.github.com>
Date: Thu, 1 Oct 2020 13:49:55 +0200
Subject: [PATCH] release 1.5.x house keeping (#1271)

---
 .../java/de/rki/coronawarnapp/appconfig/AppConfigModuleTest.kt | 1 -
 .../InteroperabilityConfigurationFragmentViewModelTest.kt      | 3 ++-
 .../rki/coronawarnapp/ui/viewmodel/SubmissionViewModelTest.kt  | 1 -
 .../rki/coronawarnapp/util/security/EncryptionResetToolTest.kt | 3 ---
 .../de/rki/coronawarnapp/util/security/SecurityHelperTest.kt   | 1 -
 .../{CoroutineTestExtension.kt => CoroutinesTestExtension.kt}  | 0
 6 files changed, 2 insertions(+), 7 deletions(-)
 rename Corona-Warn-App/src/test/java/testhelpers/extensions/{CoroutineTestExtension.kt => CoroutinesTestExtension.kt} (100%)

diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/AppConfigModuleTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/AppConfigModuleTest.kt
index e9917c952..fdae6dd05 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/AppConfigModuleTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/appconfig/AppConfigModuleTest.kt
@@ -44,5 +44,4 @@ class AppConfigModuleTest : BaseIOTest() {
             createModule()
         }
     }
-
 }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModelTest.kt
index 61ea717a0..a5d1b05dd 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModelTest.kt
@@ -6,7 +6,8 @@ import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import io.mockk.junit5.MockKExtension
 import io.mockk.verify
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModelTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModelTest.kt
index 009decb3c..cbc54ad5d 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModelTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/viewmodel/SubmissionViewModelTest.kt
@@ -28,7 +28,6 @@ class SubmissionViewModelTest {
         mockkObject(LocalData)
         every { LocalData.testGUID(any()) } just Runs
 
-
         mockkObject(BackgroundNoise.Companion)
         every { BackgroundNoise.getInstance() } returns backgroundNoise
     }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt
index f229c4edb..7daab4ac9 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/EncryptionResetToolTest.kt
@@ -94,7 +94,6 @@ class EncryptionResetToolTest : BaseIOTest() {
         instance.isResetNoticeToBeShown = false
         mockPreferences.dataMapPeek["ea1851.reset.shownotice"] shouldBe false
         instance.isResetNoticeToBeShown shouldBe false
-
     }
 
     @Test
@@ -201,7 +200,6 @@ class EncryptionResetToolTest : BaseIOTest() {
         encryptedPrefsFile.exists() shouldBe true
         encryptedDatabaseFile.exists() shouldBe true
 
-
         mockPreferences.dataMapPeek.apply {
             this["ea1851.reset.performedAt"] shouldBe null
             this["ea1851.reset.windowconsumed"] shouldBe true
@@ -268,5 +266,4 @@ class EncryptionResetToolTest : BaseIOTest() {
             this["ea1851.reset.shownotice"] shouldBe null
         }
     }
-
 }
diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/SecurityHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/SecurityHelperTest.kt
index 1a3dbb968..8aefbcda3 100644
--- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/SecurityHelperTest.kt
+++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/security/SecurityHelperTest.kt
@@ -94,5 +94,4 @@ class SecurityHelperTest : BaseTest() {
             errorResetTool.tryResetIfNecessary(ourException!!)
         }
     }
-
 }
diff --git a/Corona-Warn-App/src/test/java/testhelpers/extensions/CoroutineTestExtension.kt b/Corona-Warn-App/src/test/java/testhelpers/extensions/CoroutinesTestExtension.kt
similarity index 100%
rename from Corona-Warn-App/src/test/java/testhelpers/extensions/CoroutineTestExtension.kt
rename to Corona-Warn-App/src/test/java/testhelpers/extensions/CoroutinesTestExtension.kt
-- 
GitLab