From a201a8d52b092cecf9a4e51f300223383afebc8a Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Fri, 15 Nov 2019 15:37:47 +0000 Subject: [PATCH] CORDA-2876: Fix serialization-djvm module for Java 11. (#5720) --- .../serialization/djvm/DeserializeCertificatesTest.kt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializeCertificatesTest.kt b/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializeCertificatesTest.kt index 897c13828e..05ef5cd4da 100644 --- a/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializeCertificatesTest.kt +++ b/serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializeCertificatesTest.kt @@ -31,6 +31,11 @@ class DeserializeCertificatesTest : TestBase(KOTLIN) { return replace(System.lineSeparator(), "\n") } + // Remove the lines which have been added since Java 8. + fun String.toJava8Format(): String { + return replace(" params: null\n", "") + } + val factory: CertificateFactory = CertificateFactory.getInstance("X.509") lateinit var certificate: X509Certificate @@ -58,7 +63,7 @@ class DeserializeCertificatesTest : TestBase(KOTLIN) { val showCertPath = classLoader.createTaskFor(taskFactory, ShowCertPath::class.java) val result = showCertPath.apply(sandboxCertPath) ?: fail("Result cannot be null") - assertEquals(ShowCertPath().apply(certPath).toUNIX(), result.toString()) + assertEquals(ShowCertPath().apply(certPath).toUNIX().toJava8Format(), result.toString()) assertThat(result::class.java.name).startsWith("sandbox.") } } @@ -82,7 +87,7 @@ class DeserializeCertificatesTest : TestBase(KOTLIN) { val showCertificate = classLoader.createTaskFor(taskFactory, ShowCertificate::class.java) val result = showCertificate.apply(sandboxCertificate) ?: fail("Result cannot be null") - assertEquals(ShowCertificate().apply(certificate).toUNIX(), result.toString()) + assertEquals(ShowCertificate().apply(certificate).toUNIX().toJava8Format(), result.toString()) assertThat(result::class.java.name).startsWith("sandbox.") } }