Improved task 3601

Author: javadev

src/test/kotlin/g3601_3700/s3601_find_drivers_with_improved_fuel_efficiency/MysqlTest.kt

@@ -1,7 +1,7 @@
 package g3601_3700.s3601_find_drivers_with_improved_fuel_efficiency
 
-import org.hamcrest.CoreMatchers
-import org.hamcrest.MatcherAssert
+import org.hamcrest.CoreMatchers.equalTo
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Test
 import org.zapodot.junit.db.annotations.EmbeddedDatabase
 import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -63,23 +63,23 @@ internal class MysqlTest {
                         .collect(Collectors.joining("\n"))
                         .replace("#.*?\\r?\\n".toRegex(), ""),
                 ).use { resultSet ->
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>("2"))
-                    MatcherAssert.assertThat<String>(
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getNString(1), equalTo<String>("2"))
+                    assertThat<String>(
                         resultSet.getNString(2),
-                        CoreMatchers.equalTo<String>("Bob Smith"),
+                        equalTo<String>("Bob Smith"),
                     )
-                    MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>("11.24"))
-                    MatcherAssert.assertThat<String>(resultSet.getNString(4), CoreMatchers.equalTo<String>("13.33"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
-                    MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>("1"))
-                    MatcherAssert.assertThat<String>(
+                    assertThat<String>(resultSet.getNString(3), equalTo<String>("11.24"))
+                    assertThat<String>(resultSet.getNString(4), equalTo<String>("13.33"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
+                    assertThat<String>(resultSet.getNString(1), equalTo<String>("1"))
+                    assertThat<String>(
                         resultSet.getNString(2),
-                        CoreMatchers.equalTo<String>("Alice Johnson"),
+                        equalTo<String>("Alice Johnson"),
                     )
-                    MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>("11.97"))
-                    MatcherAssert.assertThat<String>(resultSet.getNString(4), CoreMatchers.equalTo<String>("14.02"))
-                    MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
+                    assertThat<String>(resultSet.getNString(3), equalTo<String>("11.97"))
+                    assertThat<String>(resultSet.getNString(4), equalTo<String>("14.02"))
+                    assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
                 }
             }
         }