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

CORDA-2128: Removed SerializationEnvironmentRule.run (#4334)

Browse Source 
It exposed the internal SerializationEnvironment class. It previously documented that the SerializationEnvironmentRule JUnit rule should be used instead.
This commit is contained in:
Shams Asari
2018-12-06 15:14:38 +00:00
committed by GitHub
parent e2ea97bae7
commit 92b5900bfa
6 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
testing/test-utils/src/main/kotlin/net/corda/testing/core/SerializationTestHelpers.kt → testing/test-utils/src/main/kotlin/net/corda/testing/core/SerializationEnvironmentRule.kt
View File

@ -4,13 +4,10 @@ import com.nhaarman.mockito_kotlin.any
import com.nhaarman.mockito_kotlin.doAnswer
import com.nhaarman.mockito_kotlin.whenever
import net.corda.core.internal.staticField
import net.corda.core.serialization.SerializationFactory
import net.corda.core.serialization.internal.SerializationEnvironment
import net.corda.core.serialization.internal.effectiveSerializationEnv
import net.corda.testing.common.internal.asContextEnv
import net.corda.testing.internal.createTestSerializationEnv
import net.corda.testing.internal.inVMExecutors
import net.corda.testing.internal.rigorousMock
import net.corda.testing.internal.testThreadFactory
import net.corda.testing.internal.*
import org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnector
import org.junit.rules.TestRule
import org.junit.runner.Description
@ -35,32 +32,16 @@ class SerializationEnvironmentRule(private val inheritable: Boolean = false) : T
}.whenever(it).execute(any())
}
}
/** Do not call, instead use [SerializationEnvironmentRule] as a [org.junit.Rule]. */
fun <T> run(taskLabel: String, task: (SerializationEnvironment) -> T): T {
return SerializationEnvironmentRule().apply { init() }.runTask(task)
}
}
private lateinit var env: SerializationEnvironment
val serializationFactory get() = env.serializationFactory
val serializationFactory: SerializationFactory get() = env.serializationFactory
override fun apply(base: Statement, description: Description): Statement {
init()
return object : Statement() {
override fun evaluate() = runTask { base.evaluate() }
}
}
private fun init() {
env = createTestSerializationEnv()
}
private fun <T> runTask(task: (SerializationEnvironment) -> T): T {
try {
return env.asContextEnv(inheritable, task)
} finally {
inVMExecutors.remove(env)
return object : Statement() {
override fun evaluate() = env.asTestContextEnv(inheritable) { base.evaluate() }
}
}
}

8
testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalSerializationTestHelpers.kt
View File

@ -8,6 +8,7 @@ import net.corda.node.serialization.amqp.AMQPServerSerializationScheme
import net.corda.node.serialization.kryo.KRYO_CHECKPOINT_CONTEXT
import net.corda.node.serialization.kryo.KryoCheckpointSerializer
import net.corda.serialization.internal.*
import net.corda.testing.common.internal.asContextEnv
import net.corda.testing.core.SerializationEnvironmentRule
import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.ExecutorService
@ -44,3 +45,10 @@ fun createTestSerializationEnv(): SerializationEnvironment {
)
}
fun <T> SerializationEnvironment.asTestContextEnv(inheritable: Boolean = false, callable: (SerializationEnvironment) -> T): T {
try {
return asContextEnv(inheritable, callable)
} finally {
inVMExecutors.remove(this)
}
}

6
testing/test-utils/src/main/kotlin/net/corda/testing/internal/InternalTestUtils.kt
View File

@ -198,7 +198,7 @@ fun fakeAttachment(filePath: String, content: String, manifestAttributes: Map<St
}
/** If [effectiveSerializationEnv] is not set, runs the block with a new [SerializationEnvironmentRule]. */
fun <R> withTestSerializationEnvIfNotSet(taskName: String, block: () -> R): R {
fun <R> withTestSerializationEnvIfNotSet(block: () -> R): R {
val serializationExists = try {
effectiveSerializationEnv
true
@ -207,7 +207,7 @@ fun <R> withTestSerializationEnvIfNotSet(taskName: String, block: () -> R): R {
}
return if (serializationExists) {
block()
} else SerializationEnvironmentRule.run(taskName) {
block()
} else {
createTestSerializationEnv().asTestContextEnv { block() }
}
}