From 2fd093091f5629da2f0814e8f4a54c956e204517 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 18 May 2021 18:30:52 +0200 Subject: [PATCH] kotlin 1.5.0 --- .../androidaps/interfaces/ConstraintsCheckerTest.kt | 1 + .../general/automation/actions/ActionLoopSuspendTest.kt | 1 + .../general/automation/actions/ActionProfileSwitchTest.kt | 3 ++- .../plugins/general/automation/actions/ActionsTestBase.kt | 4 ++++ build.gradle | 2 +- 5 files changed, 9 insertions(+), 2 deletions(-) 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 449ea3c5e6..d4b70b96f2 100644 --- a/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt +++ b/app/src/test/java/info/nightscout/androidaps/interfaces/ConstraintsCheckerTest.kt @@ -127,6 +127,7 @@ class ConstraintsCheckerTest : TestBaseWithProfile() { `when`(resourceHelper.gs(R.string.limitingbolus, 6.0, "pump limit")).thenReturn("") `when`(resourceHelper.gs(R.string.limitingbasalratio, 0.8, "pump limit")).thenReturn("") `when`(resourceHelper.gs(R.string.limitingpercentrate, 200, "pump limit")).thenReturn("") + `when`(resourceHelper.gs(R.string.combo_pump_unsupported_operation)).thenReturn("Requested operation not supported by pump") // RS constructor `when`(sp.getString(R.string.key_danars_address, "")).thenReturn("") diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt index 7ee31d1d16..ec4cfa0956 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopSuspendTest.kt @@ -22,6 +22,7 @@ class ActionLoopSuspendTest : ActionsTestBase() { `when`(resourceHelper.gs(R.string.suspendloop)).thenReturn("Suspend loop") `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.suspendloopforXmin), ArgumentMatchers.anyInt())).thenReturn("Suspend loop for %d min") + `when`(resourceHelper.gs(R.string.alreadysuspended)).thenReturn("Already suspended") sut = ActionLoopSuspend(injector) } diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt index b55239e97a..6bf564425b 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionProfileSwitchTest.kt @@ -27,7 +27,8 @@ class ActionProfileSwitchTest : ActionsTestBase() { `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.changengetoprofilename), ArgumentMatchers.anyString())).thenReturn("Change profile to %s") `when`(resourceHelper.gs(R.string.alreadyset)).thenReturn("Already set") `when`(resourceHelper.gs(R.string.notexists)).thenReturn("not exists") - `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK") + `when`(resourceHelper.gs(R.string.error_field_must_not_be_empty)).thenReturn("The field must not be empty") + `when`(resourceHelper.gs(R.string.noprofile)).thenReturn("No profile loaded from NS yet") sut = ActionProfileSwitch(injector) } diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt index 9986e70630..8831ea6cb4 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionsTestBase.kt @@ -5,6 +5,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.Constants import info.nightscout.androidaps.plugins.general.automation.TestBaseWithProfile import info.nightscout.androidaps.TestPumpPlugin +import info.nightscout.androidaps.automation.R import info.nightscout.androidaps.data.PumpEnactResult import info.nightscout.androidaps.interfaces.* import info.nightscout.androidaps.logging.AAPSLogger @@ -135,5 +136,8 @@ open class ActionsTestBase : TestBaseWithProfile() { `when`(profileFunction.getUnits()).thenReturn(GlucoseUnit.MGDL) `when`(activePlugin.activeProfileSource).thenReturn(profilePlugin) `when`(profilePlugin.profile).thenReturn(getValidProfileStore()) + + `when`(resourceHelper.gs(R.string.ok)).thenReturn("OK") + `when`(resourceHelper.gs(R.string.error)).thenReturn("Error") } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 7eb8d883ce..19d06093fa 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.4.32' + kotlin_version = '1.5.0' coreVersion = '1.3.2' rxjava_version = '2.2.21' rxandroid_version = '2.1.1'