Ins Conc PumpRate Fix tests

Philoul · Philoul · commit 566fb2db81a4 · 2026-01-31T23:25:43.000+01:00
diff --git a/app/src/test/kotlin/app/aaps/receivers/KeepAliveWorkerTest.kt b/app/src/test/kotlin/app/aaps/receivers/KeepAliveWorkerTest.kt
@@ -74,6 +74,7 @@ class KeepAliveWorkerTest : TestBaseWithProfile() {
             it.localAlertUtils = localAlertUtils
             it.workManager = workManager
             it.rh = rh
+            it.ch = ch
         }
 
     @Test
diff --git a/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt
@@ -65,7 +65,7 @@ class LoopPluginTest : TestBaseWithProfile() {
         loopPlugin = LoopPlugin(
             aapsLogger, aapsSchedulers, rxBus, preferences, sp, config,
             constraintChecker, rh, profileFunction, context, commandQueue, activePlugin, iobCobCalculator, processedTbrEbData, receiverStatusStore, fabricPrivacy, dateUtil, uel,
-            persistenceLayer, runningConfiguration, uiInteraction, pumpEnactResultProvider, processedDeviceStatusData, pumpStatusProvider, testScope
+            persistenceLayer, runningConfiguration, uiInteraction, pumpEnactResultProvider, processedDeviceStatusData, pumpStatusProvider, ch, testScope
         )
         whenever(activePlugin.activePump).thenReturn(virtualPumpPlugin)
         whenever(context.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(notificationManager)
diff --git a/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPluginTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPluginTest.kt
@@ -22,7 +22,7 @@ class OpenAPSAMAPluginTest : TestBaseWithProfile() {
         openAPSAMAPlugin = OpenAPSAMAPlugin(
             aapsLogger, rxBus, constraintChecker, rh, config, profileFunction, activePlugin,
             iobCobCalculator, processedTbrEbData, hardLimits, dateUtil, persistenceLayer, glucoseStatusProvider, preferences, determineBasalAMA,
-            GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider
+            GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider, ch
         )
     }
 
diff --git a/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/openAPSAutoISF/OpenAPSAutoISFPluginTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/openAPSAutoISF/OpenAPSAutoISFPluginTest.kt
@@ -36,7 +36,7 @@ class OpenAPSAutoISFPluginTest : TestBaseWithProfile() {
             aapsLogger, rxBus, constraintChecker, rh, profileFunction, profileUtil, config, activePlugin,
             iobCobCalculator, hardLimits, preferences, dateUtil, processedTbrEbData, persistenceLayer, glucoseStatusProvider,
             bgQualityCheck, uiInteraction, determineBasalSMB, profiler,
-            GlucoseStatusCalculatorAutoIsf(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider
+            GlucoseStatusCalculatorAutoIsf(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider, ch
         )
     }
 
@@ -148,7 +148,7 @@ class OpenAPSAutoISFPluginTest : TestBaseWithProfile() {
             maxUAMSMBBasalMinutes = preferences.get(IntKey.ApsUamMaxMinutesOfBasalToLimitSmb),
             bolus_increment = 0.1,
             carbsReqThreshold = preferences.get(IntKey.ApsCarbsRequestThreshold),
-            current_basal = activePlugin.activePump.baseBasalRate,
+            current_basal = ch.fromPump(activePlugin.activePump.baseBasalRate),
             temptargetSet = true,
             autosens_max = preferences.get(DoubleKey.AutosensMax),
             out_units = "mg/dl",
@@ -235,7 +235,7 @@ class OpenAPSAutoISFPluginTest : TestBaseWithProfile() {
             maxUAMSMBBasalMinutes = preferences.get(IntKey.ApsUamMaxMinutesOfBasalToLimitSmb),
             bolus_increment = 0.1,
             carbsReqThreshold = preferences.get(IntKey.ApsCarbsRequestThreshold),
-            current_basal = activePlugin.activePump.baseBasalRate,
+            current_basal = ch.fromPump(activePlugin.activePump.baseBasalRate),
             temptargetSet = true,
             autosens_max = preferences.get(DoubleKey.AutosensMax),
             out_units = "mg/dl",
diff --git a/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/openAPSSMB/OpenAPSSMBPluginTest.kt b/plugins/aps/src/test/kotlin/app/aaps/plugins/aps/openAPSSMB/OpenAPSSMBPluginTest.kt
@@ -29,7 +29,7 @@ class OpenAPSSMBPluginTest : TestBaseWithProfile() {
         openAPSSMBPlugin = OpenAPSSMBPlugin(
             aapsLogger, rxBus, constraintChecker, rh, profileFunction, profileUtil, config, activePlugin,
             iobCobCalculator, hardLimits, preferences, dateUtil, processedTbrEbData, persistenceLayer, glucoseStatusProvider,
-            tddCalculator, bgQualityCheck, uiInteraction, determineBasalSMB, profiler, GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider
+            tddCalculator, bgQualityCheck, uiInteraction, determineBasalSMB, profiler, GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider, ch
         )
     }
 
diff --git a/pump/eopatch/src/test/kotlin/app/aaps/pump/eopatch/EopatchPumpPluginTest.kt b/pump/eopatch/src/test/kotlin/app/aaps/pump/eopatch/EopatchPumpPluginTest.kt
@@ -158,7 +158,7 @@ class EopatchPumpPluginTest : EopatchTestBase() {
     fun `baseBasalRate should return 0 when not activated`() {
         patchConfig.lifecycleEvent = PatchLifecycleEvent.createShutdown()
 
-        assertThat(plugin.baseBasalRate).isWithin(0.001).of(0.0)
+        assertThat(plugin.baseBasalRate.cU).isWithin(0.001).of(0.0)
     }
 
     @Test
@@ -170,7 +170,7 @@ class EopatchPumpPluginTest : EopatchTestBase() {
         patchState.update(bytes, System.currentTimeMillis())
         whenever(eopatchPreferenceManager.patchState).thenReturn(patchState)
 
-        assertThat(plugin.baseBasalRate).isWithin(0.001).of(0.0)
+        assertThat(plugin.baseBasalRate.cU).isWithin(0.001).of(0.0)
     }
 
     @Test
diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestBaseWithProfile.kt
@@ -22,6 +22,8 @@ import app.aaps.core.interfaces.profile.ProfileFunction
 import app.aaps.core.interfaces.profile.ProfileStore
 import app.aaps.core.interfaces.profile.ProfileUtil
 import app.aaps.core.interfaces.pump.PumpEnactResult
+import app.aaps.core.interfaces.pump.PumpInsulin
+import app.aaps.core.interfaces.pump.PumpRate
 import app.aaps.core.interfaces.resources.ResourceHelper
 import app.aaps.core.interfaces.utils.DateUtil
 import app.aaps.core.interfaces.utils.DecimalFormatter
@@ -183,7 +185,7 @@ open class TestBaseWithProfile : TestBase() {
         whenever(preferences.get(StringKey.GeneralUnits)).thenReturn(GlucoseUnit.MGDL.asText)
         whenever(localProfileManager.profile).thenReturn(getValidProfileStore())
         deltaCalculator = DeltaCalculator(aapsLogger)
-        apsResultProvider = Provider { DetermineBasalResult(aapsLogger, constraintsChecker, preferences, activePlugin, processedTbrEbData, profileFunction, rh, decimalFormatter, dateUtil, apsResultProvider) }
+        apsResultProvider = Provider { DetermineBasalResult(aapsLogger, constraintsChecker, preferences, activePlugin, processedTbrEbData, profileFunction, rh, decimalFormatter, dateUtil, apsResultProvider, ch) }
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!, activePlugin)
         effectiveProfileSwitch = EPS(
             timestamp = dateUtil.now(),
@@ -320,7 +322,10 @@ open class TestBaseWithProfile : TestBase() {
         glucoseStatusCalculatorSMB = GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, DeltaCalculator(aapsLogger))
 
         whenever(ch.bolusProgressString(any())).thenReturn("AnyString")
-        whenever(ch.fromPump(any())).thenReturn(0.0)
+        whenever(ch.fromPump(any<PumpRate>())).thenAnswer { invocation ->
+            (invocation.arguments[0] as PumpRate).cU }
+        whenever(ch.fromPump(any<PumpInsulin>())).thenAnswer { invocation ->
+            (invocation.arguments[0] as PumpInsulin).cU }
     }
 
     fun getValidProfileStore(): ProfileStore {
diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt
@@ -10,6 +10,7 @@ import app.aaps.core.interfaces.pump.Pump
 import app.aaps.core.interfaces.pump.PumpEnactResult
 import app.aaps.core.interfaces.pump.PumpInsulin
 import app.aaps.core.interfaces.pump.PumpProfile
+import app.aaps.core.interfaces.pump.PumpRate
 import app.aaps.core.interfaces.pump.PumpSync
 import app.aaps.core.interfaces.pump.PumpWithConcentration
 import app.aaps.core.interfaces.resources.ResourceHelper
@@ -56,7 +57,7 @@ class TestPumpPlugin(val rh: ResourceHelper) : PumpWithConcentration {
     override val lastBolusTime: Long? get() = null
     override val lastBolusAmount: PumpInsulin? get() = null
     override val lastDataTime: Long get() = lastData
-    override val baseBasalRate: Double get() = baseBasal
+    override val baseBasalRate: PumpRate get() = PumpRate(baseBasal)
     override val reservoirLevel: PumpInsulin = PumpInsulin(0.0)
     override val batteryLevel: Int? = null
     override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult = PumpEnactResultObject(rh).success(true)

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ class KeepAliveWorkerTest : TestBaseWithProfile() {`
`74`	`74`	`it.localAlertUtils = localAlertUtils`
`75`	`75`	`it.workManager = workManager`
`76`	`76`	`it.rh = rh`
	`77`	`+ it.ch = ch`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ class LoopPluginTest : TestBaseWithProfile() {`
`65`	`65`	`loopPlugin = LoopPlugin(`
`66`	`66`	`aapsLogger, aapsSchedulers, rxBus, preferences, sp, config,`
`67`	`67`	`constraintChecker, rh, profileFunction, context, commandQueue, activePlugin, iobCobCalculator, processedTbrEbData, receiverStatusStore, fabricPrivacy, dateUtil, uel,`
`68`		`- persistenceLayer, runningConfiguration, uiInteraction, pumpEnactResultProvider, processedDeviceStatusData, pumpStatusProvider, testScope`
	`68`	`+ persistenceLayer, runningConfiguration, uiInteraction, pumpEnactResultProvider, processedDeviceStatusData, pumpStatusProvider, ch, testScope`
`69`	`69`	`)`
`70`	`70`	`whenever(activePlugin.activePump).thenReturn(virtualPumpPlugin)`
`71`	`71`	`whenever(context.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(notificationManager)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class OpenAPSAMAPluginTest : TestBaseWithProfile() {`
`22`	`22`	`openAPSAMAPlugin = OpenAPSAMAPlugin(`
`23`	`23`	`aapsLogger, rxBus, constraintChecker, rh, config, profileFunction, activePlugin,`
`24`	`24`	`iobCobCalculator, processedTbrEbData, hardLimits, dateUtil, persistenceLayer, glucoseStatusProvider, preferences, determineBasalAMA,`
`25`		`- GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider`
	`25`	`+ GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider, ch`
`26`	`26`	`)`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class OpenAPSSMBPluginTest : TestBaseWithProfile() {`
`29`	`29`	`openAPSSMBPlugin = OpenAPSSMBPlugin(`
`30`	`30`	`aapsLogger, rxBus, constraintChecker, rh, profileFunction, profileUtil, config, activePlugin,`
`31`	`31`	`iobCobCalculator, hardLimits, preferences, dateUtil, processedTbrEbData, persistenceLayer, glucoseStatusProvider,`
`32`		`- tddCalculator, bgQualityCheck, uiInteraction, determineBasalSMB, profiler, GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider`
	`32`	`+ tddCalculator, bgQualityCheck, uiInteraction, determineBasalSMB, profiler, GlucoseStatusCalculatorSMB(aapsLogger, iobCobCalculator, dateUtil, decimalFormatter, deltaCalculator), apsResultProvider, ch`
`33`	`33`	`)`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class EopatchPumpPluginTest : EopatchTestBase() {`
`158`	`158`	fun `baseBasalRate should return 0 when not activated`() {
`159`	`159`	`patchConfig.lifecycleEvent = PatchLifecycleEvent.createShutdown()`
`160`	`160`
`161`		`- assertThat(plugin.baseBasalRate).isWithin(0.001).of(0.0)`
	`161`	`+ assertThat(plugin.baseBasalRate.cU).isWithin(0.001).of(0.0)`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`@Test`
`@@ -170,7 +170,7 @@ class EopatchPumpPluginTest : EopatchTestBase() {`
`170`	`170`	`patchState.update(bytes, System.currentTimeMillis())`
`171`	`171`	`whenever(eopatchPreferenceManager.patchState).thenReturn(patchState)`
`172`	`172`
`173`		`- assertThat(plugin.baseBasalRate).isWithin(0.001).of(0.0)`
	`173`	`+ assertThat(plugin.baseBasalRate.cU).isWithin(0.001).of(0.0)`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`@Test`