ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-08 11:54:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2876: Fix serialization-djvm module for Java 11. (#5720)

Browse Source
This commit is contained in:
Chris Rankin 2019-11-15 15:37:47 +00:00 committed by Rick Parker
parent f071445221
commit a201a8d52b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
serialization-djvm/src/test/kotlin/net/corda/serialization/djvm/DeserializeCertificatesTest.kt
View File

@ -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.")
}
}