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

Replacing uses of assert with require

Browse Source
This commit is contained in:
Shams Asari 2018-06-06 09:56:04 +01:00
parent 11fd70a1f7
commit f34a2bd33f
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/smoke-test/kotlin/net/corda/core/PluginRegistrationTest.kt
View File

@ -60,12 +60,12 @@ class PluginRegistrationTest {
val classpath = outputLines.filter { it.contains(" classpath:") }.last()
// If DummyJdbcDriver has been registered it should have printed a message
assert(outputLines.count { it.contains("[DummyJDBCDriver] hello") } > 0) {
require(outputLines.count { it.contains("[DummyJDBCDriver] hello") } > 0) {
"Cannot find registration message from installed jdbc driver"
}
// Check the printed classpath contains 'nodeJarDir'
assert(classpath.contains(jarDir)) {
require(classpath.contains(jarDir)) {
"Expected to find $jarDir in printed classpath"
}
}

4
experimental/ha-testing/src/main/kotlin/net/corda/haTesting/CashScenarioRunner.kt
View File

@ -59,7 +59,7 @@ class CashScenarioRunner(options: OptionSet) : AbstractScenarioRunner(options),
}
// Verify
assert(allPayments.size == (iterCount * 2)) { "Expected number of payments is ${iterCount * 2}, actual number of payments: ${allPayments.size}" }
require(allPayments.size == (iterCount * 2)) { "Expected number of payments is ${iterCount * 2}, actual number of payments: ${allPayments.size}" }
val criteria = QueryCriteria.VaultQueryCriteria(status = Vault.StateStatus.ALL)
// TODO: Potentially implement paging validation logic for bigger data sets.
val pageSpecification = PageSpecification(pageNumber = 1, pageSize = Int.MAX_VALUE)
@ -83,7 +83,7 @@ class CashScenarioRunner(options: OptionSet) : AbstractScenarioRunner(options),
val allStatesForParty = hashesByParty[recipient] ?: throw IllegalArgumentException("Cannot find states for party: $recipient in transaction: $transactionId")
// Recipient definitely should have hash of a transaction in its states.
assert(transactionId in allStatesForParty) { "States for party: $recipient should contain reference: $transactionId" }
require(transactionId in allStatesForParty) { "States for party: $recipient should contain reference: $transactionId" }
}
return true

2
experimental/ha-testing/src/main/kotlin/net/corda/haTesting/LinearStateScenarioRunner.kt
View File

@ -31,7 +31,7 @@ class LinearStateScenarioRunner(options: OptionSet) : AbstractScenarioRunner(opt
}
// Verify
assert(results.size == iterCount) { "Expected number of results is $iterCount, actual number of payments: ${results.size}" }
require(results.size == iterCount) { "Expected number of results is $iterCount, actual number of payments: ${results.size}" }
val criteria = QueryCriteria.VaultQueryCriteria(status = Vault.StateStatus.ALL)
// TODO: Potentially implement paging validation logic for bigger data sets.
val pageSpecification = PageSpecification(pageNumber = 1, pageSize = Int.MAX_VALUE)

28
node-api/src/test/kotlin/net/corda/nodeapi/internal/zookeeper/ZkClientTest.kt
View File

