caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

:plugins:aps cleanup

Browse source
This commit is contained in:
Milos Kozak 2023-09-26 10:23:01 +02:00
parent 12c3c664b7
commit 8bf9e83948
55 changed files with 235 additions and 215 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -112,7 +112,7 @@
</receiver>
<!-- Receive ignore 5m, 15m, 30m requests for carb notifications -->
<receiver android:name="info.nightscout.plugins.aps.loop.CarbSuggestionReceiver" />
<receiver android:name="app.aaps.plugins.aps.loop.CarbSuggestionReceiver" />
<!-- Auto start -->
<receiver

2
app/src/main/kotlin/app/aaps/MainApp.kt
View file

@ -35,6 +35,7 @@ import app.aaps.implementation.db.CompatDBHelper
import app.aaps.implementation.lifecycle.ProcessLifecycleListener
import app.aaps.implementation.plugin.PluginStore
import app.aaps.implementation.receivers.NetworkChangeReceiver
import app.aaps.plugins.aps.utils.StaticInjector
import app.aaps.receivers.BTReceiver
import app.aaps.receivers.ChargingStateReceiver
import app.aaps.receivers.KeepAliveWorker
@ -46,7 +47,6 @@ import info.nightscout.androidaps.R
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertIfNewByTimestampTherapyEventTransaction
import info.nightscout.database.impl.transactions.VersionChangeTransaction
import info.nightscout.plugins.aps.utils.StaticInjector
import info.nightscout.plugins.general.overview.notifications.NotificationStore
import info.nightscout.plugins.general.themes.ThemeSwitcherPlugin
import info.nightscout.ui.activityMonitor.ActivityMonitor

10
app/src/main/kotlin/app/aaps/activities/MyPreferenceFragment.kt
View file

@ -33,6 +33,11 @@ import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.SafeParse
import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.implementation.plugin.PluginStore
import app.aaps.plugins.aps.autotune.AutotunePlugin
import app.aaps.plugins.aps.loop.LoopPlugin
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import dagger.android.support.AndroidSupportInjection
import info.nightscout.androidaps.R
import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
@ -43,12 +48,7 @@ import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
import info.nightscout.automation.AutomationPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.plugins.aps.loop.LoopPlugin
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.safety.SafetyPlugin
import info.nightscout.plugins.general.autotune.AutotunePlugin
import info.nightscout.plugins.general.smsCommunicator.SmsCommunicatorPlugin
import info.nightscout.plugins.general.wear.WearPlugin
import info.nightscout.plugins.sync.nsclient.NSClientPlugin

2
app/src/main/kotlin/app/aaps/di/AppComponent.kt
View file

@ -5,6 +5,7 @@ import app.aaps.configuration.di.ConfigurationModule
import app.aaps.core.main.di.CoreModule
import app.aaps.core.validators.di.ValidatorsModule
import app.aaps.implementation.di.ImplementationModule
import app.aaps.plugins.aps.di.ApsModule
import app.aaps.shared.impl.di.SharedImplModule
import dagger.BindsInstance
import dagger.Component
@ -21,7 +22,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.di.OmnipodErosModule
import info.nightscout.automation.di.AutomationModule
import info.nightscout.database.impl.DatabaseModule
import info.nightscout.insulin.di.InsulinModule
import info.nightscout.plugins.aps.di.ApsModule
import info.nightscout.plugins.constraints.di.PluginsConstraintsModule
import info.nightscout.plugins.di.PluginsModule
import info.nightscout.plugins.sync.di.OpenHumansModule

10
app/src/main/kotlin/app/aaps/di/PluginsListModule.kt
View file

