ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 04:57:58 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-2975 Remove version uniqueness check - fix tests

Browse Source
This commit is contained in:
Tudor Malene 2019-05-31 15:51:19 +03:00 committed by Mike Hearn
parent 77ab33d5b0
commit f8d8de7555
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
node/src/test/kotlin/net/corda/node/services/persistence/NodeAttachmentServiceTest.kt
View File

@ -342,15 +342,12 @@ class NodeAttachmentServiceTest {
}
@Test
fun `cannot import jar with duplicated contract class, version and signers for trusted uploader`() {
fun `can import jar with duplicated contract class, version and signers for trusted uploader`() {
SelfCleaningDir().use { file ->
val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract")
val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar")
contractJar.read { storage.privilegedImportAttachment(it, "app", "sample.jar") }
assertThatExceptionOfType(DuplicateContractClassException::class.java).isThrownBy {
anotherContractJar.read { storage.privilegedImportAttachment(it, "app", "another-sample.jar") }
}
anotherContractJar.read { storage.privilegedImportAttachment(it, "app", "another-sample.jar") }
}
}
@ -376,30 +373,23 @@ class NodeAttachmentServiceTest {
}
@Test
fun `cannot promote to trusted uploader if other trusted attachment already has duplicated contract class, version and signers`() {
fun `can promote to trusted uploader if other trusted attachment already has duplicated contract class, version and signers`() {
SelfCleaningDir().use { file ->
val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract")
contractJar.read { storage.importAttachment(it, "uploaderA", "sample.jar") }
val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar")
anotherContractJar.read { storage.privilegedImportAttachment(it, "app", "another-sample.jar") }
assertThatExceptionOfType(DuplicateContractClassException::class.java).isThrownBy {
contractJar.read { storage.privilegedImportAttachment(it, "app", "sample.jar") }
}
contractJar.read { storage.privilegedImportAttachment(it, "app", "sample.jar") }
}
}
@Test
fun `cannot promote to trusted uploder the same jar if other trusted uplodaer `() {
fun `can promote to trusted uploder the same jar if other trusted uplodaer `() {
SelfCleaningDir().use { file ->
val (contractJar, _) = makeTestSignedContractJar(file.path, "com.example.MyContract")
val anotherContractJar = makeTestContractJar(file.path, listOf( "com.example.MyContract", "com.example.AnotherContract"), true, generateManifest = false, jarFileName = "another-sample.jar")
contractJar.read { storage.privilegedImportAttachment(it, "app", "sample.jar") }
assertThatExceptionOfType(DuplicateContractClassException::class.java).isThrownBy {
anotherContractJar.read { storage.privilegedImportAttachment(it, "app", "another-sample.jar") }
}
anotherContractJar.read { storage.privilegedImportAttachment(it, "app", "another-sample.jar") }
}
}