From d1a647830f72d63052822122a5f53370eb6efe62 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Thu, 11 Feb 2021 23:33:22 +0100
Subject: [PATCH] update mockito

---
 app/build.gradle                                |   2 +-
 app/jacoco.exec                                 | Bin 0 -> 82546 bytes
 .../interfaces/ConstraintsCheckerTest.kt        |   8 ++++----
 .../configBuilder/ConfigBuilderPluginTest.kt    |   2 ++
 .../objectives/ObjectivesPluginTest.kt          |   2 ++
 .../maintenance/ClassicPrefsFormatTest.kt       |   5 +++--
 .../maintenance/EncryptedPrefsFormatTest.kt     |   4 +++-
 .../SmsCommunicatorPluginTest.kt                |   2 +-
 build.gradle                                    |   2 +-
 9 files changed, 17 insertions(+), 10 deletions(-)
 create mode 100644 app/jacoco.exec

diff --git a/app/build.gradle b/app/build.gradle
index 7f2c67e5d3..f95f2ddc9b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -258,7 +258,7 @@ dependencies {
     testImplementation "org.skyscreamer:jsonassert:1.5.0"
     testImplementation "org.hamcrest:hamcrest-all:1.3"
 
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha03'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04'
     androidTestImplementation "androidx.test.ext:junit:$androidx_junit"
     androidTestImplementation "androidx.test:rules:$androidx_rules"
 
diff --git a/app/jacoco.exec b/app/jacoco.exec
new file mode 100644
index 0000000000000000000000000000000000000000..1622861d3aaa3e9d1c3d9a04de71580b928cc274
GIT binary patch
literal 82546
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
IC}pGmf7L!hlK=n!

literal 0
HcmV?d00001

diff --git a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
index 48ebe49bc8..7af1bb33b2 100644
--- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt
@@ -8,6 +8,9 @@ import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.TestBaseWithProfile
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
@@ -20,9 +23,6 @@ import info.nightscout.androidaps.plugins.general.nsclient.UploadQueue
 import info.nightscout.androidaps.plugins.iob.iobCobCalculator.IobCobCalculatorPlugin
 import info.nightscout.androidaps.plugins.pump.combo.ComboPlugin
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danars.DanaRSPlugin
-import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin
@@ -47,7 +47,7 @@ import java.util.*
  * Created by mike on 18.03.2018.
  */
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, SP::class, Context::class, OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class, VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, GlimpPlugin::class, Profiler::class)
+@PrepareForTest(MainApp::class, ConfigBuilderPlugin::class, ConstraintChecker::class, SP::class, Context::class, OpenAPSAMAPlugin::class, OpenAPSSMBPlugin::class, TreatmentsPlugin::class, TreatmentService::class, VirtualPumpPlugin::class, DetailedBolusInfoStorage::class, GlimpPlugin::class, Profiler::class, UserEntryLogger::class)
 class ConstraintsCheckerTest : TestBaseWithProfile() {
 
     @Mock lateinit var activePlugin: ActivePluginProvider
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
index aa21e0a2bf..7a85c0284e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderPluginTest.kt
@@ -16,9 +16,11 @@ import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
+@PrepareForTest(UserEntryLogger::class)
 class ConfigBuilderPluginTest : TestBase() {
 
     @Mock lateinit var virtualPumpPlugin: Lazy<VirtualPumpPlugin>
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
index bf0075e992..8c4f0bac87 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesPluginTest.kt
@@ -18,8 +18,10 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
+@PrepareForTest(UserEntryLogger::class)
 @RunWith(PowerMockRunner::class)
 class ObjectivesPluginTest : TestBase() {
 
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt
index f0a5c07491..2e27046f5b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/ClassicPrefsFormatTest.kt
@@ -11,7 +11,6 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.Mock
-import org.mockito.Mockito
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -24,6 +23,7 @@ class ClassicPrefsFormatTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var sp: SP
+    @Mock lateinit var file: MockedFile
 
     @Test
     fun preferenceLoadingTest() {
@@ -53,8 +53,9 @@ class ClassicPrefsFormatTest : TestBase() {
         classicFormat.savePreferences(getMockedFile(), prefs)
     }
 
+    class MockedFile(s: String) : File(s)
+
     private fun getMockedFile(): File {
-        val file = Mockito.mock(File::class.java)
         `when`(file.exists()).thenReturn(true)
         `when`(file.canRead()).thenReturn(true)
         `when`(file.canWrite()).thenReturn(true)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt
index fa52651e50..5438f15eac 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/maintenance/EncryptedPrefsFormatTest.kt
@@ -28,6 +28,7 @@ class EncryptedPrefsFormatTest : TestBase() {
 
     @Mock lateinit var resourceHelper: ResourceHelper
     @Mock lateinit var sp: SP
+    @Mock lateinit var file: MockedFile
 
     private var cryptoUtil: CryptoUtil = CryptoUtil(aapsLogger)
 
@@ -228,8 +229,9 @@ class EncryptedPrefsFormatTest : TestBase() {
         encryptedFormat.loadPreferences(getMockedFile(), "sikret")
     }
 
+    class MockedFile(s: String) : File(s)
+
     private fun getMockedFile(): File {
-        val file = Mockito.mock(File::class.java)
         Mockito.`when`(file.exists()).thenReturn(true)
         Mockito.`when`(file.canRead()).thenReturn(true)
         Mockito.`when`(file.canWrite()).thenReturn(true)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
index e650f9ff71..ab55ab89c5 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPluginTest.kt
@@ -51,7 +51,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 import java.util.*
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(ConstraintChecker::class, FabricPrivacy::class, VirtualPumpPlugin::class, XdripCalibrations::class, SmsManager::class, CommandQueue::class, LocalProfilePlugin::class, DateUtil::class, IobCobCalculatorPlugin::class, OneTimePassword::class)
+@PrepareForTest(ConstraintChecker::class, FabricPrivacy::class, VirtualPumpPlugin::class, XdripCalibrations::class, SmsManager::class, CommandQueue::class, LocalProfilePlugin::class, DateUtil::class, IobCobCalculatorPlugin::class, OneTimePassword::class, UserEntryLogger::class)
 class SmsCommunicatorPluginTest : TestBaseWithProfile() {
 
     @Mock lateinit var context: Context
diff --git a/build.gradle b/build.gradle
index fa16a53f76..61aeae6ce4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ buildscript {
         work_version = '2.5.0'
 
         junit_version = '4.13.1'
-        mockitoVersion = '2.8.47'
+        mockitoVersion = '3.7.7'
         powermockVersion = '2.0.9'
         dexmakerVersion = "1.2"
         retrofit2Version = '2.9.0'