diff --git a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt index fea76676e8..bb80421e03 100644 --- a/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt +++ b/plugins/sync/src/test/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegateTest.kt @@ -1,6 +1,7 @@ package info.nightscout.plugins.sync.nsclient import app.aaps.shared.tests.TestBase +import com.google.common.truth.Truth.assertThat import info.nightscout.core.utils.fabric.FabricPrivacy import info.nightscout.interfaces.receivers.ReceiverStatusStore import info.nightscout.plugins.sync.R @@ -8,7 +9,6 @@ import info.nightscout.rx.events.EventChargingState import info.nightscout.rx.events.EventNetworkChange import info.nightscout.shared.interfaces.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.mockito.Mock @@ -33,12 +33,12 @@ class ReceiverDelegateTest : TestBase() { fun testCalculateStatusChargingState() { `when`(sp.getBoolean(R.string.key_ns_battery, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_charging, true)).thenReturn(false) - Assertions.assertTrue(sut.calculateStatus(EventChargingState(false, 0))) - Assertions.assertFalse(sut.calculateStatus(EventChargingState(true, 0))) + assertThat(sut.calculateStatus(EventChargingState(false, 0))).isTrue() + assertThat(sut.calculateStatus(EventChargingState(true, 0))).isFalse() `when`(sp.getBoolean(R.string.key_ns_battery, true)).thenReturn(false) `when`(sp.getBoolean(R.string.key_ns_charging, true)).thenReturn(true) - Assertions.assertTrue(sut.calculateStatus(EventChargingState(true, 0))) - Assertions.assertFalse(sut.calculateStatus(EventChargingState(false, 0))) + assertThat(sut.calculateStatus(EventChargingState(true, 0))).isTrue() + assertThat(sut.calculateStatus(EventChargingState(false, 0))).isFalse() } @Test @@ -47,41 +47,41 @@ class ReceiverDelegateTest : TestBase() { `when`(sp.getBoolean(R.string.key_ns_allow_roaming, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_wifi, true)).thenReturn(true) `when`(sp.getString(R.string.key_ns_wifi_ssids, "")).thenReturn("") - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = true))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = false))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = true, wifiConnected = true))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = false, wifiConnected = true))) - Assertions.assertFalse(sut.calculateStatus(EventNetworkChange())) + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = false))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = true, wifiConnected = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = false, wifiConnected = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange())).isFalse() `when`(sp.getString(R.string.key_ns_wifi_ssids, "")).thenReturn("test 1") - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = true))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = false))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = true, wifiConnected = true))) - Assertions.assertFalse(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = false, wifiConnected = true))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(ssid = "test 1", mobileConnected = true, wifiConnected = true))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(ssid = "test 1", mobileConnected = false, wifiConnected = true))) - Assertions.assertFalse(sut.calculateStatus(EventNetworkChange())) + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, wifiConnected = false, roaming = false))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = true, wifiConnected = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(ssid = "", mobileConnected = false, wifiConnected = true))).isFalse() + assertThat(sut.calculateStatus(EventNetworkChange(ssid = "test 1", mobileConnected = true, wifiConnected = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(ssid = "test 1", mobileConnected = false, wifiConnected = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange())).isFalse() `when`(sp.getBoolean(R.string.key_ns_cellular, true)).thenReturn(false) `when`(sp.getBoolean(R.string.key_ns_wifi, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_allow_roaming, true)).thenReturn(true) `when`(sp.getString(R.string.key_ns_wifi_ssids, "")).thenReturn("") - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(wifiConnected = true))) - Assertions.assertFalse(sut.calculateStatus(EventNetworkChange())) - Assertions.assertFalse(sut.calculateStatus(EventNetworkChange(mobileConnected = true))) + assertThat(sut.calculateStatus(EventNetworkChange(wifiConnected = true))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange())).isFalse() + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true))).isFalse() `when`(sp.getBoolean(R.string.key_ns_cellular, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_wifi, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_allow_roaming, true)).thenReturn(false) `when`(sp.getString(R.string.key_ns_wifi_ssids, "")).thenReturn("") - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = false))) - Assertions.assertFalse(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = true))) + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = false))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = true))).isFalse() `when`(sp.getBoolean(R.string.key_ns_cellular, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_wifi, true)).thenReturn(true) `when`(sp.getBoolean(R.string.key_ns_allow_roaming, true)).thenReturn(true) `when`(sp.getString(R.string.key_ns_wifi_ssids, "")).thenReturn("") - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = false))) - Assertions.assertTrue(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = true))) + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = false))).isTrue() + assertThat(sut.calculateStatus(EventNetworkChange(mobileConnected = true, roaming = true))).isTrue() } -} \ No newline at end of file +}