|
1 | 1 | package g3601_3700.s3601_find_drivers_with_improved_fuel_efficiency
|
2 | 2 |
|
3 |
| -import org.hamcrest.CoreMatchers |
4 |
| -import org.hamcrest.MatcherAssert |
| 3 | +import org.hamcrest.CoreMatchers.equalTo |
| 4 | +import org.hamcrest.MatcherAssert.assertThat |
5 | 5 | import org.junit.jupiter.api.Test
|
6 | 6 | import org.zapodot.junit.db.annotations.EmbeddedDatabase
|
7 | 7 | import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
|
@@ -63,23 +63,23 @@ internal class MysqlTest {
|
63 | 63 | .collect(Collectors.joining("\n"))
|
64 | 64 | .replace("#.*?\\r?\\n".toRegex(), ""),
|
65 | 65 | ).use { resultSet ->
|
66 |
| - MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true)) |
67 |
| - MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>("2")) |
68 |
| - MatcherAssert.assertThat<String>( |
| 66 | + assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true)) |
| 67 | + assertThat<String>(resultSet.getNString(1), equalTo<String>("2")) |
| 68 | + assertThat<String>( |
69 | 69 | resultSet.getNString(2),
|
70 |
| - CoreMatchers.equalTo<String>("Bob Smith"), |
| 70 | + equalTo<String>("Bob Smith"), |
71 | 71 | )
|
72 |
| - MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>("11.24")) |
73 |
| - MatcherAssert.assertThat<String>(resultSet.getNString(4), CoreMatchers.equalTo<String>("13.33")) |
74 |
| - MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true)) |
75 |
| - MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>("1")) |
76 |
| - MatcherAssert.assertThat<String>( |
| 72 | + assertThat<String>(resultSet.getNString(3), equalTo<String>("11.24")) |
| 73 | + assertThat<String>(resultSet.getNString(4), equalTo<String>("13.33")) |
| 74 | + assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true)) |
| 75 | + assertThat<String>(resultSet.getNString(1), equalTo<String>("1")) |
| 76 | + assertThat<String>( |
77 | 77 | resultSet.getNString(2),
|
78 |
| - CoreMatchers.equalTo<String>("Alice Johnson"), |
| 78 | + equalTo<String>("Alice Johnson"), |
79 | 79 | )
|
80 |
| - MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>("11.97")) |
81 |
| - MatcherAssert.assertThat<String>(resultSet.getNString(4), CoreMatchers.equalTo<String>("14.02")) |
82 |
| - MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false)) |
| 80 | + assertThat<String>(resultSet.getNString(3), equalTo<String>("11.97")) |
| 81 | + assertThat<String>(resultSet.getNString(4), equalTo<String>("14.02")) |
| 82 | + assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false)) |
83 | 83 | }
|
84 | 84 | }
|
85 | 85 | }
|
|
0 commit comments