caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #2825 from ryanhaining/assertthat_plugins_insulin

Browse source 
Rewrites plugins/insulin/ tests with matchers
This commit is contained in:
Milos Kozak 2023-09-24 10:33:50 +02:00 committed by GitHub
parent 0b08f618cf 672aebb87c
commit d6ea32a72e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
plugins/insulin/src/test/java/info/nightscout/insulin/InsulinLyumjevPluginTest.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.insulin package info.nightscout.insulin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config import info.nightscout.interfaces.Config
@ -10,7 +11,6 @@ import info.nightscout.interfaces.utils.HardLimits
import info.nightscout.rx.bus.RxBus import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.interfaces.ResourceHelper
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
@ -47,24 +47,24 @@ class InsulinLyumjevPluginTest {
@Test @Test
fun `simple peak test`() { fun `simple peak test`() {
Assertions.assertEquals(45, sut.peak) assertThat(sut.peak).isEqualTo(45)
} }
@Test @Test
fun getIdTest() { fun getIdTest() {
Assertions.assertEquals(Insulin.InsulinType.OREF_LYUMJEV, sut.id) assertThat(sut.id).isEqualTo(Insulin.InsulinType.OREF_LYUMJEV)
} }
@Test @Test
fun commentStandardTextTest() { fun commentStandardTextTest() {
`when`(rh.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev") `when`(rh.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
Assertions.assertEquals("Lyumjev", sut.commentStandardText()) assertThat(sut.commentStandardText()).isEqualTo("Lyumjev")
} }
@Test @Test
fun getFriendlyNameTest() { fun getFriendlyNameTest() {
`when`(rh.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev") `when`(rh.gs(eq(R.string.lyumjev))).thenReturn("Lyumjev")
Assertions.assertEquals("Lyumjev", sut.friendlyName) assertThat(sut.friendlyName).isEqualTo("Lyumjev")
} }
} }

12
plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefFreePeakPluginTest.kt
View file

@ -1,6 +1,7 @@
package info.nightscout.insulin package info.nightscout.insulin
import app.aaps.shared.tests.TestBase import app.aaps.shared.tests.TestBase
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config import info.nightscout.interfaces.Config
@ -10,7 +11,6 @@ import info.nightscout.interfaces.ui.UiInteraction
import info.nightscout.interfaces.utils.HardLimits import info.nightscout.interfaces.utils.HardLimits
import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.interfaces.ResourceHelper
import info.nightscout.shared.sharedPreferences.SP import info.nightscout.shared.sharedPreferences.SP
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.mockito.ArgumentMatchers.anyInt import org.mockito.ArgumentMatchers.anyInt
@ -46,24 +46,24 @@ class InsulinOrefFreePeakPluginTest : TestBase() {
@Test @Test
fun `simple peak test`() { fun `simple peak test`() {
`when`(sp.getInt(eq(info.nightscout.core.utils.R.string.key_insulin_oref_peak), anyInt())).thenReturn(90) `when`(sp.getInt(eq(info.nightscout.core.utils.R.string.key_insulin_oref_peak), anyInt())).thenReturn(90)
Assertions.assertEquals(90, sut.peak) assertThat(sut.peak).isEqualTo(90)
} }
@Test @Test
fun getIdTest() { fun getIdTest() {
Assertions.assertEquals(Insulin.InsulinType.OREF_FREE_PEAK, sut.id) assertThat(sut.id).isEqualTo(Insulin.InsulinType.OREF_FREE_PEAK)
} }
@Test @Test
fun commentStandardTextTest() { fun commentStandardTextTest() {
`when`(sp.getInt(eq(info.nightscout.core.utils.R.string.key_insulin_oref_peak), anyInt())).thenReturn(90) `when`(sp.getInt(eq(info.nightscout.core.utils.R.string.key_insulin_oref_peak), anyInt())).thenReturn(90)
`when`(rh.gs(eq(R.string.insulin_peak_time))).thenReturn("Peak Time [min]") `when`(rh.gs(eq(R.string.insulin_peak_time))).thenReturn("Peak Time [min]")
Assertions.assertEquals("Peak Time [min]: 90", sut.commentStandardText()) assertThat(sut.commentStandardText()).isEqualTo("Peak Time [min]: 90")
} }
@Test @Test
fun getFriendlyNameTest() { fun getFriendlyNameTest() {
`when`(rh.gs(eq(R.string.free_peak_oref))).thenReturn("Free-Peak Oref") `when`(rh.gs(eq(R.string.free_peak_oref))).thenReturn("Free-Peak Oref")
Assertions.assertEquals("Free-Peak Oref", sut.friendlyName) assertThat(sut.friendlyName).isEqualTo("Free-Peak Oref")
} }
} }

