From 3e8455ad2e1a8aa296c68e166c4f784e1a148396 Mon Sep 17 00:00:00 2001 From: Ryan Haining Date: Sun, 8 Oct 2023 17:01:20 -0700 Subject: [PATCH] Rewrites GetDeviceTypePacketTest with matchers Issue #2745 --- .../comm/packets/GetDeviceTypePacketTest.kt | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetDeviceTypePacketTest.kt b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetDeviceTypePacketTest.kt index c3e37cf08e..f683e87a3c 100644 --- a/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetDeviceTypePacketTest.kt +++ b/pump/medtrum/src/test/java/info/nightscout/pump/medtrum/comm/packets/GetDeviceTypePacketTest.kt @@ -1,10 +1,10 @@ package info.nightscout.pump.medtrum.comm.packets +import com.google.common.truth.Truth.assertThat import dagger.android.AndroidInjector import dagger.android.HasAndroidInjector import info.nightscout.pump.medtrum.MedtrumTestBase import info.nightscout.pump.medtrum.extension.toByteArray -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test class GetDeviceTypePacketTest : MedtrumTestBase() { @@ -28,8 +28,7 @@ class GetDeviceTypePacketTest : MedtrumTestBase() { val result = packet.getRequest() // Expected values - Assertions.assertEquals(1, result.size) - Assertions.assertEquals(opCode.toByte(), result[0]) + assertThat(result).asList().containsExactly(opCode.toByte()) } @Test fun handleResponseGivenResponseWhenMessageIsCorrectLengthThenResultTrue() { @@ -45,10 +44,10 @@ class GetDeviceTypePacketTest : MedtrumTestBase() { val result = packet.handleResponse(response) // Expected values - Assertions.assertEquals(true, result) - Assertions.assertEquals(false, packet.failed) - Assertions.assertEquals(deviceType, packet.deviceType) - Assertions.assertEquals(deviceSN, packet.deviceSN) + assertThat(result).isTrue() + assertThat(packet.failed).isFalse() + assertThat(packet.deviceType).isEqualTo(deviceType) + assertThat(packet.deviceSN).isEqualTo(deviceSN) } @@ -65,9 +64,9 @@ class GetDeviceTypePacketTest : MedtrumTestBase() { val result = packet.handleResponse(response.sliceArray(0..response.size - 2)) // Expected values - Assertions.assertEquals(false, result) - Assertions.assertEquals(true, packet.failed) - Assertions.assertEquals(0, packet.deviceType) - Assertions.assertEquals(0, packet.deviceSN) + assertThat(result).isFalse() + assertThat(packet.failed).isTrue() + assertThat(packet.deviceType).isEqualTo(0) + assertThat(packet.deviceSN).isEqualTo(0) } }