Skip to content

Commit 476d488

Browse files
authored
Improved tests
1 parent 67d1ecb commit 476d488

File tree

13 files changed

+94
-94
lines changed

13 files changed

+94
-94
lines changed

src/main/kotlin/g3501_3600/s3519_count_numbers_with_non_decreasing_digits/Solution.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class Solution {
6565
while (i < n) {
6666
num[i] = arr[i++].code - '0'.code
6767
}
68-
val temp: MutableList<Int?> = ArrayList<Int?>()
68+
val temp: MutableList<Int> = ArrayList<Int>()
6969
var len = n
7070
while (len > 0) {
7171
var rem = 0
@@ -90,7 +90,7 @@ class Solution {
9090
var k = 0
9191
val size = temp.size
9292
while (k < size) {
93-
res[k] = temp[size - 1 - k]!!
93+
res[k] = temp[size - 1 - k]
9494
k++
9595
}
9696
return res

src/test/kotlin/g3301_3400/s3355_zero_array_transformation_i/SolutionTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package g3301_3400.s3355_zero_array_transformation_i
22

3-
import org.hamcrest.CoreMatchers
3+
import org.hamcrest.CoreMatchers.equalTo
44
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66

@@ -10,7 +10,7 @@ internal class SolutionTest {
1010
assertThat<Boolean>(
1111
Solution()
1212
.isZeroArray(intArrayOf(1, 0, 1), arrayOf<IntArray>(intArrayOf(0, 2))),
13-
CoreMatchers.equalTo<Boolean>(true),
13+
equalTo<Boolean>(true),
1414
)
1515
}
1616

@@ -21,7 +21,7 @@ internal class SolutionTest {
2121
intArrayOf(4, 3, 2, 1),
2222
arrayOf<IntArray>(intArrayOf(1, 3), intArrayOf(0, 2)),
2323
),
24-
CoreMatchers.equalTo<Boolean>(false),
24+
equalTo<Boolean>(false),
2525
)
2626
}
2727

@@ -32,7 +32,7 @@ internal class SolutionTest {
3232
intArrayOf(-1, 0, 1),
3333
arrayOf<IntArray>(intArrayOf(1, 3), intArrayOf(0, 2)),
3434
),
35-
CoreMatchers.equalTo<Boolean>(true),
35+
equalTo<Boolean>(true),
3636
)
3737
}
3838
}

src/test/kotlin/g3301_3400/s3380_maximum_area_rectangle_with_point_constraints_i/SolutionTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package g3301_3400.s3380_maximum_area_rectangle_with_point_constraints_i
22

3-
import org.hamcrest.CoreMatchers
3+
import org.hamcrest.CoreMatchers.equalTo
44
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66

@@ -16,7 +16,7 @@ internal class SolutionTest {
1616
intArrayOf(3, 3),
1717
),
1818
),
19-
CoreMatchers.equalTo<Int>(4),
19+
equalTo<Int>(4),
2020
)
2121
}
2222

@@ -33,7 +33,7 @@ internal class SolutionTest {
3333
intArrayOf(2, 2),
3434
),
3535
),
36-
CoreMatchers.equalTo<Int>(-1),
36+
equalTo<Int>(-1),
3737
)
3838
}
3939

@@ -51,7 +51,7 @@ internal class SolutionTest {
5151
intArrayOf(3, 2),
5252
),
5353
),
54-
CoreMatchers.equalTo<Int>(2),
54+
equalTo<Int>(2),
5555
)
5656
}
5757
}

src/test/kotlin/g3401_3500/s3436_find_valid_emails/MysqlTest.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package g3401_3500.s3436_find_valid_emails
22

