diff --git a/src/test/kotlin/com/github/vokorm/MappingTest.kt b/src/test/kotlin/com/github/vokorm/MappingTest.kt index ddeb447..6ef60c2 100644 --- a/src/test/kotlin/com/github/vokorm/MappingTest.kt +++ b/src/test/kotlin/com/github/vokorm/MappingTest.kt @@ -6,7 +6,6 @@ import com.github.mvysny.dynatest.* import org.jdbi.v3.core.mapper.reflect.FieldMapper import java.lang.IllegalStateException import java.lang.Long -import java.sql.Timestamp import java.time.Instant import java.time.LocalDate import java.util.* @@ -178,13 +177,3 @@ fun DynaNodeGroup.dbMappingTests() { } } } - -// MSSQL nulls out millis for some reason when running on CI -val Date.withZeroMillis: Date get() { - val result = Timestamp((this as Timestamp).time / 1000 * 1000) - result.nanos = 0 - return result -} - -val Instant.withZeroNanos: Instant get() = Instant.ofEpochMilli(toEpochMilli()) -val List.plusNull: List get() = toList() + listOf(null) diff --git a/src/test/kotlin/com/github/vokorm/TestUtils.kt b/src/test/kotlin/com/github/vokorm/TestUtils.kt index d9df7ce..ff3a58e 100644 --- a/src/test/kotlin/com/github/vokorm/TestUtils.kt +++ b/src/test/kotlin/com/github/vokorm/TestUtils.kt @@ -10,6 +10,9 @@ import java.io.ByteArrayOutputStream import java.io.ObjectInputStream import java.io.ObjectOutputStream import java.io.Serializable +import java.sql.Timestamp +import java.time.Instant +import java.util.Date import kotlin.test.expect val gson: Gson = GsonBuilder().registerJavaTimeAdapters().create() @@ -48,3 +51,13 @@ fun Serializable?.serializeToBytes(): ByteArray = ByteArrayOutputStream().also { fun assumeDockerAvailable() { Assumptions.assumeTrue(DockerClientFactory.instance().isDockerAvailable(), "Docker not available") } + +// MSSQL nulls out millis for some reason when running on CI +val Date.withZeroMillis: Date get() { + val result = Timestamp((this as Timestamp).time / 1000 * 1000) + result.nanos = 0 + return result +} + +val Instant.withZeroNanos: Instant get() = Instant.ofEpochMilli(toEpochMilli()) +val List.plusNull: List get() = toList() + listOf(null)