diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ae87ca840c..2ce0ccee01 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,7 +112,7 @@ - + ): Constraint { diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt similarity index 98% rename from plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt rename to plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt index 22bd151daa..8c6196d5ad 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt @@ -1,8 +1,5 @@ -package info.nightscout.plugins.aps.openAPSSMBDynamicISF +package app.aaps.plugins.aps.openAPSSMBDynamicISF -import app.aaps.core.main.extensions.convertedToAbsolute -import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes -import app.aaps.core.main.extensions.plannedRemainingMinutes import app.aaps.core.interfaces.aps.DetermineBasalAdapter import app.aaps.core.interfaces.aps.SMBDefaults import app.aaps.core.interfaces.db.GlucoseUnit @@ -19,11 +16,14 @@ import app.aaps.core.interfaces.profile.ProfileUtil import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.utils.Round import app.aaps.core.interfaces.utils.SafeParse +import app.aaps.core.main.extensions.convertedToAbsolute +import app.aaps.core.main.extensions.getPassedDurationToTimeInMinutes +import app.aaps.core.main.extensions.plannedRemainingMinutes +import app.aaps.plugins.aps.R +import app.aaps.plugins.aps.logger.LoggerCallback +import app.aaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB +import app.aaps.plugins.aps.utils.ScriptReader import dagger.android.HasAndroidInjector -import info.nightscout.plugins.aps.R -import info.nightscout.plugins.aps.logger.LoggerCallback -import info.nightscout.plugins.aps.openAPSSMB.DetermineBasalResultSMB -import info.nightscout.plugins.aps.utils.ScriptReader import org.json.JSONArray import org.json.JSONException import org.json.JSONObject diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt similarity index 91% rename from plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt rename to plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt index e49b904a34..b9a311b223 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.aps.openAPSSMBDynamicISF +package app.aaps.plugins.aps.openAPSSMBDynamicISF import android.content.Context import app.aaps.annotations.OpenForTesting @@ -18,12 +18,12 @@ import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.plugins.aps.R +import app.aaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS +import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin +import app.aaps.plugins.aps.utils.ScriptReader import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.plugins.aps.R -import info.nightscout.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS -import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin -import info.nightscout.plugins.aps.utils.ScriptReader import javax.inject.Inject import javax.inject.Singleton diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/JSONFormatter.kt similarity index 98% rename from plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt rename to plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/JSONFormatter.kt index ffaa890a3d..82fec6a11b 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/JSONFormatter.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.aps.utils +package app.aaps.plugins.aps.utils import android.text.Spanned import app.aaps.core.interfaces.logging.AAPSLogger diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/ScriptReader.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/ScriptReader.kt similarity index 94% rename from plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/ScriptReader.kt rename to plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/ScriptReader.kt index 3781c4b89a..c59acf83d4 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/ScriptReader.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/ScriptReader.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.aps.utils +package app.aaps.plugins.aps.utils import android.content.Context import java.io.ByteArrayOutputStream diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/StaticInjector.kt b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/StaticInjector.kt similarity index 94% rename from plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/StaticInjector.kt rename to plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/StaticInjector.kt index a861a6d4fe..e511bc30a7 100644 --- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/StaticInjector.kt +++ b/plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/StaticInjector.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.aps.utils +package app.aaps.plugins.aps.utils import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector diff --git a/plugins/aps/src/main/res/layout/autotune_fragment.xml b/plugins/aps/src/main/res/layout/autotune_fragment.xml index b97d84a846..105c300944 100644 --- a/plugins/aps/src/main/res/layout/autotune_fragment.xml +++ b/plugins/aps/src/main/res/layout/autotune_fragment.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="info.nightscout.plugins.general.autotune.AutotuneFragment"> + tools:context=".autotune.AutotuneFragment"> (1).also { diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/AutotunePrepTest.kt similarity index 96% rename from plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt rename to plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/AutotunePrepTest.kt index 012fed9ea2..ff7ff36d35 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt +++ b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/AutotunePrepTest.kt @@ -1,4 +1,4 @@ -package info.nightscout.plugins.general.autotune +package app.aaps.plugins.aps.autotune import app.aaps.core.interfaces.db.GlucoseUnit import app.aaps.core.interfaces.iob.IobTotal @@ -16,10 +16,12 @@ import app.aaps.database.entities.Carbs import app.aaps.database.entities.GlucoseValue import app.aaps.database.entities.data.Block import app.aaps.database.entities.data.TargetBlock +import app.aaps.plugins.aps.autotune.data.ATProfile +import app.aaps.plugins.aps.autotune.data.LocalInsulin +import app.aaps.plugins.aps.autotune.data.PreppedGlucose import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import info.nightscout.database.impl.AppRepository -import info.nightscout.plugins.general.autotune.data.PreppedGlucose import org.json.JSONArray import org.json.JSONObject import org.junit.jupiter.api.BeforeEach @@ -149,7 +151,7 @@ class AutotunePrepTest : TestBaseWithProfile() { * OpenAPS profile for Autotune only have one ISF value and one IC value */ @Suppress("SpellCheckingInspection") - private fun atProfileFromOapsJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): info.nightscout.plugins.general.autotune.data.ATProfile? { + private fun atProfileFromOapsJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): ATProfile? { try { min5mCarbImpact = JsonHelper.safeGetDoubleAllowNull(jsonObject, "min_5m_carbimpact") ?: return null autotuneMin = JsonHelper.safeGetDoubleAllowNull(jsonObject, "autosens_min") ?: return null @@ -158,7 +160,7 @@ class AutotunePrepTest : TestBaseWithProfile() { val units = GlucoseUnit.fromText(txtUnits) val dia = JsonHelper.safeGetDoubleAllowNull(jsonObject, "dia") ?: return null val peak = JsonHelper.safeGetIntAllowNull(jsonObject, "insulinPeakTime") ?: return null - val localInsulin = info.nightscout.plugins.general.autotune.data.LocalInsulin("insulin", peak, dia) + val localInsulin = LocalInsulin("insulin", peak, dia) val timezone = TimeZone.getTimeZone(JsonHelper.safeGetString(jsonObject, "timezone", "UTC")) val isfJson = jsonObject.getJSONObject("isfProfile") val isfBlocks = ArrayList(1).also { @@ -186,7 +188,7 @@ class AutotunePrepTest : TestBaseWithProfile() { timeZone = timezone, dia = dia ) - return info.nightscout.plugins.general.autotune.data.ATProfile(ProfileSealed.Pure(pure), localInsulin, profileInjector).also { it.dateUtil = dateUtil } + return ATProfile(ProfileSealed.Pure(pure), localInsulin, profileInjector).also { it.dateUtil = dateUtil } } catch (ignored: Exception) { return null } @@ -296,7 +298,7 @@ class AutotunePrepTest : TestBaseWithProfile() { autotuneFS ) { - override fun getIOB(time: Long, localInsulin: info.nightscout.plugins.general.autotune.data.LocalInsulin): IobTotal { + override fun getIOB(time: Long, localInsulin: LocalInsulin): IobTotal { val bolusIob = IobTotal(time) iobOapsCalculation.forEach { if (it.time == time) diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/PreppedGlucoseTest.kt similarity index 91% rename from plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt rename to plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/PreppedGlucoseTest.kt index 38237e91df..5eb011a232 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt +++ b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/PreppedGlucoseTest.kt @@ -1,10 +1,10 @@ -package info.nightscout.plugins.general.autotune +package app.aaps.plugins.aps.autotune +import app.aaps.plugins.aps.autotune.data.BGDatum +import app.aaps.plugins.aps.autotune.data.CRDatum +import app.aaps.plugins.aps.autotune.data.PreppedGlucose import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat -import info.nightscout.plugins.general.autotune.data.BGDatum -import info.nightscout.plugins.general.autotune.data.CRDatum -import info.nightscout.plugins.general.autotune.data.PreppedGlucose import org.json.JSONObject import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt similarity index 96% rename from plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt rename to plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt index f8c951a51c..7fb4577c31 100644 --- a/plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt +++ b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt @@ -1,8 +1,7 @@ -package info.nightscout.plugins.aps.loop +package app.aaps.plugins.aps.loop import android.app.NotificationManager import android.content.Context -import app.aaps.core.main.utils.fabric.FabricPrivacy import app.aaps.core.interfaces.aps.ApsMode import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.constraints.ConstraintsChecker @@ -18,13 +17,14 @@ import app.aaps.core.interfaces.resources.ResourceHelper import app.aaps.core.interfaces.sharedPreferences.SP import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.DateUtil +import app.aaps.core.main.utils.fabric.FabricPrivacy +import app.aaps.core.nssdk.interfaces.RunningConfiguration import app.aaps.shared.tests.TestBase import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository import info.nightscout.pump.virtual.VirtualPumpPlugin -import app.aaps.core.nssdk.interfaces.RunningConfiguration import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock @@ -68,7 +68,7 @@ class LoopPluginTest : TestBase() { @Test fun testPluginInterface() { `when`(rh.gs(app.aaps.core.ui.R.string.loop)).thenReturn("Loop") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.loop_shortname)).thenReturn("LOOP") + `when`(rh.gs(app.aaps.plugins.aps.R.string.loop_shortname)).thenReturn("LOOP") `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.CLOSED.name) val pumpDescription = PumpDescription() `when`(virtualPumpPlugin.pumpDescription).thenReturn(pumpDescription) @@ -78,7 +78,7 @@ class LoopPluginTest : TestBase() { assertThat(loopPlugin.nameShort).isEqualTo("LOOP") assertThat(loopPlugin.hasFragment()).isTrue() assertThat(loopPlugin.showInList(PluginType.LOOP)).isTrue() - assertThat(loopPlugin.preferencesId.toLong()).isEqualTo(info.nightscout.plugins.aps.R.xml.pref_loop.toLong()) + assertThat(loopPlugin.preferencesId.toLong()).isEqualTo(app.aaps.plugins.aps.R.xml.pref_loop.toLong()) // Plugin is disabled by default assertThat(loopPlugin.isEnabled()).isFalse() diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt index bc2aa4e9bd..f5cf082961 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt @@ -18,6 +18,9 @@ import app.aaps.core.interfaces.queue.CommandQueue import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.implementation.iob.GlucoseStatusProviderImpl +import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin +import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin +import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector @@ -28,9 +31,6 @@ import info.nightscout.androidaps.insight.database.InsightDatabaseDao import info.nightscout.androidaps.insight.database.InsightDbHelper import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin import info.nightscout.database.impl.AppRepository -import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin -import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin -import info.nightscout.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin import info.nightscout.plugins.constraints.objectives.objectives.Objective import info.nightscout.plugins.constraints.safety.SafetyPlugin @@ -99,19 +99,19 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences") `when`(rh.gs(app.aaps.core.ui.R.string.no_valid_basal_rate)).thenReturn("No valid basal rate read from pump") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.autosens_disabled_in_preferences)).thenReturn("Autosens disabled in preferences") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences") + `when`(rh.gs(app.aaps.plugins.aps.R.string.autosens_disabled_in_preferences)).thenReturn("Autosens disabled in preferences") + `when`(rh.gs(app.aaps.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences") `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier") + `when`(rh.gs(app.aaps.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier") + `when`(rh.gs(app.aaps.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier") `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") `when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %.1f U because of %s") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.hardlimit)).thenReturn("hard limit") `when`(rh.gs(info.nightscout.core.utils.R.string.key_child)).thenReturn("child") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %d g because of %s") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.limiting_iob)).thenReturn("Limiting IOB to %.1f U because of %s") + `when`(rh.gs(app.aaps.plugins.aps.R.string.limiting_iob)).thenReturn("Limiting IOB to %.1f U because of %s") `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") @@ -291,7 +291,7 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { fun isSMBModeEnabledTest() { openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true) objectivesPlugin.objectives[Objectives.SMB_OBJECTIVE].startedOn = 0 - `when`(sp.getBoolean(info.nightscout.plugins.aps.R.string.key_use_smb, false)).thenReturn(false) + `when`(sp.getBoolean(app.aaps.plugins.aps.R.string.key_use_smb, false)).thenReturn(false) `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.OPEN.name) // `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(ConstraintObject(true)) val c = constraintChecker.isSMBModeEnabled() @@ -316,9 +316,9 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { // insightPlugin.setStatusResult(result); // No limit by default - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child") // Apply all limits @@ -343,9 +343,9 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { // insightPlugin.setStatusResult(result); // No limit by default - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child") // Apply all limits @@ -400,7 +400,7 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { fun iobAMAShouldBeLimited() { // No limit by default `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.CLOSED.name) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("teenage") openAPSAMAPlugin.setPluginEnabled(PluginType.APS, true) openAPSSMBPlugin.setPluginEnabled(PluginType.APS, false) @@ -416,7 +416,7 @@ class ConstraintsCheckerImplTest : TestBaseWithProfile() { fun iobSMBShouldBeLimited() { // No limit by default `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.CLOSED.name) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapssmb_max_iob, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapssmb_max_iob, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("teenage") openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true) openAPSAMAPlugin.setPluginEnabled(PluginType.APS, false) diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt index e2eaa9c7f9..0b637e8595 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt @@ -1,6 +1,5 @@ package info.nightscout.plugins.constraints.safety -import app.aaps.core.main.constraints.ConstraintObject import app.aaps.core.interfaces.aps.ApsMode import app.aaps.core.interfaces.bgQualityCheck.BgQualityCheck import app.aaps.core.interfaces.constraints.Constraint @@ -12,13 +11,14 @@ import app.aaps.core.interfaces.pump.defs.PumpDescription import app.aaps.core.interfaces.stats.TddCalculator import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.utils.HardLimits +import app.aaps.core.main.constraints.ConstraintObject +import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin +import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import app.aaps.shared.tests.TestBaseWithProfile import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.database.impl.AppRepository -import info.nightscout.plugins.aps.openAPSAMA.OpenAPSAMAPlugin -import info.nightscout.plugins.aps.openAPSSMB.OpenAPSSMBPlugin import info.nightscout.pump.virtual.VirtualPumpPlugin import info.nightscout.source.GlimpPlugin import org.junit.jupiter.api.BeforeEach @@ -54,16 +54,16 @@ class SafetyPluginTest : TestBaseWithProfile() { `when`(rh.gs(app.aaps.core.ui.R.string.itmustbepositivevalue)).thenReturn("it must be positive value") `when`(rh.gs(app.aaps.core.ui.R.string.pumplimit)).thenReturn("pump limit") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.maxvalueinpreferences)).thenReturn("max value in preferences") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier") + `when`(rh.gs(app.aaps.plugins.aps.R.string.max_daily_basal_multiplier)).thenReturn("max daily basal multiplier") + `when`(rh.gs(app.aaps.plugins.aps.R.string.max_basal_multiplier)).thenReturn("max basal multiplier") `when`(rh.gs(app.aaps.core.ui.R.string.limitingbolus)).thenReturn("Limiting bolus to %1\$.1f U because of %2\$s") `when`(rh.gs(app.aaps.core.ui.R.string.limitingbasalratio)).thenReturn("Limiting max basal rate to %1\$.2f U/h because of %2\$s") `when`(rh.gs(app.aaps.core.ui.R.string.limiting_iob)).thenReturn("Limiting IOB to %1\$.1f U because of %2\$s") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.limitingcarbs)).thenReturn("Limiting carbs to %1\$d g because of %2\$s") `when`(rh.gs(app.aaps.core.ui.R.string.limitingpercentrate)).thenReturn("Limiting max percent rate to %1\$d%% because of %2\$s") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.pumpisnottempbasalcapable)).thenReturn("Pump is not temp basal capable") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.increasing_max_basal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile") - `when`(rh.gs(info.nightscout.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences") + `when`(rh.gs(app.aaps.plugins.aps.R.string.increasing_max_basal)).thenReturn("Increasing max basal value because setting is lower than your max basal in profile") + `when`(rh.gs(app.aaps.plugins.aps.R.string.smb_disabled_in_preferences)).thenReturn("SMB disabled in preferences") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closedmodedisabledinpreferences)).thenReturn("Closed loop mode disabled in preferences") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.closed_loop_disabled_on_dev_branch)).thenReturn("Running dev version. Closed loop is disabled.") `when`(rh.gs(info.nightscout.plugins.constraints.R.string.smbalwaysdisabled)).thenReturn("SMB always and after carbs disabled because active BG source doesn\\'t support advanced filtering") @@ -112,7 +112,7 @@ class SafetyPluginTest : TestBaseWithProfile() { @Test fun notEnabledSMBInPreferencesDisablesSMB() { - `when`(sp.getBoolean(info.nightscout.plugins.aps.R.string.key_use_smb, false)).thenReturn(false) + `when`(sp.getBoolean(app.aaps.plugins.aps.R.string.key_use_smb, false)).thenReturn(false) `when`(constraintChecker.isClosedLoopAllowed(anyObject())).thenReturn(ConstraintObject(true, aapsLogger)) val c = openAPSSMBPlugin.isSMBModeEnabled(ConstraintObject(true, aapsLogger)) assertThat(c.getReasons()).contains("SMB disabled in preferences") @@ -121,7 +121,7 @@ class SafetyPluginTest : TestBaseWithProfile() { @Test fun openLoopPreventsSMB() { - `when`(sp.getBoolean(info.nightscout.plugins.aps.R.string.key_use_smb, false)).thenReturn(true) + `when`(sp.getBoolean(app.aaps.plugins.aps.R.string.key_use_smb, false)).thenReturn(true) `when`(constraintChecker.isClosedLoopAllowed()).thenReturn(ConstraintObject(false, aapsLogger)) val c = safetyPlugin.isSMBModeEnabled(ConstraintObject(true, aapsLogger)) assertThat(c.getReasons()).contains("SMB not allowed in open loop mode") @@ -138,9 +138,9 @@ class SafetyPluginTest : TestBaseWithProfile() { @Test fun basalRateShouldBeLimited() { - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child") val c = ConstraintObject(Double.MAX_VALUE, aapsLogger) safetyPlugin.applyBasalConstraints(c, validProfile) @@ -167,9 +167,9 @@ class SafetyPluginTest : TestBaseWithProfile() { @Test fun percentBasalRateShouldBeLimited() { // No limit by default - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child") val i = ConstraintObject(Int.MAX_VALUE, aapsLogger) safetyPlugin.applyBasalPercentConstraints(i, validProfile) @@ -190,9 +190,9 @@ Safety: Limiting max basal rate to 500.00 U/h because of pump limit @Test fun percentBasalShouldBeLimitedBySMB() { // No limit by default - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_basal, 1.0)).thenReturn(1.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_current_basal_safety_multiplier, 4.0)).thenReturn(4.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsama_max_daily_safety_multiplier, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("child") openAPSSMBPlugin.setPluginEnabled(PluginType.APS, true) val i = ConstraintObject(Double.MAX_VALUE, aapsLogger) @@ -273,8 +273,8 @@ Safety: Limiting max basal rate to 500.00 U/h because of pump limit //`when`(openAPSSMBPlugin.isEnabled()).thenReturn(true) //`when`(openAPSAMAPlugin.isEnabled()).thenReturn(false) `when`(sp.getString(info.nightscout.core.utils.R.string.key_aps_mode, ApsMode.OPEN.name)).thenReturn(ApsMode.LGS.name) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5) - `when`(sp.getDouble(info.nightscout.plugins.aps.R.string.key_openapssmb_max_iob, 3.0)).thenReturn(3.0) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapsma_max_iob, 1.5)).thenReturn(1.5) + `when`(sp.getDouble(app.aaps.plugins.aps.R.string.key_openapssmb_max_iob, 3.0)).thenReturn(3.0) `when`(sp.getString(info.nightscout.core.utils.R.string.key_age, "")).thenReturn("teenage") // Apply all limits