12
plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefRapidActingPluginTest.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.insulin package info.nightscout.insulin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config import info.nightscout.interfaces.Config
@ -10,7 +11,6 @@ import info.nightscout.interfaces.utils.HardLimits
import info.nightscout.rx.bus.RxBus import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.interfaces.ResourceHelper
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
@ -47,24 +47,24 @@ class InsulinOrefRapidActingPluginTest {
@Test @Test
fun `simple peak test`() { fun `simple peak test`() {
Assertions.assertEquals(75, sut.peak) assertThat(sut.peak).isEqualTo(75)
} }
@Test @Test
fun getIdTest() { fun getIdTest() {
Assertions.assertEquals(Insulin.InsulinType.OREF_RAPID_ACTING, sut.id) assertThat(sut.id).isEqualTo(Insulin.InsulinType.OREF_RAPID_ACTING)
} }
@Test @Test
fun commentStandardTextTest() { fun commentStandardTextTest() {
`when`(rh.gs(eq(R.string.fast_acting_insulin_comment))).thenReturn("Novorapid, Novolog, Humalog") `when`(rh.gs(eq(R.string.fast_acting_insulin_comment))).thenReturn("Novorapid, Novolog, Humalog")
Assertions.assertEquals("Novorapid, Novolog, Humalog", sut.commentStandardText()) assertThat(sut.commentStandardText()).isEqualTo("Novorapid, Novolog, Humalog")
} }
@Test @Test
fun getFriendlyNameTest() { fun getFriendlyNameTest() {
`when`(rh.gs(eq(R.string.rapid_acting_oref))).thenReturn("Rapid-Acting Oref") `when`(rh.gs(eq(R.string.rapid_acting_oref))).thenReturn("Rapid-Acting Oref")
Assertions.assertEquals("Rapid-Acting Oref", sut.friendlyName) assertThat(sut.friendlyName).isEqualTo("Rapid-Acting Oref")
} }
} }

12
plugins/insulin/src/test/java/info/nightscout/insulin/InsulinOrefUltraRapidActingPluginTest.kt
View file

@ -1,5 +1,6 @@
package info.nightscout.insulin package info.nightscout.insulin
import com.google.common.truth.Truth.assertThat
import dagger.android.AndroidInjector import dagger.android.AndroidInjector
import dagger.android.HasAndroidInjector import dagger.android.HasAndroidInjector
import info.nightscout.interfaces.Config import info.nightscout.interfaces.Config
@ -10,7 +11,6 @@ import info.nightscout.interfaces.utils.HardLimits
import info.nightscout.rx.bus.RxBus import info.nightscout.rx.bus.RxBus
import info.nightscout.rx.logging.AAPSLogger import info.nightscout.rx.logging.AAPSLogger
import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.interfaces.ResourceHelper
import org.junit.jupiter.api.Assertions
import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
@ -47,24 +47,24 @@ class InsulinOrefUltraRapidActingPluginTest {
@Test @Test
fun `simple peak test`() { fun `simple peak test`() {
Assertions.assertEquals(55, sut.peak) assertThat(sut.peak).isEqualTo(55)
} }
@Test @Test
fun getIdTest() { fun getIdTest() {
Assertions.assertEquals(Insulin.InsulinType.OREF_ULTRA_RAPID_ACTING, sut.id) assertThat(sut.id).isEqualTo(Insulin.InsulinType.OREF_ULTRA_RAPID_ACTING)
} }
@Test @Test
fun commentStandardTextTest() { fun commentStandardTextTest() {
`when`(rh.gs(eq(R.string.ultra_fast_acting_insulin_comment))).thenReturn("Fiasp") `when`(rh.gs(eq(R.string.ultra_fast_acting_insulin_comment))).thenReturn("Fiasp")
Assertions.assertEquals("Fiasp", sut.commentStandardText()) assertThat(sut.commentStandardText()).isEqualTo("Fiasp")
} }
@Test @Test
fun getFriendlyNameTest() { fun getFriendlyNameTest() {
`when`(rh.gs(eq(R.string.ultra_rapid_oref))).thenReturn("Ultra-Rapid Oref") `when`(rh.gs(eq(R.string.ultra_rapid_oref))).thenReturn("Ultra-Rapid Oref")
Assertions.assertEquals("Ultra-Rapid Oref", sut.friendlyName) assertThat(sut.friendlyName).isEqualTo("Ultra-Rapid Oref")
} }
} }