@ -69,7 +69,7 @@ class ZkClientTests {
}
leaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(client.isLeader())
require(client.isLeader())
client.close()
}
@ -86,7 +86,7 @@ class ZkClientTests {
}
leaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(client.isLeader())
require(client.isLeader())
client.relinquishLeadership()
leaderLoss.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assertFalse(client.isLeader())
@ -117,7 +117,7 @@ class ZkClientTests {
}
aliceLeaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(alice.isLeader())
require(alice.isLeader())
if (bobLeaderGain.count == 0L) //wait to lose leadership if leader at some point
bobLeaderLoss.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assertFalse(bob.isLeader())
@ -152,7 +152,7 @@ class ZkClientTests {
}
aliceLeaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(alice.isLeader())
require(alice.isLeader())
if (bobLeaderGain.count == 0L) //wait to lose leadership if leader at some point
bobLeaderLoss.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assertFalse(bob.isLeader())
@ -167,7 +167,7 @@ class ZkClientTests {
bobLeaderGain2.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS) // wait for bob to become leader
assertFalse(alice.isLeader())
assert(bob.isLeader())
require(bob.isLeader())
assertFalse(chip.isLeader())
val chipLeaderGain2 = CountDownLatch(1)
@ -178,7 +178,7 @@ class ZkClientTests {
assertFalse(alice.isLeader())
assertFalse(bob.isLeader())
assert(chip.isLeader())
require(chip.isLeader())
listOf(alice, bob, chip).forEach { client -> client.close() }
}
@ -199,7 +199,7 @@ class ZkClientTests {
chip.requestLeadership()
chipLeaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(chip.isLeader())
require(chip.isLeader())
bob.start()
bob.addLeadershipListener(SyncHelperListener(bob.nodeId, bobLeaderGain, bobLeaderLoss))
@ -207,7 +207,7 @@ class ZkClientTests {
chipLeaderLoss.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
bobLeaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(bob.isLeader())
require(bob.isLeader())
assertFalse(chip.isLeader())
alice.start()
@ -217,7 +217,7 @@ class ZkClientTests {
bobLeaderLoss.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
aliceLeaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(alice.isLeader())
require(alice.isLeader())
assertFalse(bob.isLeader())
assertFalse(chip.isLeader())
@ -249,14 +249,14 @@ class ZkClientTests {
aliceLeaderGain.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
if (chipLeaderGain.count == 0L) //wait to lose leadership if leader at some point
chipLeaderLoss.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assert(alice.isLeader())
require(alice.isLeader())
assertFalse(chip.isLeader())
bob.start()
bob.addLeadershipListener(SyncHelperListener(bob.nodeId, bobLeaderGain))
bob.requestLeadership()
assert(alice.isLeader())
require(alice.isLeader())
assertFalse(bob.isLeader())
assertFalse(chip.isLeader())
@ -270,7 +270,7 @@ class ZkClientTests {
chipLeaderLoss2.await(ELECTION_TIMEOUT, TimeUnit.MILLISECONDS)
assertFalse(alice.isLeader())
assert(bob.isLeader())
require(bob.isLeader())
assertFalse(chip.isLeader())
listOf(alice, bob, chip).forEach { client -> client.close() }
@ -318,8 +318,8 @@ class ZkClientTests {
}
}
assert(leaderCount <= 1)
assert(leaderBuffer.size <= 1)
require(leaderCount <= 1)
require(leaderBuffer.size <= 1)
if (leaderBuffer.size == 1) {
println(leaderBuffer)
assertEquals(leaderBuffer.first(), leaderId)

4
node/src/integration-test/kotlin/net/corda/node/services/MySQLNotaryServiceTests.kt
View File

@ -194,7 +194,7 @@ class MySQLNotaryServiceTests : IntegrationTest() {
val transactionCount = 100
val results = notaryNode.services.startFlow(RequestGenerationFlow(notaryService, transactionCount)).resultFuture.get()
assertEquals(transactionCount, results.size)
assert(results.all { it === Result.Success })
require(results.all { it === Result.Success })
}
@Test
@ -203,7 +203,7 @@ class MySQLNotaryServiceTests : IntegrationTest() {
val transactionCount = 10
val results = notaryNode.services.startFlow(RequestGenerationFlow(notaryService, transactionCount, 50)).resultFuture.get()
assertEquals(transactionCount, results.size)
assert(results.all { it === Result.Success })
require(results.all { it === Result.Success })
}
private class RequestGenerationFlow(

2
node/src/test/kotlin/net/corda/node/internal/EnterpriseNodeTest.kt
View File

@ -34,6 +34,6 @@ class EnterpriseNodeTest {
val expectedPattern = if (custom == null) "${expectedName}_London_GB_\\d+_\\d+_\\d+_\\d+" else expectedName
val createdName = EnterpriseNode.getGraphitePrefix(nodeConfig)
assert(Regex(expectedPattern).matches(createdName), { "${createdName} did not match ${expectedPattern}" })
require(Regex(expectedPattern).matches(createdName), { "${createdName} did not match ${expectedPattern}" })
}
}