From dfa3c679197a3da93ff2dda4d7df2f0a628a4131 Mon Sep 17 00:00:00 2001 From: Shams Asari Date: Thu, 11 Jul 2019 13:36:00 +0100 Subject: [PATCH] Removing reference to Enterprise in test (#5293) --- .../integration-test/kotlin/net/corda/node/NodeRPCTests.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 d28ca8d023..cd37decf27 100644 --- a/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt +++ b/node/src/integration-test/kotlin/net/corda/node/NodeRPCTests.kt @@ -11,7 +11,7 @@ import kotlin.test.assertTrue class NodeRPCTests { private val CORDA_VERSION_REGEX = "\\d+(\\.\\d+)?(-\\w+)?".toRegex() // e.g. "5.0-SNAPSHOT" - private val CORDA_VENDOR_REGEX = "Corda (Open Source|Enterprise Edition)".toRegex() + private val CORDA_VENDOR = "Corda Open Source" private val CORDAPPS = listOf(FINANCE_CONTRACTS_CORDAPP, FINANCE_WORKFLOWS_CORDAPP) private val CORDAPP_TYPES = setOf("Contract CorDapp", "Workflow CorDapp") private val CORDAPP_CONTRACTS_NAME_REGEX = "corda-finance-contracts-$CORDA_VERSION_REGEX".toRegex() @@ -28,7 +28,8 @@ class NodeRPCTests { assertTrue(nodeDiagnosticInfo.version.matches(CORDA_VERSION_REGEX)) assertTrue(nodeDiagnosticInfo.revision.matches(HEXADECIMAL_REGEX)) assertEquals(PLATFORM_VERSION, nodeDiagnosticInfo.platformVersion) - assertTrue(nodeDiagnosticInfo.vendor.matches(CORDA_VENDOR_REGEX)) + assertEquals(CORDA_VENDOR, nodeDiagnosticInfo.vendor) + nodeDiagnosticInfo.cordapps.forEach { println("${it.shortName} ${it.type}") } assertEquals(CORDAPPS.size, nodeDiagnosticInfo.cordapps.size) assertEquals(CORDAPP_TYPES, nodeDiagnosticInfo.cordapps.map { it.type }.toSet()) assertTrue(nodeDiagnosticInfo.cordapps.any { it.name.matches(CORDAPP_CONTRACTS_NAME_REGEX) })