From 38c01372ee5a3983e160f3924ed4f8310d6faaf8 Mon Sep 17 00:00:00 2001
From: Ryan Haining <haining.cpp@gmail.com>
Date: Wed, 4 Oct 2023 21:01:49 -0700
Subject: [PATCH] Rewrites ComparatorTest with matchers

Issue #2745
---
 .../automation/elements/ComparatorTest.kt     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/elements/ComparatorTest.kt b/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/elements/ComparatorTest.kt
index 80f31ab078..6363e834f3 100644
--- a/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/elements/ComparatorTest.kt
+++ b/plugins/automation/src/test/kotlin/app/aaps/plugins/automation/elements/ComparatorTest.kt
@@ -1,35 +1,35 @@
 package app.aaps.plugins.automation.elements
 
 import app.aaps.plugins.automation.triggers.TriggerTestBase
-import org.junit.jupiter.api.Assertions
+import com.google.common.truth.Truth.assertThat
 import org.junit.jupiter.api.Test
 
 class ComparatorTest : TriggerTestBase() {
 
     @Test
     fun checkTest() {
-        Assertions.assertTrue(Comparator.Compare.IS_EQUAL.check(1, 1))
-        Assertions.assertTrue(Comparator.Compare.IS_LESSER.check(1, 2))
-        Assertions.assertTrue(Comparator.Compare.IS_EQUAL_OR_LESSER.check(1, 2))
-        Assertions.assertTrue(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 2))
-        Assertions.assertTrue(Comparator.Compare.IS_GREATER.check(2, 1))
-        Assertions.assertTrue(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 1))
-        Assertions.assertTrue(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 2))
-        Assertions.assertFalse(Comparator.Compare.IS_LESSER.check(2, 1))
-        Assertions.assertFalse(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 1))
-        Assertions.assertFalse(Comparator.Compare.IS_GREATER.check(1, 2))
-        Assertions.assertFalse(Comparator.Compare.IS_EQUAL_OR_GREATER.check(1, 2))
-//        Assertions.assertTrue(Comparator.Compare.IS_NOT_AVAILABLE.check<Int?>(1, null))
+        assertThat(Comparator.Compare.IS_EQUAL.check(1, 1)).isTrue()
+        assertThat(Comparator.Compare.IS_LESSER.check(1, 2)).isTrue()
+        assertThat(Comparator.Compare.IS_EQUAL_OR_LESSER.check(1, 2)).isTrue()
+        assertThat(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 2)).isTrue()
+        assertThat(Comparator.Compare.IS_GREATER.check(2, 1)).isTrue()
+        assertThat(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 1)).isTrue()
+        assertThat(Comparator.Compare.IS_EQUAL_OR_GREATER.check(2, 2)).isTrue()
+        assertThat(Comparator.Compare.IS_LESSER.check(2, 1)).isFalse()
+        assertThat(Comparator.Compare.IS_EQUAL_OR_LESSER.check(2, 1)).isFalse()
+        assertThat(Comparator.Compare.IS_GREATER.check(1, 2)).isFalse()
+        assertThat(Comparator.Compare.IS_EQUAL_OR_GREATER.check(1, 2)).isFalse()
+//        assertThat(Comparator.Compare.IS_NOT_AVAILABLE.check<Int?>(1, null)).isTrue()
     }
 
     @Test
     fun labelsTest() {
-        Assertions.assertEquals(6, Comparator.Compare.labels(rh).size)
+        assertThat(Comparator.Compare.labels(rh)).hasSize(6)
     }
 
     @Test
     fun setValueTest() {
         val c: Comparator = Comparator(rh).setValue(Comparator.Compare.IS_EQUAL_OR_GREATER)
-        Assertions.assertEquals(Comparator.Compare.IS_EQUAL_OR_GREATER, c.value)
+        assertThat(c.value).isEqualTo(Comparator.Compare.IS_EQUAL_OR_GREATER)
     }
-}
\ No newline at end of file
+}