Fix tests

Author: k163377

src/test/kotlin/tools/jackson/module/kotlin/KotlinModuleTest.kt

@@ -13,7 +13,12 @@ class KotlinModuleTest {
     // After the final migration is complete, this test will be removed.
     @Test
     fun strictNullChecksTests() {
-        assertTrue(kotlinModule { enable(StrictNullChecks) }.strictNullChecks)
+        assertTrue(
+            kotlinModule {
+                disable(NewStrictNullChecks)
+                enable(StrictNullChecks)
+            }.strictNullChecks
+        )
         assertTrue(kotlinModule { enable(NewStrictNullChecks) }.strictNullChecks)
 
         assertThrows<IllegalArgumentException> {
@@ -32,8 +37,8 @@ class KotlinModuleTest {
         assertFalse(module.nullToEmptyCollection)
         assertFalse(module.nullToEmptyMap)
         assertFalse(module.nullIsSameAsDefault)
-        assertFalse(module.singletonSupport)
-        assertFalse(module.strictNullChecks)
+        assertTrue(module.singletonSupport)
+        assertTrue(module.strictNullChecks)
         assertFalse(module.kotlinPropertyNameAsImplicitName)
         assertFalse(module.useJavaDurationConversion)
     }

src/test/kotlin/tools/jackson/module/kotlin/test/github/Github27.kt

@@ -9,12 +9,14 @@ import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import tools.jackson.databind.DeserializationFeature
+import tools.jackson.module.kotlin.KotlinFeature
 import kotlin.test.assertTrue
 import kotlin.test.fail
 
 class TestGithub27 {
-    val mapper = jacksonMapperBuilder().disable(SerializationFeature.INDENT_OUTPUT)
-            .build()
+    val mapper = jacksonMapperBuilder { disable(KotlinFeature.NewStrictNullChecks) }
+        .disable(SerializationFeature.INDENT_OUTPUT)
+        .build()
 
     private data class ClassWithNullableInt(val sample: Int?)
 

src/test/kotlin/tools/jackson/module/kotlin/test/github/failing/Github518.kt

@@ -8,6 +8,7 @@ import tools.jackson.module.kotlin.readValue
 import tools.jackson.module.kotlin.test.expectFailure
 import kotlin.test.assertSame
 import org.junit.jupiter.api.Test
+import tools.jackson.module.kotlin.KotlinFeature
 
 /**
  * An empty object should be deserialized as *the* Unit instance for a nullable Unit reference Type.
@@ -30,7 +31,7 @@ class TestGithub518 {
     @Test
     fun deserializeEmptyObjectToSingletonUnitFails() {
         expectFailure<AssertionError>("GitHub #518 has been fixed!") {
-            assertSame(jacksonObjectMapper().readValue<Unit?>("{}"), Unit)
+            assertSame(jacksonObjectMapper { disable(SingletonSupport) }.readValue<Unit?>("{}"), Unit)
         }
     }