Skip to content

Commit 5ff6ca0

Browse files
authored
Merge pull request #78 from david-kubecka/david-kubecka-patch-1
fix: make error/value types in RaiseAssert nullable
2 parents 4ebc6f7 + c2679e1 commit 5ff6ca0

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/main/kotlin/in/rcard/assertj/arrowcore/AbstractRaiseAssert.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import org.assertj.core.internal.StandardComparisonStrategy
2323
*/
2424
abstract class AbstractRaiseAssert<
2525
SELF : AbstractRaiseAssert<SELF, ERROR, VALUE>,
26-
ERROR : Any,
27-
VALUE : Any,
26+
ERROR : Any?,
27+
VALUE : Any?,
2828
> internal constructor(
2929
raiseResult: RaiseResult<ERROR, VALUE>,
3030
) : AbstractAssert<
@@ -155,12 +155,12 @@ abstract class AbstractRaiseAssert<
155155
}
156156
}
157157

158-
sealed interface RaiseResult<out ERROR : Any, out VALUE : Any> {
159-
data class Success<out VALUE : Any>(
158+
sealed interface RaiseResult<out ERROR : Any?, out VALUE : Any?> {
159+
data class Success<out VALUE : Any?>(
160160
val value: VALUE,
161161
) : RaiseResult<Nothing, VALUE>
162162

163-
data class Failure<out ERROR : Any>(
163+
data class Failure<out ERROR : Any?>(
164164
val error: ERROR,
165165
) : RaiseResult<ERROR, Nothing>
166166

src/main/kotlin/in/rcard/assertj/arrowcore/RaiseAssert.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import kotlin.experimental.ExperimentalTypeInference
2222
*
2323
* @since 0.2.0
2424
*/
25-
class RaiseAssert<ERROR : Any, VALUE : Any>(
25+
class RaiseAssert<ERROR : Any?, VALUE : Any?>(
2626
raiseResult: RaiseResult<ERROR, VALUE>,
2727
) : AbstractRaiseAssert<RaiseAssert<ERROR, VALUE>, ERROR, VALUE>(raiseResult) {
2828
companion object {
29-
inline fun <ERROR : Any, VALUE : Any> assertThat(
29+
inline fun <ERROR : Any?, VALUE : Any?> assertThat(
3030
@BuilderInference lambda: Raise<ERROR>.() -> VALUE,
3131
): RaiseAssert<ERROR, VALUE> {
3232
val raiseResult =
@@ -54,7 +54,7 @@ class RaiseAssert<ERROR : Any, VALUE : Any>(
5454
* @param shouldRaiseThrowable the function to be executed in the [Raise] context.
5555
* @return the [AbstractThrowableAssert] to be used to verify the exception.
5656
*/
57-
inline fun <ERROR : Any, VALUE : Any> assertThatThrownBy(
57+
inline fun <ERROR : Any?, VALUE : Any?> assertThatThrownBy(
5858
@BuilderInference shouldRaiseThrowable: Raise<ERROR>.() -> VALUE,
5959
): AbstractThrowableAssert<*, out Throwable> {
6060
val throwable: Throwable? =
@@ -81,7 +81,7 @@ class RaiseAssert<ERROR : Any, VALUE : Any>(
8181
* @param shouldRaiseError the function to be executed in the [Raise] context.
8282
* @return the [AbstractObjectAssert] to be used to verify the error.
8383
*/
84-
inline fun <ERROR : Any, VALUE : Any> assertThatRaisedBy(
84+
inline fun <ERROR : Any?, VALUE : Any?> assertThatRaisedBy(
8585
@BuilderInference shouldRaiseError: Raise<ERROR>.() -> VALUE,
8686
): AbstractObjectAssert<*, out ERROR> {
8787
val error =

0 commit comments

Comments
 (0)