Allow should(Not)Throw on nullable lambdas Kluent MarkusAmshove#63

gregwoodfill · Sep 16, 2017 · 7e90b3c · 7e90b3c
1 parent df1d432
commit 7e90b3c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/main/kotlin/org/amshove/kluent/Exceptions.kt b/src/main/kotlin/org/amshove/kluent/Exceptions.kt
@@ -3,7 +3,7 @@ package org.amshove.kluent
 import org.junit.ComparisonFailure
 import kotlin.reflect.KClass
 
-infix fun <T : Throwable> (() -> Any).shouldThrow(expectedException: KClass<T>): ExceptionResult<T> {
+infix fun <T : Throwable> (() -> Any?).shouldThrow(expectedException: KClass<T>): ExceptionResult<T> {
     try {
         this.invoke()
         fail("There was an Exception expected to be thrown, but nothing was thrown", "$expectedException", "None")
@@ -15,7 +15,7 @@ infix fun <T : Throwable> (() -> Any).shouldThrow(expectedException: KClass<T>):
     }
 }
 
-infix fun <T : Throwable> (() -> Any).shouldNotThrow(expectedException: KClass<T>) {
+infix fun <T : Throwable> (() -> Any?).shouldNotThrow(expectedException: KClass<T>) {
     try {
         this.invoke()
     } catch (e: Throwable) {

diff --git a/src/test/kotlin/org/amshove/kluent/tests/assertions/ShouldThrowTests.kt b/src/test/kotlin/org/amshove/kluent/tests/assertions/ShouldThrowTests.kt
@@ -109,5 +109,19 @@ class ShouldThrowTests : Spek({
                 }
             }
         }
+
+        given("a lambda that returns null") {
+            val func = { null }
+            it("should not throw exception") {
+                func shouldNotThrow AnyException
+            }
+        }
+
+        given("a lambda that can return null") {
+            val func = { if (0 == 1) null else throw IllegalStateException() }
+            it("should throw exception") {
+                func shouldThrow IllegalStateException::class
+            }
+        }
     }
 })