From 1cfe6fbcd939b6666b0677cbb954f6304284cb42 Mon Sep 17 00:00:00 2001 From: Ryan Haining Date: Sat, 23 Sep 2023 17:59:01 -0700 Subject: [PATCH] Rewrites AllowedVersionsTest with matchers Issue #2745 --- .../versionChecker/AllowedVersionsTest.kt | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt index d7bbbf274c..5cff5f5267 100644 --- a/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt +++ b/plugins/constraints/src/test/java/info/nightscout/plugins/constraints/versionChecker/AllowedVersionsTest.kt @@ -1,10 +1,10 @@ package info.nightscout.plugins.constraints.versionChecker +import com.google.common.truth.Truth.assertThat import info.nightscout.plugins.constraints.versionChecker.AllowedVersions import org.joda.time.LocalDate import org.json.JSONArray import org.json.JSONObject -import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Test class AllowedVersionsTest { @@ -45,14 +45,14 @@ class AllowedVersionsTest { @Test fun generateSupportedVersionsTest() { val definition = generateSupportedVersions() - Assertions.assertNull(AllowedVersions().findByApi(definition, 0)) - Assertions.assertFalse(AllowedVersions().findByApi(definition, 1)?.has("supported") ?: true) - Assertions.assertFalse(AllowedVersions().findByApi(definition, 23)?.has("supported") ?: true) - Assertions.assertEquals("2.6.2", AllowedVersions().findByApi(definition, 24)?.getString("supported")) - Assertions.assertEquals("2.6.2", AllowedVersions().findByApi(definition, 25)?.getString("supported")) - Assertions.assertEquals("2.8.2", AllowedVersions().findByApi(definition, 26)?.getString("supported")) - Assertions.assertEquals("2.8.2", AllowedVersions().findByApi(definition, 27)?.getString("supported")) - Assertions.assertEquals("2.8.2", AllowedVersions().findByApi(definition, 28)?.getString("supported")) + assertThat(AllowedVersions().findByApi(definition, 0)).isNull() + assertThat(AllowedVersions().findByApi(definition, 1)!!.has("supported")).isFalse() + assertThat(AllowedVersions().findByApi(definition, 23)!!.has("supported")).isFalse() + assertThat(AllowedVersions().findByApi(definition, 24)!!.getString("supported")).isEqualTo("2.6.2") + assertThat(AllowedVersions().findByApi(definition, 25)!!.getString("supported")).isEqualTo("2.6.2") + assertThat(AllowedVersions().findByApi(definition, 26)!!.getString("supported")).isEqualTo("2.8.2") + assertThat(AllowedVersions().findByApi(definition, 27)!!.getString("supported")).isEqualTo("2.8.2") + assertThat(AllowedVersions().findByApi(definition, 28)!!.getString("supported")).isEqualTo("2.8.2") } @Test @@ -62,9 +62,9 @@ class AllowedVersionsTest { "[{\"minAndroid\":1,\"maxAndroid\":23},{\"minAndroid\":24,\"maxAndroid\":25,\"supported\":\"2.6.2\"},{\"minAndroid\":26,\"maxAndroid\":27,\"supported\":\"2.8.2\"},{\"minAndroid\":28,\"maxAndroid\":99,\"supported\":\"2.8.2\"},{\"endDate\":\"2021-11-07\",\"version\":\"2.9.0-beta1\"},{\"endDate\":\"2021-11-02\",\"version\":\"3.0-beta1\"},{\"endDate\":\"2021-11-04\",\"version\":\"3.0-beta2\"},{\"endDate\":\"2021-11-10\",\"version\":\"3.0-beta3\"},{\"endDate\":\"2021-11-14\",\"version\":\"3.0-beta4\"}\n" + " ,{\"endDate\":\"2021-11-16\",\"version\":\"3.0-beta5\"}\n" + "]" - Assertions.assertNull(AllowedVersions().findByVersion(definition, "2.6.0")) - Assertions.assertTrue(AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.has("endDate") ?: false) - Assertions.assertEquals("2021-11-07", AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.getString("endDate")) + assertThat(AllowedVersions().findByVersion(definition, "2.6.0")).isNull() + assertThat(AllowedVersions().findByVersion(definition, "2.9.0-beta1")!!.has("endDate")).isTrue() + assertThat(AllowedVersions().findByVersion(definition, "2.9.0-beta1")!!.getString("endDate")).isEqualTo("2021-11-07") } @Suppress("SpellCheckingInspection") @@ -73,10 +73,10 @@ class AllowedVersionsTest { val definition = generateSupportedVersions() val endDate = AllowedVersions().endDateToMilliseconds(AllowedVersions().findByVersion(definition, "2.9.0-beta1")?.getString("endDate") ?: "1000/01/01") val dateTime = LocalDate(endDate) - Assertions.assertEquals(2021, dateTime.year) - Assertions.assertEquals(11, dateTime.monthOfYear) - Assertions.assertEquals(7, dateTime.dayOfMonth) + assertThat(dateTime.year).isEqualTo(2021) + assertThat(dateTime.monthOfYear).isEqualTo(11) + assertThat(dateTime.dayOfMonth).isEqualTo(7) - Assertions.assertNull(AllowedVersions().endDateToMilliseconds("abdef")) + assertThat(AllowedVersions().endDateToMilliseconds("abdef")).isNull() } -} \ No newline at end of file +}