@ -3,6 +3,11 @@ package app.aaps.di
import app.aaps.configuration.configBuilder.ConfigBuilderPlugin
import app.aaps.configuration.maintenance.MaintenancePlugin
import app.aaps.core.interfaces.plugin.PluginBase
import app.aaps.plugins.aps.autotune.AutotunePlugin
import app.aaps.plugins.aps.loop.LoopPlugin
import app.aaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
import app.aaps.plugins.aps.openAPSSMB.OpenAPSSMBPlugin
import app.aaps.plugins.aps.openAPSSMBDynamicISF.OpenAPSSMBDynamicISFPlugin
import dagger.Binds
import dagger.Module
import dagger.multibindings.IntKey
@ -20,16 +25,11 @@ import info.nightscout.insulin.InsulinLyumjevPlugin
import info.nightscout.insulin.InsulinOrefFreePeakPlugin
import info.nightscout.insulin.InsulinOrefRapidActingPlugin
import info.nightscout.insulin.InsulinOrefUltraRapidActingPlugin
import info.nightscout.plugins.aps.loop.LoopPlugin
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.bgQualityCheck.BgQualityCheckPlugin
import info.nightscout.plugins.constraints.objectives.ObjectivesPlugin
import info.nightscout.plugins.constraints.safety.SafetyPlugin
import info.nightscout.plugins.constraints.signatureVerifier.SignatureVerifierPlugin
import info.nightscout.plugins.general.actions.ActionsPlugin
import info.nightscout.plugins.general.autotune.AutotunePlugin
import info.nightscout.plugins.general.food.FoodPlugin
import info.nightscout.plugins.general.overview.OverviewPlugin
import info.nightscout.plugins.general.persistentNotification.PersistentNotificationPlugin

2
app/src/main/kotlin/app/aaps/implementations/InstantiatorImpl.kt
View file

@ -6,9 +6,9 @@ import app.aaps.core.interfaces.objects.Instantiator
import app.aaps.core.interfaces.profile.ProfileStore
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.implementation.profile.ProfileStoreObject
import app.aaps.plugins.aps.APSResultObject
import dagger.Reusable
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.iob.iobCobCalculator.data.AutosensDataObject
import org.json.JSONObject
import javax.inject.Inject

2
implementation/src/test/kotlin/app/aaps/interfaces/pump/PumpEnactResultTest.kt
View file

@ -2,11 +2,11 @@ package app.aaps.interfaces.pump
import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.main.pump.toHtml
import app.aaps.plugins.aps.loop.extensions.json
import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.loop.extensions.json
import info.nightscout.pump.virtual.extensions.toText
import org.json.JSONObject
import org.junit.jupiter.api.BeforeEach

3
plugins/aps/build.gradle
View file

