OpenForTesting cleanup

app/build.gradle

@@ -18,11 +18,6 @@ repositories {
     google()
 }
 
-allOpen {
-    // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.androidaps.annotations.OpenForTesting'
-}
-
 def generateGitBuild = { ->
     StringBuilder stringBuilder = new StringBuilder()
     try {

core/interfaces/src/debug/java/app/aaps/annotations/OpenForTesting.kt

@@ -1,4 +1,4 @@
-package info.nightscout.annotations
+package app.aaps.annotations
 
 /**
  * This is the actual annotation that makes the class open. Don't use it directly, only through [OpenForTesting]

core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt

@@ -1,6 +1,6 @@
 package info.nightscout.interfaces.plugin
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 
 @OpenForTesting
 class PluginDescription {

core/interfaces/src/release/java/app/aaps/annotations/OpenForTesting.kt

@@ -1,4 +1,4 @@
-package info.nightscout.annotations
+package app.aaps.annotations
 
 /**
  * Annotate a class with [OpenForTesting] if it should be extendable for testing.

core/main/allopen_dependencies.gradle

@@ -1,4 +1,4 @@
 allOpen {
     // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.annotations.OpenForTesting'
+    annotation 'app.aaps.annotations.OpenForTesting'
 }

core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt

@@ -1,11 +1,11 @@
 package info.nightscout.core.utils.fabric
 
 import android.os.Bundle
+import app.aaps.annotations.OpenForTesting
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt

@@ -1,7 +1,7 @@
 package info.nightscout.core.wizard
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.extensions.valueToUnits
 import info.nightscout.core.iob.round
 import info.nightscout.core.utils.JsonHelper.safeGetInt

database/impl/build.gradle

@@ -50,9 +50,4 @@ dependencies {
     api "com.google.dagger:dagger-android-support:$dagger_version"
 
     androidTestImplementation "androidx.room:room-testing:$room_version"
-}
+}
-
-allOpen {
-    // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.database.annotations.DbOpenForTesting'
-}

implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt

@@ -1,6 +1,6 @@
 package info.nightscout.implementation
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.profile.DefaultValueHelper

implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation
 
 import android.content.Context
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.interfaces.ui.UiInteraction

implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources

implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation.iob
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.iob.asRounded
 import info.nightscout.core.iob.log
 import info.nightscout.interfaces.iob.GlucoseStatus

implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation.logging
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.logging.LoggerUtils
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import javax.inject.Inject

implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt

@@ -1,7 +1,7 @@
 package info.nightscout.implementation.profiling
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.profiling.Profiler
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag

implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt

@@ -1,8 +1,8 @@
 package info.nightscout.implementation.pump
 
+import app.aaps.annotations.OpenForTesting
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.implementation.R
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage

implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt

@@ -1,6 +1,6 @@
 package info.nightscout.implementation.pump
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.pump.TemporaryBasalStorage
 import info.nightscout.rx.logging.AAPSLogger

implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt

@@ -7,8 +7,8 @@ import android.os.HandlerThread
 import android.os.SystemClock
 import android.text.Spanned
 import androidx.appcompat.app.AppCompatActivity
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.getCustomizedName

implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt

@@ -2,7 +2,7 @@ package info.nightscout.implementation.receivers
 
 import android.content.Context
 import android.content.Intent
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventChargingState

plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt

@@ -12,8 +12,8 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
 import androidx.core.app.NotificationCompat
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.convertedToAbsolute

plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt

@@ -1,8 +1,8 @@
 package info.nightscout.plugins.aps.openAPSAMA
 
 import android.content.Context
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.MidnightUtils

plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt

@@ -1,8 +1,8 @@
 package info.nightscout.plugins.aps.openAPSSMBDynamicISF
 
 import android.content.Context
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck

plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt

@@ -1,6 +1,6 @@
 package info.nightscout.plugins.general.autotune
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.logging.LoggerUtils
 import info.nightscout.plugins.general.autotune.data.ATProfile
 import info.nightscout.plugins.general.autotune.data.PreppedGlucose

plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt

@@ -4,8 +4,8 @@ import android.content.Context
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.automation.actions.Action
 import info.nightscout.automation.actions.ActionAlarm
 import info.nightscout.automation.actions.ActionCarePortalEvent

plugins/automation/src/main/java/info/nightscout/automation/services/LastLocationDataContainer.kt

@@ -1,7 +1,7 @@
 package info.nightscout.automation.services
 
 import android.location.Location
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import javax.inject.Inject
 import javax.inject.Singleton
 

plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.NotificationHolder
 import javax.inject.Inject
 import javax.inject.Singleton

plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt

@@ -3,7 +3,7 @@ package info.nightscout.automation.ui
 import android.content.Context
 import android.content.Intent
 import android.provider.AlarmClock
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.automation.R
 import info.nightscout.core.ui.toast.ToastUtils
 import javax.inject.Inject

plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt

@@ -2,13 +2,13 @@ package app.aaps.configuration.maintenance
 
 import android.content.Context
 import android.os.Environment
+import app.aaps.annotations.OpenForTesting
 import app.aaps.configuration.R
 import app.aaps.configuration.maintenance.data.PrefMetadataMap
 import app.aaps.configuration.maintenance.data.PrefsStatusImpl
 import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat
 import dagger.Lazy
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import info.nightscout.interfaces.maintenance.PrefMetadata

plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt

@@ -2,8 +2,8 @@ package info.nightscout.plugins.constraints.storage
 
 import android.os.Environment
 import android.os.StatFs
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.constraints.PluginConstraints

plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt

@@ -9,8 +9,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.iob.generateCOBString

plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt

@@ -1,9 +1,9 @@
 package info.nightscout.plugins.general.smsCommunicator.otp
 
 import android.util.Base64
+import app.aaps.annotations.OpenForTesting
 import com.eatthepath.otp.HmacOneTimePasswordGenerator
 import com.google.common.io.BaseEncoding
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.plugins.R
 import info.nightscout.shared.interfaces.ResourceHelper

plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt

@@ -1,8 +1,8 @@
 package info.nightscout.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.core.extensions.iobCalc
 import info.nightscout.core.extensions.toTemporaryBasal

plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.iob.iobCobCalculator.data
 
 import androidx.collection.LongSparseArray
 import androidx.collection.size
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.aps.AutosensData
 import info.nightscout.interfaces.aps.AutosensDataStore

plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt

@@ -1,8 +1,8 @@
 package info.nightscout.plugins.profile
 
 import androidx.fragment.app.FragmentActivity
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.extensions.blockFromJsonArray
 import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed

plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.sensitivity
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.core.utils.Percentile
 import info.nightscout.database.entities.TherapyEvent

plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.sensitivity
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.core.utils.Percentile
 import info.nightscout.database.entities.TherapyEvent

plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt

@@ -1,8 +1,8 @@
 package info.nightscout.sensitivity
 
 import androidx.collection.LongSparseArray
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.impl.AppRepository

plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.smoothing
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.plugin.PluginBase

plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.smoothing
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.plugin.PluginBase

plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt

@@ -1,7 +1,7 @@
 package info.nightscout.smoothing
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription

plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt

@@ -3,8 +3,8 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt

@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsShared
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.Food
 import info.nightscout.database.entities.GlucoseValue

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt

@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.plugins.sync.R

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt

@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient.data
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.interfaces.Config

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt

@@ -3,7 +3,7 @@
 package info.nightscout.plugins.sync.nsclient.data
 
 import android.content.Context
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.UserEntry

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt

@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclientV3
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt

@@ -11,10 +11,10 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import app.aaps.annotations.OpenForTesting
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.interfaces.TraceableDBEntry

plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3

plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt

@@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.xdrip.workers
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.sync.xdrip.DataSyncSelectorXdripImpl

pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt

@@ -5,11 +5,11 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.constraints.ConstraintsChecker

pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java

@@ -11,11 +11,11 @@ import androidx.annotation.NonNull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import app.aaps.annotations.OpenForTesting;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
-import info.nightscout.annotations.OpenForTesting;
 import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.interfaces.constraints.ConstraintsChecker;

pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java

@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import app.aaps.annotations.OpenForTesting;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danar.services.DanaRExecutionService;
-import info.nightscout.annotations.OpenForTesting;
 import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.interfaces.constraints.ConstraintsChecker;

pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt

@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.driver
 
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem
@@ -8,7 +9,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.pump.common.data.PumpStatus
 import info.nightscout.pump.common.defs.PumpDeviceState

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import java.security.SecureRandom
 
 @OpenForTesting

pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt

@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
 
+import app.aaps.annotations.OpenForTesting
 import com.google.crypto.tink.subtle.X25519
-import info.nightscout.annotations.OpenForTesting
 
 @OpenForTesting
 class X25519KeyGenerator {

pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt

@@ -1,13 +1,12 @@
 package info.nightscout.pump.common.sync
 
+import app.aaps.annotations.OpenForTesting
 import com.thoughtworks.xstream.XStream
 import com.thoughtworks.xstream.security.AnyTypePermission
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
-
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton

shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt

@@ -1,6 +1,6 @@
 package app.aaps.shared.impl.rx.bus
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.Event

shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.collection.LongSparseArray
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.R
 import info.nightscout.shared.SafeParse
 import info.nightscout.shared.interfaces.ResourceHelper

shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt

@@ -1,7 +1,7 @@
 package app.aaps.shared.tests
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.Pump

wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.kt

@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.interaction.utils
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.rx.weardata.EventData

wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.kt

@@ -2,12 +2,12 @@ package info.nightscout.androidaps.interaction.utils
 
 import android.content.Context
 import android.os.PowerManager
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import kotlinx.datetime.Clock
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlinx.datetime.Clock
 
 /**
  * Created by andy on 3/5/19.