caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2835 from ryanhaining/assertis

Browse source 
Replaces isInstanceOf with assertIs
This commit is contained in:
Milos Kozak 2023-09-25 09:55:32 +02:00 committed by GitHub
commit ad662fbac2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
implementation/src/test/java/info/nightscout/implementation/profile/ProfileStoreTest.kt
View file

@ -3,6 +3,7 @@ package info.nightscout.implementation.profile
import app.aaps.core.interfaces.profile.PureProfile import app.aaps.core.interfaces.profile.PureProfile
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import kotlin.test.assertIs
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
internal class ProfileStoreTest : TestBaseWithProfile() { internal class ProfileStoreTest : TestBaseWithProfile() {
@ -14,7 +15,7 @@ internal class ProfileStoreTest : TestBaseWithProfile() {
@Test @Test
fun getDefaultProfileTest() { fun getDefaultProfileTest() {
assertThat(getValidProfileStore().getDefaultProfile()).isInstanceOf(PureProfile::class.java) assertIs<PureProfile>(getValidProfileStore().getDefaultProfile())
} }
@Test @Test
@ -35,7 +36,7 @@ internal class ProfileStoreTest : TestBaseWithProfile() {
@Test @Test
fun getSpecificProfileTest() { fun getSpecificProfileTest() {
assertThat(getValidProfileStore().getSpecificProfile(TESTPROFILENAME)).isInstanceOf(PureProfile::class.java) assertIs<PureProfile>(getValidProfileStore().getSpecificProfile(TESTPROFILENAME))
} }
@Test @Test

3
plugins/automation/src/test/java/info/nightscout/automation/triggers/TriggerConnectorTest.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.automation.triggers package info.nightscout.automation.triggers
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import kotlin.test.assertIs
import org.json.JSONException import org.json.JSONException
import org.json.JSONObject import org.json.JSONObject
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
@ -73,7 +74,7 @@ class TriggerConnectorTest : TriggerTestBase() {
t.list.add(TriggerConnector(injector)) t.list.add(TriggerConnector(injector))
val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerConnector val t2 = TriggerDummy(injector).instantiate(JSONObject(t.toJSON())) as TriggerConnector
assertThat(t2.size()).isEqualTo(1) assertThat(t2.size()).isEqualTo(1)
assertThat(t2.list[0]).isInstanceOf(TriggerConnector::class.java) assertIs<TriggerConnector>(t2.list[0])
} }
} }

11
plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/extensions/ExtendedBolusExtensionKtTest.kt
View file

@ -1,12 +1,13 @@
package info.nightscout.plugins.sync.nsclientV3.extensions package info.nightscout.plugins.sync.nsclientV3.extensions
import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus
import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal
import app.aaps.core.nssdk.mapper.convertToRemoteAndBack
import app.aaps.shared.tests.TestBaseWithProfile import app.aaps.shared.tests.TestBaseWithProfile
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import info.nightscout.database.entities.ExtendedBolus import info.nightscout.database.entities.ExtendedBolus
import info.nightscout.database.entities.embedments.InterfaceIDs import info.nightscout.database.entities.embedments.InterfaceIDs
import app.aaps.core.nssdk.localmodel.treatment.NSExtendedBolus import kotlin.test.assertIs
import app.aaps.core.nssdk.localmodel.treatment.NSTemporaryBasal
import app.aaps.core.nssdk.mapper.convertToRemoteAndBack
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
@Suppress("SpellCheckingInspection") @Suppress("SpellCheckingInspection")
@ -47,10 +48,10 @@ internal class ExtendedBolusExtensionKtTest : TestBaseWithProfile() {
) )
val converted = extendedBolus.toNSExtendedBolus(validProfile) val converted = extendedBolus.toNSExtendedBolus(validProfile)
assertThat(converted).isInstanceOf(NSTemporaryBasal::class.java) assertIs<NSTemporaryBasal>(converted)
assertThat((converted as NSTemporaryBasal).extendedEmulated).isNotNull() assertThat((converted as NSTemporaryBasal).extendedEmulated).isNotNull()
val convertedBack = converted.convertToRemoteAndBack() val convertedBack = converted.convertToRemoteAndBack()
assertThat(convertedBack).isInstanceOf(NSExtendedBolus::class.java) assertIs<NSExtendedBolus>(convertedBack)
extendedBolus2 = (extendedBolus.toNSExtendedBolus(validProfile).convertToRemoteAndBack() as NSExtendedBolus).toExtendedBolus() extendedBolus2 = (extendedBolus.toNSExtendedBolus(validProfile).convertToRemoteAndBack() as NSExtendedBolus).toExtendedBolus()
assertThat(extendedBolus.contentEqualsTo(extendedBolus2)).isTrue() assertThat(extendedBolus.contentEqualsTo(extendedBolus2)).isTrue()

3
plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorkerTest.kt
View file

@ -12,6 +12,7 @@ import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import kotlin.test.assertIs
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
@ -64,6 +65,6 @@ internal class DataSyncWorkerTest : TestBase() {
`when`(nsClient.hasWritePermission).thenReturn(true) `when`(nsClient.hasWritePermission).thenReturn(true)
val result = sut.doWorkAndLog() val result = sut.doWorkAndLog()
Mockito.verify(dataSyncSelectorV3, Mockito.times(1)).doUpload() Mockito.verify(dataSyncSelectorV3, Mockito.times(1)).doUpload()
assertThat(result).isInstanceOf(Success::class.java) assertIs<Success>(result)
} }
} }