3-
import org.hamcrest.CoreMatchers
4-
import org.hamcrest.MatcherAssert
3+
import org.hamcrest.CoreMatchers.equalTo
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66
import org.zapodot.junit.db.annotations.EmbeddedDatabase
77
import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -48,19 +48,19 @@ internal class MysqlTest {
4848
.collect(Collectors.joining("\n"))
4949
.replace("#.*?\\r?\\n".toRegex(), ""),
5050
).use { resultSet ->
51-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
52-
MatcherAssert.assertThat<Int>(resultSet.getInt(1), CoreMatchers.equalTo<Int>(1))
53-
MatcherAssert.assertThat<String>(
51+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
52+
assertThat<Int>(resultSet.getInt(1), equalTo<Int>(1))
53+
assertThat<String>(
5454
resultSet.getNString(2),
55-
CoreMatchers.equalTo<String>("[email protected]"),
55+
equalTo<String>("[email protected]"),
5656
)
57-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
58-
MatcherAssert.assertThat<Int>(resultSet.getInt(1), CoreMatchers.equalTo<Int>(4))
59-
MatcherAssert.assertThat<String>(
57+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
58+
assertThat<Int>(resultSet.getInt(1), equalTo<Int>(4))
59+
assertThat<String>(
6060
resultSet.getNString(2),
61-
CoreMatchers.equalTo<String>("[email protected]"),
61+
equalTo<String>("[email protected]"),
6262
)
63-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
63+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
6464
}
6565
}
6666
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package g3401_3500.s3484_design_spreadsheet
22

3-
import org.hamcrest.CoreMatchers
4-
import org.hamcrest.MatcherAssert
3+
import org.hamcrest.CoreMatchers.equalTo
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66

77
internal class SpreadsheetTest {
@@ -10,18 +10,18 @@ internal class SpreadsheetTest {
1010
// Initializes a spreadsheet with 3 rows and 26 columns
1111
val spreadsheet = Spreadsheet(3)
1212
// returns 12 (5+7)
13-
MatcherAssert.assertThat<Int>(spreadsheet.getValue("=5+7"), CoreMatchers.equalTo<Int>(12))
13+
assertThat<Int>(spreadsheet.getValue("=5+7"), equalTo<Int>(12))
1414
// sets A1 to 10
1515
spreadsheet.setCell("A1", 10)
1616
// returns 16 (10+6)
17-
MatcherAssert.assertThat<Int>(spreadsheet.getValue("=A1+6"), CoreMatchers.equalTo<Int>(16))
17+
assertThat<Int>(spreadsheet.getValue("=A1+6"), equalTo<Int>(16))
1818
// sets B2 to 15
1919
spreadsheet.setCell("B2", 15)
2020
// returns 25 (10+15)
21-
MatcherAssert.assertThat<Int>(spreadsheet.getValue("=A1+B2"), CoreMatchers.equalTo<Int>(25))
21+
assertThat<Int>(spreadsheet.getValue("=A1+B2"), equalTo<Int>(25))
2222
// resets A1 to 0
2323
spreadsheet.resetCell("A1")
2424
// returns 15 (0+15)
25-
MatcherAssert.assertThat<Int>(spreadsheet.getValue("=A1+B2"), CoreMatchers.equalTo<Int>(15))
25+
assertThat<Int>(spreadsheet.getValue("=A1+B2"), equalTo<Int>(15))
2626
}
2727
}

src/test/kotlin/g3401_3500/s3497_analyze_subscription_conversion/MysqlTest.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package g3401_3500.s3497_analyze_subscription_conversion
22

3-
import org.hamcrest.CoreMatchers
4-
import org.hamcrest.MatcherAssert
3+
import org.hamcrest.CoreMatchers.equalTo
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66
import org.zapodot.junit.db.annotations.EmbeddedDatabase
77
import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -72,17 +72,17 @@ internal class MysqlTest {
7272
checkRow(resultSet, arrayOf<String>("1", "45.0", "76.67"))
7373
checkRow(resultSet, arrayOf<String>("3", "70.0", "63.33"))
7474
checkRow(resultSet, arrayOf<String>("4", "37.5", "45.0"))
75-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
75+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
7676
}
7777
}
7878
}
7979
}
8080

8181
@Throws(SQLException::class)
8282
private fun checkRow(resultSet: ResultSet, values: Array<String>) {
83-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
84-
MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>(values[0]))
85-
MatcherAssert.assertThat<String>(resultSet.getNString(2), CoreMatchers.equalTo<String>(values[1]))
86-
MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>(values[2]))
83+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
84+
assertThat<String>(resultSet.getNString(1), equalTo<String>(values[0]))
85+
assertThat<String>(resultSet.getNString(2), equalTo<String>(values[1]))
86+
assertThat<String>(resultSet.getNString(3), equalTo<String>(values[2]))
8787
}
8888
}

src/test/kotlin/g3501_3600/s3521_find_product_recommendation_pairs/MysqlTest.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package g3501_3600.s3521_find_product_recommendation_pairs
22

3-
import org.hamcrest.CoreMatchers
4-
import org.hamcrest.MatcherAssert
3+
import org.hamcrest.CoreMatchers.equalTo
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66
import org.zapodot.junit.db.annotations.EmbeddedDatabase
77
import org.zapodot.junit.db.annotations.EmbeddedDatabaseTest
@@ -78,17 +78,17 @@ internal class MysqlTest {
7878
checkRow(resultSet, arrayOf<String>("101", "102", "Electronics", "Books", "3"))
7979
checkRow(resultSet, arrayOf<String>("101", "103", "Electronics", "Clothing", "3"))
8080
checkRow(resultSet, arrayOf<String>("102", "104", "Books", "Clothing", "3"))
81-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(false))
81+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
8282
}
8383
}
8484
}
8585
}
8686

