Skip to content

Commit 0867d3d

Browse files
committed
Renamed isNotPresent to isEmpty
1 parent 9e75a5e commit 0867d3d

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1212

1313
### Added
1414
- Added `startsWith` and `endsWith` for `List`.
15-
- Added `Optional<>.isPresent()`, `Optional<>.isNotPresent()`, `Optional<>.hasValue()`
15+
- Added `Optional<>.isPresent()`, `Optional<>.isEmpty()`, `Optional<>.hasValue()`
1616
- Added expanded set up apple targets for kotlin native.
1717

1818
### Fixed

assertk/src/jvmMain/kotlin/assertk/assertions/optional.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import java.util.*
77

88
/**
99
* Asserts that optional's value is present
10-
* @see isNotPresent
10+
* @see isEmpty
1111
*/
1212
fun <T> Assert<Optional<T>>.isPresent(): Assert<T> {
1313
return transform { optional ->
@@ -22,7 +22,7 @@ fun <T> Assert<Optional<T>>.isPresent(): Assert<T> {
2222
* Asserts optional's value is not present.
2323
* @see isPresent
2424
*/
25-
fun Assert<Optional<*>>.isNotPresent() {
25+
fun Assert<Optional<*>>.isEmpty() {
2626
given { actual ->
2727
if (!actual.isPresent) return
2828
expected("optional to be empty but was:${show(actual.get())}")

assertk/src/jvmTest/kotlin/test/assertk/assertions/OptionalTest.kt

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ import assertk.all
44
import assertk.assertAll
55
import assertk.assertThat
66
import assertk.assertions.*
7-
import com.willowtreeapps.opentest4k.AssertionFailedError
87
import org.junit.Test
98
import java.time.LocalDate
109
import java.time.Month
1110
import java.util.*
12-
import kotlin.random.Random
1311
import kotlin.test.assertEquals
1412
import kotlin.test.assertFails
1513

@@ -30,13 +28,13 @@ internal class OptionalTest {
3028
)
3129
}
3230

33-
@Test fun isNotPresent_passes() {
34-
assertThat(Optional.empty<Any>()).isNotPresent()
31+
@Test fun isEmpty_passes() {
32+
assertThat(Optional.empty<Any>()).isEmpty()
3533
}
3634

37-
@Test fun isNotPresent_fails() {
35+
@Test fun isEmpty_fails() {
3836
val error = assertFails {
39-
assertThat(Optional.of("test")).isNotPresent()
37+
assertThat(Optional.of("test")).isEmpty()
4038
}
4139
assertEquals(
4240
"expected optional to be empty but was:<\"test\">",
@@ -90,7 +88,7 @@ internal class OptionalTest {
9088

9189
// Asserting against findPersonById in data access logic:
9290
assertAll {
93-
assertThat(findPersonById(0)).isNotPresent()
91+
assertThat(findPersonById(0)).isEmpty()
9492
assertThat(findPersonById(personId)).isPresent().all {
9593
prop(Person::id).isEqualTo(personId)
9694
prop(Person::name).isEqualTo(personName)

0 commit comments

Comments
 (0)