Use reified type parameter

Author: dinomite

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/TestHelpers.kt

@@ -1,6 +1,5 @@
 package com.fasterxml.jackson.module.kotlin.test
 
-import kotlin.reflect.KClass
 import kotlin.test.fail
 
 /**
@@ -13,18 +12,18 @@ import kotlin.test.fail
  * should make it clear what has happened (i.e. that some previously broken functionality
  * has been fixed).
  *
- * @param throwableType The expected throwable
+ * @param T             The expected throwable
  * @param fixMessage    The message to print when the block succeeds
  * @param block         The block to execute
  */
-fun <T : Throwable> expectFailure(
-        throwableType: KClass<T>,
+inline fun <reified T : Throwable> expectFailure(
         fixMessage: String,
         block: () -> Unit
 ) {
     try {
         block()
     } catch (e: Throwable) {
+        val throwableType = T::class
         if (throwableType.isInstance(e)) {
             // Expected exception, do nothing
         } else {

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/TestHelpersTest.kt

@@ -7,15 +7,15 @@ import kotlin.test.assertEquals
 class TestHelpersTest {
     @Test
     fun expectFailure_ExpectedExceptionThrown() {
-        expectFailure(AssertionError::class, "This will not be printed") {
+        expectFailure<AssertionError>("This will not be printed") {
             throw AssertionError("This is expected")
         }
     }
 
     @Test
     fun expectFailure_AnotherExceptionThrown() {
         val throwable = assertThrows(AssertionError::class.java) {
-            expectFailure(AssertionError::class, "This will not be printed") {
+            expectFailure<AssertionError>("This will not be printed") {
                 throw Exception("This is not expected")
             }
         }
@@ -27,7 +27,7 @@ class TestHelpersTest {
     fun expectFailure_NoExceptionThrown() {
         val fixMessage = "Test will fail with this message"
         val throwable = assertThrows(AssertionError::class.java) {
-            expectFailure(AssertionError::class, fixMessage) {
+            expectFailure<AssertionError>(fixMessage) {
                 // Do nothing
             }
         }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github138.kt

@@ -26,7 +26,7 @@ class TestGithub138 {
     fun testDeserProblem() {
         val xml = """<sms Phone="435242423412" Id="43234324">Lorem ipsum</sms>"""
         val xmlMapper = XmlMapper().registerKotlinModule()
-        expectFailure(InvalidDefinitionException::class, "GitHub #138 has been fixed!") {
+        expectFailure<InvalidDefinitionException>("GitHub #138 has been fixed!") {
             val jsms = xmlMapper.readValue<Sms>(xml)
         }
     }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github160DisableAnnotations.kt

@@ -13,7 +13,7 @@ class TestGithub160 {
     @Test
     fun dataClass() {
         val mapper = jacksonObjectMapper().configure(MapperFeature.USE_ANNOTATIONS, false)
-        expectFailure(MismatchedInputException::class, "GitHub #160 has been fixed!") {
+        expectFailure<MismatchedInputException>("GitHub #160 has been fixed!") {
             mapper.readValue<DataClass>("""{"blah":"blah"}""")
         }
     }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github271AlphaSortProperties.kt

@@ -17,7 +17,7 @@ class TestGithub271 {
         val mapper = jacksonObjectMapper()
 
         val json = mapper.writeValueAsString(Foo("a", "c"))
-        expectFailure(AssertionError::class, "GitHub #271 has been fixed!") {
+        expectFailure<AssertionError>("GitHub #271 has been fixed!") {
             assertEquals("""{"a":"a","b":"b","c":"c"}""", json)
         }
     }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github335.kt

@@ -30,7 +30,7 @@ class Github335Test {
         val json = mapper.writeValueAsString(oldEntity)
         val newEntity = mapper.readValue<MyEntity>(json)
 
-        expectFailure(AssertionError::class, "GitHub #335 has been fixed!") {
+        expectFailure<AssertionError>("GitHub #335 has been fixed!") {
             // newEntity.type is the string "null" instead of the null value
             assertNull(newEntity.type)
         }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github340.kt

@@ -21,7 +21,7 @@ class OwnerRequestTest {
 
     @Test
     fun testDeserHit340() {
-        expectFailure(UnrecognizedPropertyException::class, "GitHub #340 has been fixed!") {
+        expectFailure<UnrecognizedPropertyException>("GitHub #340 has been fixed!") {
             val value: IsField = jackson.readValue(json)
             assertEquals("Got a foo", value.foo)
         }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github396.kt

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.module.kotlin.registerKotlinModule
 import com.fasterxml.jackson.module.kotlin.test.expectFailure
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.fail
 
 class TestGithub396 {
     /**
@@ -18,7 +17,7 @@ class TestGithub396 {
         val mapper = XmlMapper().registerKotlinModule()
 
         val xml = "<product><stuff></stuff></product>"
-        expectFailure(MismatchedInputException::class, "GitHub #396 has been fixed!") {
+        expectFailure<MismatchedInputException>("GitHub #396 has been fixed!") {
             val product: Product = mapper.readValue(xml, Product::class.java)
 
             assertEquals(Product(null), product)

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github50.kt

@@ -18,7 +18,7 @@ class TestGithub50 {
     @Test
     fun testGithub50UnwrappedError() {
         val json = """{"firstName":"John","lastName":"Smith","position":"Manager"}"""
-        expectFailure(InvalidDefinitionException::class, "GitHub #50 has been fixed!") {
+        expectFailure<InvalidDefinitionException>("GitHub #50 has been fixed!") {
             val obj: Employee = jacksonObjectMapper().readValue(json)
         }
     }

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/failing/Github54.kt

@@ -7,7 +7,6 @@ import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.fasterxml.jackson.module.kotlin.test.expectFailure
 import org.junit.Test
-import kotlin.test.fail
 
 class TestGithub54 {
     @Test
@@ -22,7 +21,7 @@ class TestGithub54 {
         entity1.entity2 = entity2
 
         val json = mapper.writeValueAsString(entity1)
-        expectFailure(UnresolvedForwardReference::class, "GitHub #54 has been fixed!") {
+        expectFailure<UnresolvedForwardReference>("GitHub #54 has been fixed!") {
             mapper.readValue<Entity1>(json)
         }