Skip to content

Commit 704ddbd

Browse files
committed
Improved tests
1 parent 6a1ebb8 commit 704ddbd

File tree

9 files changed

+69
-69
lines changed

9 files changed

+69
-69
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package g3401_3500.s3451_find_invalid_ip_addresses
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
@@ -56,25 +56,25 @@ internal class MysqlTest {
5656
.collect(Collectors.joining("\n"))
5757
.replace("#.*?\\r?\\n".toRegex(), ""),
5858
).use { resultSet ->
59-
MatcherAssert.assertThat<Boolean?>(resultSet.next(), CoreMatchers.equalTo<Boolean?>(true))
60-
MatcherAssert.assertThat<String?>(
59+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
60+
assertThat<String>(
6161
resultSet.getNString(1),
62-
CoreMatchers.equalTo<String?>("256.1.2.3"),
62+
equalTo<String>("256.1.2.3"),
6363
)
64-
MatcherAssert.assertThat<String?>(resultSet.getNString(2), CoreMatchers.equalTo<String?>("2"))
65-
MatcherAssert.assertThat<Boolean?>(resultSet.next(), CoreMatchers.equalTo<Boolean?>(true))
66-
MatcherAssert.assertThat<String?>(
64+
assertThat<String>(resultSet.getNString(2), equalTo<String>("2"))
65+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
66+
assertThat<String>(
6767
resultSet.getNString(1),
68-
CoreMatchers.equalTo<String?>("192.168.001.1"),
68+
equalTo<String>("192.168.001.1"),
6969
)
70-
MatcherAssert.assertThat<String?>(resultSet.getNString(2), CoreMatchers.equalTo<String?>("2"))
71-
MatcherAssert.assertThat<Boolean?>(resultSet.next(), CoreMatchers.equalTo<Boolean?>(true))
72-
MatcherAssert.assertThat<String?>(
70+
assertThat<String>(resultSet.getNString(2), equalTo<String>("2"))
71+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(true))
72+
assertThat<String>(
7373
resultSet.getNString(1),
74-
CoreMatchers.equalTo<String?>("192.168.1"),
74+
equalTo<String>("192.168.1"),
7575
)
76-
MatcherAssert.assertThat<String?>(resultSet.getNString(2), CoreMatchers.equalTo<String?>("1"))
77-
MatcherAssert.assertThat<Boolean?>(resultSet.next(), CoreMatchers.equalTo<Boolean?>(false))
76+
assertThat<String>(resultSet.getNString(2), equalTo<String>("1"))
77+
assertThat<Boolean>(resultSet.next(), equalTo<Boolean>(false))
7878
}
7979
}
8080
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package g3401_3500.s3452_sum_of_good_numbers
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 sumOfGoodNumbers() {
10-
MatcherAssert.assertThat<Int>(
10+
assertThat<Int>(
1111
Solution().sumOfGoodNumbers(intArrayOf(1, 3, 2, 1, 5, 4), 2),
12-
CoreMatchers.equalTo<Int>(12),
12+
equalTo<Int>(12),
1313
)
1414
}
1515

1616
@Test
1717
fun sumOfGoodNumbers2() {
18-
MatcherAssert.assertThat<Int>(Solution().sumOfGoodNumbers(intArrayOf(2, 1), 1), CoreMatchers.equalTo<Int>(2))
18+
assertThat<Int>(Solution().sumOfGoodNumbers(intArrayOf(2, 1), 1), equalTo<Int>(2))
1919
}
2020
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package g3401_3500.s3453_separate_squares_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 separateSquares() {
10-
MatcherAssert.assertThat<Double>(
10+
assertThat<Double>(
1111
Solution().separateSquares(arrayOf<IntArray>(intArrayOf(0, 0, 1), intArrayOf(2, 2, 1))),
12-
CoreMatchers.equalTo<Double>(1.0000000012083676),
12+
equalTo<Double>(1.0000000012083676),
1313
)
1414
}
1515

1616
@Test
1717
fun separateSquares2() {
18-
MatcherAssert.assertThat<Double>(
18+
assertThat<Double>(
1919
Solution().separateSquares(arrayOf<IntArray>(intArrayOf(0, 0, 2), intArrayOf(1, 1, 1))),
20-
CoreMatchers.equalTo<Double>(1.1666666677873083),
20+
equalTo<Double>(1.1666666677873083),
2121
)
2222
}
2323
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package g3401_3500.s3454_separate_squares_ii
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 separateSquares() {
10-
MatcherAssert.assertThat<Double>(
10+
assertThat<Double>(
1111
Solution().separateSquares(arrayOf<IntArray>(intArrayOf(0, 0, 1), intArrayOf(2, 2, 1))),
12-
CoreMatchers.equalTo<Double>(1.0),
12+
equalTo<Double>(1.0),
1313
)
1414
}
1515

1616
@Test
1717
fun separateSquares2() {
18-
MatcherAssert.assertThat<Double>(
18+
assertThat<Double>(
1919
Solution().separateSquares(arrayOf<IntArray>(intArrayOf(0, 0, 2), intArrayOf(1, 1, 1))),
20-
CoreMatchers.equalTo<Double>(1.0),
20+
equalTo<Double>(1.0),
2121
)
2222
}
2323
}
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
package g3401_3500.s3455_shortest_matching_substring
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 shortestMatchingSubstring() {
10-
MatcherAssert.assertThat<Int>(
10+
assertThat<Int>(
1111
Solution().shortestMatchingSubstring("abaacbaecebce", "ba*c*ce"),
12-
CoreMatchers.equalTo<Int>(8),
12+
equalTo<Int>(8),
1313
)
1414
}
1515

1616
@Test
1717
fun shortestMatchingSubstring2() {
18-
MatcherAssert.assertThat<Int>(
18+
assertThat<Int>(
1919
Solution().shortestMatchingSubstring("baccbaadbc", "cc*baa*adb"),
20-
CoreMatchers.equalTo<Int>(-1),
20+
equalTo<Int>(-1),
2121
)
2222
}
2323

2424
@Test
2525
fun shortestMatchingSubstring3() {
26-
MatcherAssert.assertThat<Int>(Solution().shortestMatchingSubstring("a", "**"), CoreMatchers.equalTo<Int>(0))
26+
assertThat<Int>(Solution().shortestMatchingSubstring("a", "**"), equalTo<Int>(0))
2727
}
2828

2929
@Test
3030
fun shortestMatchingSubstring4() {
31-
MatcherAssert.assertThat<Int>(
31+
assertThat<Int>(
3232
Solution().shortestMatchingSubstring("madlogic", "*adlogi*"),
33-
CoreMatchers.equalTo<Int>(6),
33+
equalTo<Int>(6),
3434
)
3535
}
3636
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package g3401_3500.s3456_find_special_substring_of_length_k
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 hasSpecialSubstring() {
10-
MatcherAssert.assertThat<Boolean>(
10+
assertThat<Boolean>(
1111
Solution().hasSpecialSubstring("aaabaaa", 3),
12-
CoreMatchers.equalTo<Boolean>(true),
12+
equalTo<Boolean>(true),
1313
)
1414
}
1515

1616
@Test
1717
fun hasSpecialSubstring2() {
18-
MatcherAssert.assertThat<Boolean>(
18+
assertThat<Boolean>(
1919
Solution().hasSpecialSubstring("abc", 2),
20-
CoreMatchers.equalTo<Boolean>(false),
20+
equalTo<Boolean>(false),
2121
)
2222
}
2323
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package g3401_3500.s3457_eat_pizzas
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 maxWeight() {
10-
MatcherAssert.assertThat<Long>(
10+
assertThat<Long>(
1111
Solution().maxWeight(intArrayOf(1, 2, 3, 4, 5, 6, 7, 8)),
12-
CoreMatchers.equalTo<Long>(14L),
12+
equalTo<Long>(14L),
1313
)
1414
}
1515

1616
@Test
1717
fun maxWeight2() {
18-
MatcherAssert.assertThat<Long>(
18+
assertThat<Long>(
1919
Solution().maxWeight(intArrayOf(2, 1, 1, 1, 1, 1, 1, 1)),
20-
CoreMatchers.equalTo<Long>(3L),
20+
equalTo<Long>(3L),
2121
)
2222
}
2323
}
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
package g3401_3500.s3458_select_k_disjoint_special_substrings
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 maxSubstringLength() {
10-
MatcherAssert.assertThat<Boolean>(
10+
assertThat<Boolean>(
1111
Solution().maxSubstringLength("abcdbaefab", 2),
12-
CoreMatchers.equalTo<Boolean>(true),
12+
equalTo<Boolean>(true),
1313
)
1414
}
1515

1616
@Test
1717
fun maxSubstringLength2() {
18-
MatcherAssert.assertThat<Boolean>(
18+
assertThat<Boolean>(
1919
Solution().maxSubstringLength("cdefdc", 3),
20-
CoreMatchers.equalTo<Boolean>(false),
20+
equalTo<Boolean>(false),
2121
)
2222
}
2323

2424
@Test
2525
fun maxSubstringLength3() {
26-
MatcherAssert.assertThat<Boolean>(
26+
assertThat<Boolean>(
2727
Solution().maxSubstringLength("abeabe", 0),
28-
CoreMatchers.equalTo<Boolean>(true),
28+
equalTo<Boolean>(true),
2929
)
3030
}
3131
}

src/test/kotlin/g3401_3500/s3459_length_of_longest_v_shaped_diagonal_segment/SolutionTest.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package g3401_3500.s3459_length_of_longest_v_shaped_diagonal_segment
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 lenOfVDiagonal() {
10-
MatcherAssert.assertThat<Int>(
10+
assertThat<Int>(
1111
Solution()
1212
.lenOfVDiagonal(
1313
arrayOf<IntArray>(
@@ -18,13 +18,13 @@ internal class SolutionTest {
1818
intArrayOf(2, 0, 0, 2, 2),
1919
),
2020
),
21-
CoreMatchers.equalTo<Int>(5),
21+
equalTo<Int>(5),
2222
)
2323
}
2424

2525
@Test
2626
fun lenOfVDiagonal2() {
27-
MatcherAssert.assertThat<Int>(
27+
assertThat<Int>(
2828
Solution()
2929
.lenOfVDiagonal(
3030
arrayOf<IntArray>(
@@ -35,13 +35,13 @@ internal class SolutionTest {
3535
intArrayOf(2, 0, 0, 2, 2),
3636
),
3737
),
38-
CoreMatchers.equalTo<Int>(4),
38+
equalTo<Int>(4),
3939
)
4040
}
4141

4242
@Test
4343
fun lenOfVDiagonal3() {
44-
MatcherAssert.assertThat<Int>(
44+
assertThat<Int>(
4545
Solution()
4646
.lenOfVDiagonal(
4747
arrayOf<IntArray>(
@@ -52,7 +52,7 @@ internal class SolutionTest {
5252
intArrayOf(2, 0, 0, 2, 0),
5353
),
5454
),
55-
CoreMatchers.equalTo<Int>(5),
55+
equalTo<Int>(5),
5656
)
5757
}
5858
}

0 commit comments

Comments
 (0)