17
plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclientV3/workers/LoadBgWorkerTest.kt
View file

@ -6,7 +6,6 @@ import androidx.work.OneTimeWorkRequest
import androidx.work.WorkContinuation import androidx.work.WorkContinuation
import androidx.work.WorkManager import androidx.work.WorkManager
import androidx.work.testing.TestListenableWorkerBuilder import androidx.work.testing.TestListenableWorkerBuilder
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.interfaces.configuration.Config import app.aaps.core.interfaces.configuration.Config
import app.aaps.core.interfaces.nsclient.StoreDataForDb import app.aaps.core.interfaces.nsclient.StoreDataForDb
import app.aaps.core.interfaces.receivers.ReceiverStatusStore import app.aaps.core.interfaces.receivers.ReceiverStatusStore
@ -16,6 +15,9 @@ import app.aaps.core.interfaces.source.NSClientSource
import app.aaps.core.interfaces.ui.UiInteraction import app.aaps.core.interfaces.ui.UiInteraction
import app.aaps.core.interfaces.utils.DateUtil import app.aaps.core.interfaces.utils.DateUtil
import app.aaps.core.interfaces.utils.DecimalFormatter import app.aaps.core.interfaces.utils.DecimalFormatter
import app.aaps.core.main.utils.fabric.FabricPrivacy
import app.aaps.core.nssdk.interfaces.NSAndroidClient
import app.aaps.core.nssdk.remotemodel.LastModified
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
@ -31,8 +33,7 @@ import info.nightscout.plugins.sync.nsclient.data.NSDeviceStatusHandler
import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin import info.nightscout.plugins.sync.nsclientV3.NSClientV3Plugin
import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3 import info.nightscout.plugins.sync.nsclientV3.extensions.toNSSvgV3
import app.aaps.core.nssdk.interfaces.NSAndroidClient import kotlin.test.assertIs
import app.aaps.core.nssdk.remotemodel.LastModified
import kotlinx.coroutines.test.runTest import kotlinx.coroutines.test.runTest
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
@ -111,7 +112,7 @@ internal class LoadBgWorkerTest : TestBase() {
sut = TestListenableWorkerBuilder<LoadBgWorker>(context).build() sut = TestListenableWorkerBuilder<LoadBgWorker>(context).build()
val result = sut.doWorkAndLog() val result = sut.doWorkAndLog()
assertThat(result).isInstanceOf(ListenableWorker.Result.Failure::class.java) assertIs<ListenableWorker.Result.Failure>(result)
} }
@Test @Test
@ -121,7 +122,7 @@ internal class LoadBgWorkerTest : TestBase() {
Mockito.`when`(sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_cgm, false)).thenReturn(false) Mockito.`when`(sp.getBoolean(info.nightscout.core.utils.R.string.key_ns_receive_cgm, false)).thenReturn(false)
val result = sut.doWorkAndLog() val result = sut.doWorkAndLog()
assertThat(result).isInstanceOf(ListenableWorker.Result.Success::class.java) assertIs<ListenableWorker.Result.Success>(result)
assertThat(result.outputData.getString("Result")).isEqualTo("Load not enabled") assertThat(result.outputData.getString("Result")).isEqualTo("Load not enabled")
} }
@ -137,7 +138,7 @@ internal class LoadBgWorkerTest : TestBase() {
val result = sut.doWorkAndLog() val result = sut.doWorkAndLog()
assertThat(nsClientV3Plugin.lastLoadedSrvModified.collections.entries).isEqualTo(now - 1000) assertThat(nsClientV3Plugin.lastLoadedSrvModified.collections.entries).isEqualTo(now - 1000)
assertThat(result).isInstanceOf(ListenableWorker.Result.Success::class.java) assertIs<ListenableWorker.Result.Success>(result)
} }
@Test @Test
@ -165,7 +166,7 @@ internal class LoadBgWorkerTest : TestBase() {
Mockito.`when`(nsAndroidClient.getSgvsNewerThan(anyLong(), anyInt())).thenReturn(NSAndroidClient.ReadResponse(200, 0, listOf(glucoseValue.toNSSvgV3()))) Mockito.`when`(nsAndroidClient.getSgvsNewerThan(anyLong(), anyInt())).thenReturn(NSAndroidClient.ReadResponse(200, 0, listOf(glucoseValue.toNSSvgV3())))
val result = sut.doWorkAndLog() val result = sut.doWorkAndLog()
assertThat(result).isInstanceOf(ListenableWorker.Result.Success::class.java) assertIs<ListenableWorker.Result.Success>(result)
} }
@Test @Test
@ -180,6 +181,6 @@ internal class LoadBgWorkerTest : TestBase() {
val result = sut.doWorkAndLog() val result = sut.doWorkAndLog()
assertThat(nsClientV3Plugin.lastLoadedSrvModified.collections.entries).isEqualTo(now - 1000) assertThat(nsClientV3Plugin.lastLoadedSrvModified.collections.entries).isEqualTo(now - 1000)
assertThat(result).isInstanceOf(ListenableWorker.Result.Success::class.java) assertIs<ListenableWorker.Result.Success>(result)
} }
} }