8787
@Throws(SQLException::class)
8888
private fun checkRow(resultSet: ResultSet, values: Array<String>) {
89-
MatcherAssert.assertThat<Boolean>(resultSet.next(), CoreMatchers.equalTo<Boolean>(true))
90-
MatcherAssert.assertThat<String>(resultSet.getNString(1), CoreMatchers.equalTo<String>(values[0]))
91-
MatcherAssert.assertThat<String>(resultSet.getNString(2), CoreMatchers.equalTo<String>(values[1]))
92-
MatcherAssert.assertThat<String>(resultSet.getNString(3), CoreMatchers.equalTo<String>(values[2]))
89+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
90+
assertThat<String>(resultSet.getNString(1), equalTo<String>(values[0]))
91+
assertThat<String>(resultSet.getNString(2), equalTo<String>(values[1]))
92+
assertThat<String>(resultSet.getNString(3), equalTo<String>(values[2]))
9393
}
9494
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
package g3501_3600.s3542_minimum_operations_to_convert_all_elements_to_zero
22

3-
import org.hamcrest.CoreMatchers
4-
import org.hamcrest.MatcherAssert
3+
import org.hamcrest.CoreMatchers.equalTo
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66

77
internal class SolutionTest {
88
@Test
99
fun minOperations() {
10-
MatcherAssert.assertThat<Int>(Solution().minOperations(intArrayOf(0, 2)), CoreMatchers.equalTo<Int>(1))
10+
assertThat<Int>(Solution().minOperations(intArrayOf(0, 2)), equalTo<Int>(1))
1111
}
1212

1313
@Test
1414
fun minOperations2() {
15-
MatcherAssert.assertThat<Int>(Solution().minOperations(intArrayOf(3, 1, 2, 1)), CoreMatchers.equalTo<Int>(3))
15+
assertThat<Int>(Solution().minOperations(intArrayOf(3, 1, 2, 1)), equalTo<Int>(3))
1616
}
1717

1818
@Test
1919
fun minOperations3() {
20-
MatcherAssert.assertThat<Int>(
20+
assertThat<Int>(
2121
Solution().minOperations(intArrayOf(1, 2, 1, 2, 1, 2)),
22-
CoreMatchers.equalTo<Int>(4),
22+
equalTo<Int>(4),
2323
)
2424
}
2525
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
package g3601_3700.s3633_earliest_finish_time_for_land_and_water_rides_i
22

3-
import org.hamcrest.CoreMatchers
4-
import org.hamcrest.MatcherAssert
3+
import org.hamcrest.CoreMatchers.equalTo
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66

77
internal class SolutionTest {
88
@Test
99
fun earliestFinishTime() {
10-
MatcherAssert.assertThat<Int?>(
10+
assertThat<Int>(
1111
Solution()
1212
.earliestFinishTime(
1313
intArrayOf(2, 8),
1414
intArrayOf(4, 1),
1515
intArrayOf(6),
1616
intArrayOf(3),
1717
),
18-
CoreMatchers.equalTo<Int?>(9),
18+
equalTo<Int>(9),
1919
)
2020
}
2121

2222
@Test
2323
fun earliestFinishTime2() {
24-
MatcherAssert.assertThat<Int?>(
24+
assertThat<Int>(
2525
Solution()
2626
.earliestFinishTime(
2727
intArrayOf(5),
2828
intArrayOf(3),
2929
intArrayOf(1),
3030
intArrayOf(10),
3131
),
32-
CoreMatchers.equalTo<Int?>(14),
32+
equalTo<Int>(14),
3333
)
3434
}
3535
}

src/test/kotlin/g3601_3700/s3643_flip_square_submatrix_vertically/SolutionTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package g3601_3700.s3643_flip_square_submatrix_vertically
22

33
import org.hamcrest.CoreMatchers.equalTo
4-
import org.hamcrest.MatcherAssert
4+
import org.hamcrest.MatcherAssert.assertThat
55
import org.junit.jupiter.api.Test
66

77
internal class SolutionTest {
88
@Test
99
fun reverseSubmatrix() {
10-
MatcherAssert.assertThat<Array<IntArray>>(
10+
assertThat<Array<IntArray>>(
1111
Solution()
1212
.reverseSubmatrix(
1313
arrayOf<IntArray>(
@@ -33,7 +33,7 @@ internal class SolutionTest {
3333

3434
@Test
3535
fun reverseSubmatrix2() {
36-
MatcherAssert.assertThat<Array<IntArray>>(
36+
assertThat<Array<IntArray>>(
3737
Solution().reverseSubmatrix(arrayOf<IntArray>(intArrayOf(3, 4, 2, 3), intArrayOf(2, 3, 4, 2)), 0, 2, 2),
3838
equalTo<Array<IntArray>>(arrayOf<IntArray>(intArrayOf(3, 4, 4, 2), intArrayOf(2, 3, 2, 3))),
3939
)

0 commit comments

Comments
 (0)