From fb624a2b06bceff0b0ac6996ddec8feb8a7794bc Mon Sep 17 00:00:00 2001 From: Adel El-Beik <48713346+adelel1@users.noreply.github.com> Date: Wed, 26 Jan 2022 11:33:23 +0000 Subject: [PATCH] CORDA-4189: Now compare against Corda Community Edition as well. (#7046) * CORDA-4189: Now compare against Corda Community Edition as well. * CORDA-4189: Removed unused imports. --- node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt index 2fb9e35196..64c275193e 100644 --- a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt @@ -13,6 +13,7 @@ import kotlin.test.assertTrue class NodeRPCTests { private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(\\.\\d+)?(-\\w+)?".toRegex() private val CORDA_VENDOR = "Corda Open Source" + private val CORDA_VENDOR_CE = "Corda Community Edition" private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP) private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp") private val CLASSIFIER = if (SystemUtils.IS_JAVA_11) "-jdk11" else "" @@ -30,6 +31,7 @@ class NodeRPCTests { assertTrue(nodeDiagnosticInfo.version.matches(CORDA_VERSION_REGEX)) assertEquals(PLATFORM_VERSION, nodeDiagnosticInfo.platformVersion) assertEquals(CORDA_VENDOR, nodeDiagnosticInfo.vendor) + assertTrue(nodeDiagnosticInfo.vendor == CORDA_VENDOR || nodeDiagnosticInfo.vendor == CORDA_VENDOR_CE) nodeDiagnosticInfo.cordapps.forEach { println("${it.shortName} ${it.type}") } assertEquals(CORDAPPS.size, nodeDiagnosticInfo.cordapps.size) assertEquals(CORDAPP_TYPES, nodeDiagnosticInfo.cordapps.map { it.type }.toSet())