From 03d8009c7dc44aa59f192c89962730cc784fa95b Mon Sep 17 00:00:00 2001 From: stefano Date: Tue, 5 Nov 2019 17:53:51 +0000 Subject: [PATCH] fix temp folder rules --- .../node/services/DeterministicContractCryptoTest.kt | 5 ++--- .../node/services/NonDeterministicContractVerifyTest.kt | 8 +++++--- .../net/corda/node/services/SandboxAttachmentsTest.kt | 5 ++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt index 88098a3ce0..ff475b90f6 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/DeterministicContractCryptoTest.kt @@ -18,7 +18,6 @@ import net.corda.testing.node.NotarySpec import net.corda.testing.node.internal.CustomCordapp import net.corda.testing.node.internal.cordappWithPackages import org.junit.ClassRule -import org.junit.Rule import org.junit.Test import org.junit.jupiter.api.assertDoesNotThrow import org.junit.rules.TemporaryFolder @@ -33,7 +32,7 @@ class DeterministicContractCryptoTest { @JvmField val djvmSources = DeterministicSourcesRule() - @Rule + @ClassRule @JvmField val tempFolder = TemporaryFolder() @@ -48,7 +47,7 @@ class DeterministicContractCryptoTest { CustomCordapp( packages = setOf("net.corda.contracts.djvm.crypto"), name = "deterministic-crypto-contract", - signingInfo = CustomCordapp.SigningInfo(path, 10, "RSA") + signingInfo = CustomCordapp.SigningInfo(path, 1, "RSA") ) ), djvmBootstrapSource = djvmSources.bootstrap, diff --git a/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt index 0e8b6ea725..6ac03e980e 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/NonDeterministicContractVerifyTest.kt @@ -22,13 +22,15 @@ import net.corda.testing.node.internal.CustomCordapp import net.corda.testing.node.internal.cordappWithPackages import org.assertj.core.api.AssertionsForInterfaceTypes.assertThat import org.junit.ClassRule -import org.junit.Rule import org.junit.Test import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.assertThrows import org.junit.rules.TemporaryFolder class NonDeterministicContractVerifyTest { + + + companion object { val logger = loggerFor() @@ -36,7 +38,7 @@ class NonDeterministicContractVerifyTest { @JvmField val djvmSources = DeterministicSourcesRule() - @Rule + @ClassRule @JvmField val tempFolder = TemporaryFolder() @@ -51,7 +53,7 @@ class NonDeterministicContractVerifyTest { CustomCordapp( packages = setOf("net.corda.contracts.djvm.broken"), name = "nondeterministic-contract", - signingInfo = CustomCordapp.SigningInfo(path, 10, "RSA") + signingInfo = CustomCordapp.SigningInfo(path, 1, "RSA") ) ), djvmBootstrapSource = djvmSources.bootstrap, diff --git a/node/src/integration-test/kotlin/net/corda/node/services/SandboxAttachmentsTest.kt b/node/src/integration-test/kotlin/net/corda/node/services/SandboxAttachmentsTest.kt index 3149878279..926a348e98 100644 --- a/node/src/integration-test/kotlin/net/corda/node/services/SandboxAttachmentsTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/services/SandboxAttachmentsTest.kt @@ -19,7 +19,6 @@ import net.corda.testing.node.internal.CustomCordapp import net.corda.testing.node.internal.cordappWithPackages import org.assertj.core.api.Assertions.assertThat import org.junit.ClassRule -import org.junit.Rule import org.junit.Test import org.junit.jupiter.api.assertDoesNotThrow import org.junit.jupiter.api.assertThrows @@ -33,7 +32,7 @@ class SandboxAttachmentsTest { @JvmField val djvmSources = DeterministicSourcesRule() - @Rule + @ClassRule @JvmField val tempFolder = TemporaryFolder() @@ -48,7 +47,7 @@ class SandboxAttachmentsTest { CustomCordapp( packages = setOf("net.corda.contracts.djvm.attachment"), name = "sandbox-attachment-contract", - signingInfo = CustomCordapp.SigningInfo(path, 10, "RSA") + signingInfo = CustomCordapp.SigningInfo(path, 1, "RSA") ) ), djvmBootstrapSource = djvmSources.bootstrap,