ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-23 06:42:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ENT-10560 JDK 17 Test Cases Fixes (#7598)

Browse Source 
* Updated mockito version and removed ignored annotation to relevant test cases

* Updated mockito version and removed ignored annotation to relevant test cases
This commit is contained in:
Balwant Kothari 2023-12-07 16:16:56 +05:30 committed by GitHub
parent 199e167639
commit 74ca2c6734
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/jackson/src/test/kotlin/net/corda/client/jackson/JacksonSupportTest.kt
View File

@ -48,7 +48,6 @@ import net.corda.coretesting.internal.rigorousMock
import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.Before import org.junit.Before
import org.junit.Ignore
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.jupiter.api.TestFactory import org.junit.jupiter.api.TestFactory
@ -701,7 +700,6 @@ class JacksonSupportTest(@Suppress("unused") private val name: String, factory:
} }
@Test(timeout=300_000) @Test(timeout=300_000)
@Ignore("TODO JDK17: Fixme")
fun `X509Certificate serialization when extendedKeyUsage is null`() { fun `X509Certificate serialization when extendedKeyUsage is null`() {
val cert: X509Certificate = spy(MINI_CORP.identity.certificate) val cert: X509Certificate = spy(MINI_CORP.identity.certificate)
whenever(cert.extendedKeyUsage).thenReturn(null) whenever(cert.extendedKeyUsage).thenReturn(null)

2
constants.properties
View File

@ -69,7 +69,7 @@ junitVersion=4.12
junitVintageVersion=5.5.0-RC1 junitVintageVersion=5.5.0-RC1
junitJupiterVersion=5.5.0-RC1 junitJupiterVersion=5.5.0-RC1
junitPlatformVersion=1.5.0-RC1 junitPlatformVersion=1.5.0-RC1
mockitoVersion=5.3.0 mockitoVersion=5.5.0
mockitoKotlinVersion=4.1.0 mockitoKotlinVersion=4.1.0
hamkrestVersion=1.7.0.0 hamkrestVersion=1.7.0.0
joptSimpleVersion=5.0.2 joptSimpleVersion=5.0.2

2
node/src/test/kotlin/net/corda/node/services/identity/InMemoryIdentityServiceTests.kt
View File

@ -13,7 +13,6 @@ import net.corda.nodeapi.internal.crypto.x509Certificates
import net.corda.testing.core.* import net.corda.testing.core.*
import net.corda.coretesting.internal.DEV_INTERMEDIATE_CA import net.corda.coretesting.internal.DEV_INTERMEDIATE_CA
import net.corda.coretesting.internal.DEV_ROOT_CA import net.corda.coretesting.internal.DEV_ROOT_CA
import org.junit.Ignore
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
@ -23,7 +22,6 @@ import kotlin.test.assertNull
/** /**
* Tests for the in memory identity service. * Tests for the in memory identity service.
*/ */
@Ignore("TODO JDK17: Fixme")
class InMemoryIdentityServiceTests { class InMemoryIdentityServiceTests {
private companion object { private companion object {
val alice = TestIdentity(ALICE_NAME, 70) val alice = TestIdentity(ALICE_NAME, 70)