@ -10,8 +10,9 @@ apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle"
apply from: "${project.rootDir}/core/main/test_dependencies.gradle"
apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle"
apply from: "${project.rootDir}/core/main/jacoco_global.gradle"
android {
namespace 'info.nightscout.plugins.aps'
namespace 'app.aaps.plugins.aps'
}
dependencies {

16
plugins/aps/src/main/java/info/nightscout/plugins/aps/di/AlgModule.kt
View file

@ -1,16 +0,0 @@
package info.nightscout.plugins.aps.di
import dagger.Module
import dagger.android.ContributesAndroidInjector
@Module
@Suppress("unused")
abstract class AlgModule {
@ContributesAndroidInjector abstract fun loggerCallbackInjector(): info.nightscout.plugins.aps.logger.LoggerCallback
@ContributesAndroidInjector abstract fun determineBasalResultSMBInjector(): info.nightscout.plugins.aps.openAPSSMB.DetermineBasalResultSMB
@ContributesAndroidInjector abstract fun determineBasalResultAMAInjector(): info.nightscout.plugins.aps.openAPSAMA.DetermineBasalResultAMA
@ContributesAndroidInjector abstract fun determineBasalAdapterAMAJSInjector(): info.nightscout.plugins.aps.openAPSAMA.DetermineBasalAdapterAMAJS
@ContributesAndroidInjector abstract fun determineBasalAdapterSMBJSInjector(): info.nightscout.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
@ContributesAndroidInjector abstract fun determineBasalAdapterSMBAutoISFJSInjector(): info.nightscout.plugins.aps.openAPSSMBDynamicISF.DetermineBasalAdapterSMBDynamicISFJS
}

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/APSResultObject.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/APSResultObject.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps
package app.aaps.plugins.aps
import android.text.Spanned
import app.aaps.core.interfaces.aps.APSResult

12
plugins/aps/src/main/java/info/nightscout/plugins/aps/OpenAPSFragment.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/OpenAPSFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps
package app.aaps.plugins.aps
import android.os.Bundle
import android.os.Handler
@ -13,7 +13,6 @@ import android.view.ViewGroup
import androidx.core.view.MenuCompat
import androidx.core.view.MenuProvider
import androidx.lifecycle.Lifecycle
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.aps.AutosensResult
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
@ -22,11 +21,12 @@ import app.aaps.core.interfaces.resources.ResourceHelper
import app.aaps.core.interfaces.rx.AapsSchedulers
import app.aaps.core.interfaces.rx.bus.RxBus
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.plugins.aps.databinding.OpenapsFragmentBinding
import app.aaps.plugins.aps.events.EventOpenAPSUpdateGui
import app.aaps.plugins.aps.events.EventResetOpenAPSGui
import app.aaps.plugins.aps.utils.JSONFormatter
import dagger.android.support.DaggerFragment
import info.nightscout.plugins.aps.databinding.OpenapsFragmentBinding
import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui
import info.nightscout.plugins.aps.events.EventResetOpenAPSGui
import info.nightscout.plugins.aps.utils.JSONFormatter
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONArray

8
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneCore.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneCore.kt
View file

@ -1,11 +1,11 @@
package info.nightscout.plugins.general.autotune
package app.aaps.plugins.aps.autotune
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.Round
import app.aaps.core.utils.Percentile
import info.nightscout.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.LocalInsulin
import info.nightscout.plugins.general.autotune.data.PreppedGlucose
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 java.util.Calendar
import javax.inject.Inject
import javax.inject.Singleton

6
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFS.kt
View file

@ -1,10 +1,10 @@
package info.nightscout.plugins.general.autotune
package app.aaps.plugins.aps.autotune
import app.aaps.annotations.OpenForTesting
import app.aaps.core.interfaces.logging.LoggerUtils
import app.aaps.core.interfaces.resources.ResourceHelper
import info.nightscout.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.PreppedGlucose
import app.aaps.plugins.aps.autotune.data.ATProfile
import app.aaps.plugins.aps.autotune.data.PreppedGlucose
import org.json.JSONException
import org.slf4j.LoggerFactory
import java.io.BufferedInputStream

12
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFragment.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune
package app.aaps.plugins.aps.autotune
import android.content.Context
import android.graphics.Paint
@ -43,13 +43,13 @@ import app.aaps.core.ui.dialogs.OKDialog
import app.aaps.core.ui.elements.WeekDay
import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.autotune.data.ATProfile
import app.aaps.plugins.aps.autotune.data.LocalInsulin
import app.aaps.plugins.aps.autotune.events.EventAutotuneUpdateGui
import app.aaps.plugins.aps.databinding.AutotuneFragmentBinding
import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerFragment
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.aps.databinding.AutotuneFragmentBinding
import info.nightscout.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.LocalInsulin
import info.nightscout.plugins.general.autotune.events.EventAutotuneUpdateGui
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONObject

6
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneIob.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotuneIob.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune
package app.aaps.plugins.aps.autotune
import app.aaps.core.interfaces.configuration.Constants
import app.aaps.core.interfaces.iob.Iob
@ -24,9 +24,9 @@ import app.aaps.database.entities.GlucoseValue
import app.aaps.database.entities.TemporaryBasal
import app.aaps.database.entities.TherapyEvent
import app.aaps.database.entities.embedments.InterfaceIDs
import app.aaps.plugins.aps.autotune.data.ATProfile
import app.aaps.plugins.aps.autotune.data.LocalInsulin
import info.nightscout.database.impl.AppRepository
import info.nightscout.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.LocalInsulin
import org.json.JSONArray
import org.json.JSONObject
import javax.inject.Inject

12
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePlugin.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotunePlugin.kt
View file

@ -1,6 +1,6 @@
@file:Suppress("SpellCheckingInspection")
package info.nightscout.plugins.general.autotune
package app.aaps.plugins.aps.autotune
import android.view.View
import app.aaps.core.interfaces.autotune.Autotune
@ -29,12 +29,12 @@ import app.aaps.core.ui.elements.WeekDay
import app.aaps.core.utils.JsonHelper
import app.aaps.database.entities.UserEntry
import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.aps.R
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.plugins.aps.autotune.events.EventAutotuneUpdateGui
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.LocalInsulin
import info.nightscout.plugins.general.autotune.data.PreppedGlucose
import info.nightscout.plugins.general.autotune.events.EventAutotuneUpdateGui
import org.json.JSONException
import org.json.JSONObject
import java.util.TimeZone

16
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotunePrep.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/AutotunePrep.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune
package app.aaps.plugins.aps.autotune
import app.aaps.core.interfaces.sharedPreferences.SP
import app.aaps.core.interfaces.utils.DateUtil
@ -8,13 +8,13 @@ import app.aaps.core.interfaces.utils.T
import app.aaps.database.entities.Bolus
import app.aaps.database.entities.Carbs
import app.aaps.database.entities.GlucoseValue
import info.nightscout.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.BGDatum
import info.nightscout.plugins.general.autotune.data.CRDatum
import info.nightscout.plugins.general.autotune.data.DiaDeviation
import info.nightscout.plugins.general.autotune.data.LocalInsulin
import info.nightscout.plugins.general.autotune.data.PeakDeviation
import info.nightscout.plugins.general.autotune.data.PreppedGlucose
import app.aaps.plugins.aps.autotune.data.ATProfile
import app.aaps.plugins.aps.autotune.data.BGDatum
import app.aaps.plugins.aps.autotune.data.CRDatum
import app.aaps.plugins.aps.autotune.data.DiaDeviation
import app.aaps.plugins.aps.autotune.data.LocalInsulin
import app.aaps.plugins.aps.autotune.data.PeakDeviation
import app.aaps.plugins.aps.autotune.data.PreppedGlucose
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.math.abs

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/ATProfile.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/ATProfile.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.db.GlucoseUnit

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/BGDatum.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/BGDatum.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.T

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/CRDatum.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/CRDatum.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import app.aaps.core.interfaces.utils.DateUtil
import org.json.JSONException

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/DiaDeviation.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/DiaDeviation.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import org.json.JSONException
import org.json.JSONObject

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/LocalInsulin.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/LocalInsulin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import app.aaps.core.interfaces.iob.Iob
import app.aaps.database.entities.Bolus

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/PeakDeviation.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/PeakDeviation.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import org.json.JSONException
import org.json.JSONObject

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/data/PreppedGlucose.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/data/PreppedGlucose.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.data
package app.aaps.plugins.aps.autotune.data
import app.aaps.core.interfaces.utils.DateUtil
import org.json.JSONArray

2
plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/events/EventAutotuneUpdateGui.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/autotune/events/EventAutotuneUpdateGui.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.general.autotune.events
package app.aaps.plugins.aps.autotune.events
import app.aaps.core.interfaces.rx.events.Event

22
plugins/aps/src/main/kotlin/app/aaps/plugins/aps/di/AlgModule.kt Normal file
View file

@ -0,0 +1,22 @@
package app.aaps.plugins.aps.di
import app.aaps.plugins.aps.logger.LoggerCallback
import app.aaps.plugins.aps.openAPSAMA.DetermineBasalAdapterAMAJS
import app.aaps.plugins.aps.openAPSAMA.DetermineBasalResultAMA
import app.aaps.plugins.aps.openAPSSMB.DetermineBasalAdapterSMBJS
import app.aaps.plugins.aps.openAPSSMB.DetermineBasalResultSMB
import app.aaps.plugins.aps.openAPSSMBDynamicISF.DetermineBasalAdapterSMBDynamicISFJS
import dagger.Module
import dagger.android.ContributesAndroidInjector
@Module
@Suppress("unused")
abstract class AlgModule {
@ContributesAndroidInjector abstract fun loggerCallbackInjector(): LoggerCallback
@ContributesAndroidInjector abstract fun determineBasalResultSMBInjector(): DetermineBasalResultSMB
@ContributesAndroidInjector abstract fun determineBasalResultAMAInjector(): DetermineBasalResultAMA
@ContributesAndroidInjector abstract fun determineBasalAdapterAMAJSInjector(): DetermineBasalAdapterAMAJS
@ContributesAndroidInjector abstract fun determineBasalAdapterSMBJSInjector(): DetermineBasalAdapterSMBJS
@ContributesAndroidInjector abstract fun determineBasalAdapterSMBAutoISFJSInjector(): DetermineBasalAdapterSMBDynamicISFJS
}

10
plugins/aps/src/main/java/info/nightscout/plugins/aps/di/ApsModule.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/di/ApsModule.kt
View file

@ -1,14 +1,14 @@
package info.nightscout.plugins.aps.di
package app.aaps.plugins.aps.di
import app.aaps.core.interfaces.aps.Loop
import app.aaps.core.interfaces.autotune.Autotune
import app.aaps.plugins.aps.APSResultObject
import app.aaps.plugins.aps.OpenAPSFragment
import app.aaps.plugins.aps.autotune.AutotunePlugin
import app.aaps.plugins.aps.loop.LoopPlugin
import dagger.Binds
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.aps.OpenAPSFragment
import info.nightscout.plugins.aps.loop.LoopPlugin
import info.nightscout.plugins.general.autotune.AutotunePlugin
@Module(
includes = [

28
plugins/aps/src/main/java/info/nightscout/plugins/aps/di/AutotuneModule.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/di/AutotuneModule.kt
View file

@ -1,22 +1,30 @@
package info.nightscout.plugins.aps.di
package app.aaps.plugins.aps.di
import app.aaps.plugins.aps.autotune.AutotuneCore
import app.aaps.plugins.aps.autotune.AutotuneFS
import app.aaps.plugins.aps.autotune.AutotuneFragment
import app.aaps.plugins.aps.autotune.AutotuneIob
import app.aaps.plugins.aps.autotune.AutotunePrep
import app.aaps.plugins.aps.autotune.data.ATProfile
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 dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.plugins.general.autotune.data.PreppedGlucose
@Module
@Suppress("unused")
abstract class AutotuneModule {
@ContributesAndroidInjector abstract fun contributesAutotuneFragment(): info.nightscout.plugins.general.autotune.AutotuneFragment
@ContributesAndroidInjector abstract fun contributesAutotuneFragment(): AutotuneFragment
@ContributesAndroidInjector abstract fun autoTunePrepInjector(): info.nightscout.plugins.general.autotune.AutotunePrep
@ContributesAndroidInjector abstract fun autoTuneIobInjector(): info.nightscout.plugins.general.autotune.AutotuneIob
@ContributesAndroidInjector abstract fun autoTuneCoreInjector(): info.nightscout.plugins.general.autotune.AutotuneCore
@ContributesAndroidInjector abstract fun autoTuneFSInjector(): info.nightscout.plugins.general.autotune.AutotuneFS
@ContributesAndroidInjector abstract fun autoTunePrepInjector(): AutotunePrep
@ContributesAndroidInjector abstract fun autoTuneIobInjector(): AutotuneIob
@ContributesAndroidInjector abstract fun autoTuneCoreInjector(): AutotuneCore
@ContributesAndroidInjector abstract fun autoTuneFSInjector(): AutotuneFS
@ContributesAndroidInjector abstract fun autoTuneATProfileInjector(): info.nightscout.plugins.general.autotune.data.ATProfile
@ContributesAndroidInjector abstract fun autoTuneBGDatumInjector(): info.nightscout.plugins.general.autotune.data.BGDatum
@ContributesAndroidInjector abstract fun autoTuneCRDatumInjector(): info.nightscout.plugins.general.autotune.data.CRDatum
@ContributesAndroidInjector abstract fun autoTuneATProfileInjector(): ATProfile
@ContributesAndroidInjector abstract fun autoTuneBGDatumInjector(): BGDatum
@ContributesAndroidInjector abstract fun autoTuneCRDatumInjector(): CRDatum
@ContributesAndroidInjector abstract fun autoTunePreppedGlucoseInjector(): PreppedGlucose
}

6
plugins/aps/src/main/java/info/nightscout/plugins/aps/di/LoopModule.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/di/LoopModule.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.plugins.aps.di
package app.aaps.plugins.aps.di
import app.aaps.plugins.aps.loop.CarbSuggestionReceiver
import app.aaps.plugins.aps.loop.LoopFragment
import dagger.Module
import dagger.android.ContributesAndroidInjector
import info.nightscout.plugins.aps.loop.CarbSuggestionReceiver
import info.nightscout.plugins.aps.loop.LoopFragment
@Module
@Suppress("unused")

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventOpenAPSUpdateGui.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/events/EventOpenAPSUpdateGui.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.events
package app.aaps.plugins.aps.events
import app.aaps.core.interfaces.rx.events.EventUpdateGui

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/events/EventResetOpenAPSGui.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/events/EventResetOpenAPSGui.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.events
package app.aaps.plugins.aps.events
import app.aaps.core.interfaces.rx.events.EventUpdateGui

4
plugins/aps/src/main/java/info/nightscout/plugins/aps/logger/LoggerCallback.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/logger/LoggerCallback.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.plugins.aps.logger
package app.aaps.plugins.aps.logger
import app.aaps.core.interfaces.logging.AAPSLogger
import app.aaps.core.interfaces.logging.LTag
import info.nightscout.plugins.aps.utils.StaticInjector
import app.aaps.plugins.aps.utils.StaticInjector
import org.mozilla.javascript.ScriptableObject
import javax.inject.Inject

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/CarbSuggestionReceiver.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/CarbSuggestionReceiver.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.loop
package app.aaps.plugins.aps.loop
import android.content.Context
import android.content.Intent

8
plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopFragment.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopFragment.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.loop
package app.aaps.plugins.aps.loop
import android.os.Bundle
import android.os.Handler
@ -25,11 +25,11 @@ import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.pump.toHtml
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.utils.HtmlHelper
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.databinding.LoopFragmentBinding
import app.aaps.plugins.aps.loop.events.EventLoopSetLastRunGui
import dagger.android.HasAndroidInjector
import dagger.android.support.DaggerFragment
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.aps.databinding.LoopFragmentBinding
import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import javax.inject.Inject

8
plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/LoopPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.loop
package app.aaps.plugins.aps.loop
import android.annotation.SuppressLint
import android.app.NotificationChannel
@ -69,13 +69,13 @@ import app.aaps.database.entities.OfflineEvent
import app.aaps.database.entities.UserEntry.Action
import app.aaps.database.entities.UserEntry.Sources
import app.aaps.database.entities.ValueWithUnit
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.loop.events.EventLoopSetLastRunGui
import app.aaps.plugins.aps.loop.extensions.json
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import info.nightscout.database.impl.transactions.InsertAndCancelCurrentOfflineEventTransaction
import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.aps.loop.events.EventLoopSetLastRunGui
import info.nightscout.plugins.aps.loop.extensions.json
import io.reactivex.rxjava3.disposables.CompositeDisposable
import io.reactivex.rxjava3.kotlin.plusAssign
import org.json.JSONObject

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/events/EventLoopSetLastRunGui.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/events/EventLoopSetLastRunGui.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.loop.events
package app.aaps.plugins.aps.loop.events
import app.aaps.core.interfaces.rx.events.EventUpdateGui

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/extensions/PumpEnactResultExtension.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/loop/extensions/PumpEnactResultExtension.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.loop.extensions
package app.aaps.plugins.aps.loop.extensions
import app.aaps.core.interfaces.pump.PumpEnactResult
import app.aaps.core.interfaces.utils.Round

16
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/DetermineBasalAdapterAMAJS.kt
View file

@ -1,8 +1,5 @@
package info.nightscout.plugins.aps.openAPSAMA
package app.aaps.plugins.aps.openAPSAMA
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.constraints.ConstraintsChecker
@ -16,11 +13,14 @@ import app.aaps.core.interfaces.logging.LTag
import app.aaps.core.interfaces.profile.Profile
import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.sharedPreferences.SP
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.APSResultObject
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.logger.LoggerCallback
import app.aaps.plugins.aps.utils.ScriptReader
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.aps.logger.LoggerCallback
import info.nightscout.plugins.aps.utils.ScriptReader
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject

4
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/DetermineBasalResultAMA.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/DetermineBasalResultAMA.kt
View file

@ -1,8 +1,8 @@
package info.nightscout.plugins.aps.openAPSAMA
package app.aaps.plugins.aps.openAPSAMA
import app.aaps.core.interfaces.logging.LTag
import app.aaps.plugins.aps.APSResultObject
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.APSResultObject
import org.json.JSONException
import org.json.JSONObject
import org.mozilla.javascript.NativeObject

12
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.openAPSAMA
package app.aaps.plugins.aps.openAPSAMA
import android.content.Context
import app.aaps.annotations.OpenForTesting
@ -30,13 +30,13 @@ import app.aaps.core.main.extensions.target
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.utils.MidnightUtils
import app.aaps.database.ValueWrapper
import app.aaps.plugins.aps.OpenAPSFragment
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.events.EventOpenAPSUpdateGui
import app.aaps.plugins.aps.events.EventResetOpenAPSGui
import app.aaps.plugins.aps.utils.ScriptReader
import dagger.android.HasAndroidInjector
import info.nightscout.database.impl.AppRepository
import info.nightscout.plugins.aps.OpenAPSFragment
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui
import info.nightscout.plugins.aps.events.EventResetOpenAPSGui
import info.nightscout.plugins.aps.utils.ScriptReader
import org.json.JSONException
import javax.inject.Inject
import javax.inject.Singleton

16
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.kt
View file

@ -1,8 +1,5 @@
package info.nightscout.plugins.aps.openAPSSMB
package app.aaps.plugins.aps.openAPSSMB
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.constraints.ConstraintsChecker
@ -18,11 +15,14 @@ import app.aaps.core.interfaces.profile.Profile
import app.aaps.core.interfaces.profile.ProfileFunction
import app.aaps.core.interfaces.sharedPreferences.SP
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.APSResultObject
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.logger.LoggerCallback
import app.aaps.plugins.aps.utils.ScriptReader
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.APSResultObject
import info.nightscout.plugins.aps.R
import info.nightscout.plugins.aps.logger.LoggerCallback
import info.nightscout.plugins.aps.utils.ScriptReader
import org.json.JSONArray
import org.json.JSONException
import org.json.JSONObject

4
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.kt
View file

@ -1,9 +1,9 @@
package info.nightscout.plugins.aps.openAPSSMB
package app.aaps.plugins.aps.openAPSSMB
import app.aaps.core.interfaces.aps.VariableSensitivityResult
import app.aaps.core.interfaces.logging.LTag
import app.aaps.plugins.aps.APSResultObject
import dagger.android.HasAndroidInjector
import info.nightscout.plugins.aps.APSResultObject
import org.json.JSONException
import org.json.JSONObject

14
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMB/OpenAPSSMBPlugin.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.openAPSSMB
package app.aaps.plugins.aps.openAPSSMB
import android.content.Context
import androidx.preference.PreferenceFragmentCompat
@ -33,11 +33,13 @@ import app.aaps.core.main.constraints.ConstraintObject
import app.aaps.core.main.extensions.target
import app.aaps.core.utils.MidnightUtils
import app.aaps.database.ValueWrapper
import app.aaps.plugins.aps.OpenAPSFragment
import app.aaps.plugins.aps.R
import app.aaps.plugins.aps.events.EventOpenAPSUpdateGui
import app.aaps.plugins.aps.events.EventResetOpenAPSGui
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.events.EventResetOpenAPSGui
import info.nightscout.plugins.aps.utils.ScriptReader
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.math.floor
@ -64,7 +66,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
) : PluginBase(
PluginDescription()
.mainType(PluginType.APS)
.fragmentClass(info.nightscout.plugins.aps.OpenAPSFragment::class.java.name)
.fragmentClass(OpenAPSFragment::class.java.name)
.pluginIcon(app.aaps.core.ui.R.drawable.ic_generic_icon)
.pluginName(R.string.openapssmb)
.shortName(app.aaps.core.ui.R.string.smb_shortname)
@ -292,7 +294,7 @@ open class OpenAPSSMBPlugin @Inject constructor(
lastAPSRun = now
}
}
rxBus.send(info.nightscout.plugins.aps.events.EventOpenAPSUpdateGui())
rxBus.send(EventOpenAPSUpdateGui())
}
override fun isSuperBolusEnabled(value: Constraint<Boolean>): Constraint<Boolean> {

16
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/DetermineBasalAdapterSMBDynamicISFJS.kt
View file

@ -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

10
plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
View file

@ -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

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/JSONFormatter.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/JSONFormatter.kt
View file

@ -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

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/ScriptReader.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/ScriptReader.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.utils
package app.aaps.plugins.aps.utils
import android.content.Context
import java.io.ByteArrayOutputStream

2
plugins/aps/src/main/java/info/nightscout/plugins/aps/utils/StaticInjector.kt → plugins/aps/src/main/kotlin/app/aaps/plugins/aps/utils/StaticInjector.kt
View file

@ -1,4 +1,4 @@
package info.nightscout.plugins.aps.utils
package app.aaps.plugins.aps.utils
import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector

2
plugins/aps/src/main/res/layout/autotune_fragment.xml
View file

@ -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">
<LinearLayout
android:layout_width="match_parent"

9
plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotuneCoreTest.kt → plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/AutotuneCoreTest.kt
View file

@ -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.profile.PureProfile
@ -8,10 +8,11 @@ import app.aaps.core.main.profile.ProfileSealed
import app.aaps.core.utils.JsonHelper
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.plugins.general.autotune.data.ATProfile
import info.nightscout.plugins.general.autotune.data.PreppedGlucose
import org.json.JSONArray
import org.json.JSONObject
import org.junit.jupiter.api.BeforeEach
@ -91,7 +92,7 @@ class AutotuneCoreTest : 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<Block>(1).also {

14
plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/AutotunePrepTest.kt → plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/AutotunePrepTest.kt
View file

@ -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<Block>(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)

8
plugins/aps/src/test/java/info/nightscout/plugins/general/autotune/PreppedGlucoseTest.kt → plugins/aps/src/test/kotlin/app/aaps/plugins/aps/autotune/PreppedGlucoseTest.kt
View file

@ -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

10
plugins/aps/src/test/java/info/nightscout/plugins/aps/loop/LoopPluginTest.kt → plugins/aps/src/test/kotlin/app/aaps/plugins/aps/loop/LoopPluginTest.kt
View file

@ -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()

34
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/ConstraintsCheckerImplTest.kt
View file

@ -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)

40
plugins/constraints/src/test/java/info/nightscout/plugins/constraints/safety/SafetyPluginTest.kt
View file

@ -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