Added integration tests timeouts. Downgraded test methods to JUnit 4.

d3ledger · Nov 27, 2018 · 469efa4 · 469efa4
1 parent c4b8022
commit 469efa4
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 44 deletions.
diff --git a/notary-integration-test/src/integration-test/kotlin/integration/BaseIntergrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/BaseIntergrationTest.kt
@@ -0,0 +1,22 @@
+package integration
+
+import org.junit.Rule
+import org.junit.rules.Timeout
+import org.junit.runner.notification.RunListener
+
+/**
+ * Base test class provides default timeout for test methods
+ * Rules only works with JUnit 4 Test methods
+ * There is no built global mechanism in JUnit 5 yet
+ */
+abstract class BaseIntergrationTest : RunListener() {
+
+    @Rule
+    @JvmField
+    var globalTimeout: Timeout = Timeout.seconds(TIMEOUT_VALUE)
+
+    companion object {
+        // 5 minutes
+        private const val TIMEOUT_VALUE = 300L
+    }
+}
diff --git a/...n-test/src/integration-test/kotlin/integration/btc/BtcAddressGenerationIntegrationTest.kt b/...n-test/src/integration-test/kotlin/integration/btc/BtcAddressGenerationIntegrationTest.kt
@@ -1,6 +1,7 @@
 package integration.btc
 
 import generation.btc.BtcAddressGenerationInitialization
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import kotlinx.coroutines.experimental.launch
 import model.IrohaCredential
@@ -10,10 +11,10 @@ import org.bitcoinj.core.Utils
 import org.bitcoinj.params.RegTestParams
 import org.bitcoinj.script.ScriptBuilder
 import org.bitcoinj.wallet.Wallet
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
 import provider.NotaryPeerListProviderImpl
@@ -32,8 +33,9 @@ import java.io.File
 private const val WAIT_PREGEN_INIT_MILLIS = 10_000L
 private const val WAIT_PREGEN_PROCESS_MILLIS = 15_000L
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class BtcAddressGenerationIntegrationTest {
+class BtcAddressGenerationIntegrationTest : BaseIntergrationTest() {
 
     private val integrationHelper = IntegrationHelperUtil()
 

diff --git a/...-integration-test/src/integration-test/kotlin/integration/btc/BtcNotaryIntegrationTest.kt b/...-integration-test/src/integration-test/kotlin/integration/btc/BtcNotaryIntegrationTest.kt
@@ -1,15 +1,16 @@
 package integration.btc
 
 import com.github.kittinunf.result.failure
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import integration.helper.btcAsset
 import model.IrohaCredential
 import notary.btc.BtcNotaryInitialization
 import org.bitcoinj.core.Address
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertTrue
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
 import provider.btc.address.BtcRegisteredAddressesProvider
@@ -23,8 +24,9 @@ import java.math.BigDecimal
 
 private val integrationHelper = IntegrationHelperUtil()
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class BtcNotaryIntegrationTest {
+class BtcNotaryIntegrationTest : BaseIntergrationTest() {
 
     private val notaryConfig = integrationHelper.configHelper.createBtcNotaryConfig()
     private val irohaCredential = IrohaCredential(

diff --git a/...ration-test/src/integration-test/kotlin/integration/btc/BtcRegistrationIntegrationTest.kt b/...ration-test/src/integration-test/kotlin/integration/btc/BtcRegistrationIntegrationTest.kt
@@ -1,14 +1,15 @@
 package integration.btc
 
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import jp.co.soramitsu.iroha.ModelCrypto
 import kotlinx.coroutines.experimental.delay
 import kotlinx.coroutines.experimental.runBlocking
 import model.IrohaCredential
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
 import provider.btc.account.IrohaBtcAccountCreator
@@ -22,8 +23,9 @@ import sidechain.iroha.util.ModelUtil
 import util.getRandomString
 import java.math.BigInteger
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class BtcRegistrationIntegrationTest {
+class BtcRegistrationIntegrationTest : BaseIntergrationTest() {
 
     private val integrationHelper = IntegrationHelperUtil()
 

diff --git a/...egration-test/src/integration-test/kotlin/integration/btc/BtcWithdrawalIntegrationTest.kt b/...egration-test/src/integration-test/kotlin/integration/btc/BtcWithdrawalIntegrationTest.kt
@@ -2,15 +2,20 @@ package integration.btc
 
 import com.github.kittinunf.result.failure
 import helper.address.outPutToBase58Address
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import integration.helper.btcAsset
 import jp.co.soramitsu.iroha.ModelCrypto
 import model.IrohaCredential
 import mu.KLogging
 import org.bitcoinj.core.Address
 import org.bitcoinj.core.TransactionOutput
-import org.junit.jupiter.api.*
+import org.junit.Test
+import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Assertions.fail
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.TestInstance
 import provider.btc.address.BtcRegisteredAddressesProvider
 import provider.btc.network.BtcNetworkConfigProvider
 import provider.btc.network.BtcRegTestConfigProvider
@@ -34,8 +39,9 @@ import kotlin.test.assertFalse
 private const val WITHDRAWAL_WAIT_MILLIS = 15_000L
 private const val TOTAL_TESTS = 9
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class BtcWithdrawalIntegrationTest {
+class BtcWithdrawalIntegrationTest : BaseIntergrationTest() {
     private val integrationHelper = IntegrationHelperUtil()
 
     private val createdTransactions = ConcurrentHashMap<String, TimedTx>()

diff --git a/...ry-integration-test/src/integration-test/kotlin/integration/eth/DepositIntegrationTest.kt b/...ry-integration-test/src/integration-test/kotlin/integration/eth/DepositIntegrationTest.kt
@@ -1,9 +1,10 @@
 package integration.eth
 
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import provider.eth.ETH_PRECISION
 import sidechain.iroha.CLIENT_DOMAIN
@@ -14,8 +15,9 @@ import java.math.BigInteger
 /**
  * Integration tests for deposit case.
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class DepositIntegrationTest {
+class DepositIntegrationTest : BaseIntergrationTest() {
     /** Utility functions for integration tests */
     private val integrationHelper = IntegrationHelperUtil()
 

diff --git a/...tegration-test/src/integration-test/kotlin/integration/eth/DepositMultiIntegrationTest.kt b/...tegration-test/src/integration-test/kotlin/integration/eth/DepositMultiIntegrationTest.kt
@@ -2,10 +2,11 @@ package integration.eth
 
 import config.IrohaCredentialConfig
 import config.loadEthPasswords
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Test
+import org.junit.Test
 import org.junit.jupiter.api.TestInstance
 import provider.eth.ETH_PRECISION
 import sidechain.iroha.CLIENT_DOMAIN
@@ -17,8 +18,9 @@ import java.math.BigInteger
 /**
  * Integration tests with multiple notaries for deposit case.
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class DepositMultiIntegrationTest {
+class DepositMultiIntegrationTest : BaseIntergrationTest() {
     /** Utility functions for integration tests */
     private val integrationHelper = IntegrationHelperUtil()
 

diff --git a/...ntegration-test/src/integration-test/kotlin/integration/eth/ERC20TokenRegistrationTest.kt b/...ntegration-test/src/integration-test/kotlin/integration/eth/ERC20TokenRegistrationTest.kt
@@ -3,10 +3,13 @@ package integration.eth
 import com.github.kittinunf.result.failure
 import com.github.kittinunf.result.map
 import com.google.gson.Gson
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
-import org.junit.jupiter.api.*
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.Test
+import org.junit.jupiter.api.AfterAll
+import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.TestInstance
 import provider.eth.EthTokensProviderImpl
 import sidechain.iroha.consumer.IrohaNetworkImpl
 import token.EthTokenInfo
@@ -17,8 +20,9 @@ import java.io.File
 /**
  * Requires Iroha is running
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class ERC20TokenRegistrationTest {
+class ERC20TokenRegistrationTest : BaseIntergrationTest() {
     private val integrationHelper = IntegrationHelperUtil()
     private val tokensFilePath = "tokens-for-test.json"
     private val tokenRegistrationConfig =

diff --git a/...-integration-test/src/integration-test/kotlin/integration/eth/EthFreeRelayProviderTest.kt b/...-integration-test/src/integration-test/kotlin/integration/eth/EthFreeRelayProviderTest.kt
@@ -2,10 +2,11 @@ package integration.eth
 
 import com.github.kittinunf.result.failure
 import com.github.kittinunf.result.success
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
 import provider.eth.EthFreeRelayProvider
@@ -14,8 +15,9 @@ import sidechain.iroha.consumer.IrohaNetworkImpl
 import sidechain.iroha.util.ModelUtil.setAccountDetail
 import java.io.File
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class EthFreeRelayProviderTest {
+class EthFreeRelayProviderTest : BaseIntergrationTest() {
 
     /** Test configurations */
     val integrationHelper = IntegrationHelperUtil()

diff --git a/...integration-test/src/integration-test/kotlin/integration/eth/EthRelayProviderIrohaTest.kt b/...integration-test/src/integration-test/kotlin/integration/eth/EthRelayProviderIrohaTest.kt
@@ -1,9 +1,10 @@
 package integration.eth
 
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
 import provider.eth.EthRelayProviderIrohaImpl
@@ -12,8 +13,9 @@ import sidechain.iroha.consumer.IrohaNetworkImpl
 /**
  * Requires Iroha is running
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class EthRelayProviderIrohaTest {
+class EthRelayProviderIrohaTest : BaseIntergrationTest() {
     val integrationHelper = IntegrationHelperUtil()
     val testConfig = integrationHelper.configHelper.testConfig
 

diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/EthTokensProviderTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/EthTokensProviderTest.kt
@@ -1,11 +1,12 @@
 package integration.eth
 
 import com.github.kittinunf.result.success
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.junit.jupiter.api.fail
 import provider.eth.ETH_ADDRESS
@@ -17,8 +18,9 @@ import util.getRandomString
 /**
  * Test Iroha Ethereum ERC20 tokens provider
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class EthTokensProviderTest {
+class EthTokensProviderTest : BaseIntergrationTest() {
     private val integrationHelper = IntegrationHelperUtil()
 
     private val ethTokensProvider = integrationHelper.ethTokensProvider

diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/FailedTransactionTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/FailedTransactionTest.kt
@@ -1,8 +1,9 @@
 package integration.eth
 
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.web3j.protocol.exceptions.TransactionException
 import sidechain.iroha.CLIENT_DOMAIN
@@ -11,8 +12,9 @@ import java.math.BigDecimal
 import java.math.BigInteger
 import kotlin.test.assertEquals
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class FailedTransactionTest {
+class FailedTransactionTest : BaseIntergrationTest() {
     val integrationHelper = IntegrationHelperUtil()
 
     init {

diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/VacuumIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/VacuumIntegrationTest.kt
@@ -1,18 +1,20 @@
 package integration.eth
 
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import mu.KLogging
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import java.math.BigInteger
 
 /**
  * Integration tests for vacuum use case
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class VacuumIntegrationTest {
+class VacuumIntegrationTest : BaseIntergrationTest() {
 
     private val integrationHelper = IntegrationHelperUtil()
 

diff --git a/...integration-test/src/integration-test/kotlin/integration/eth/WithdrawalIntegrationTest.kt b/...integration-test/src/integration-test/kotlin/integration/eth/WithdrawalIntegrationTest.kt
@@ -1,14 +1,15 @@
 package integration.eth
 
 import com.squareup.moshi.Moshi
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import notary.endpoint.eth.BigIntegerMoshiAdapter
 import notary.endpoint.eth.EthNotaryResponse
 import notary.endpoint.eth.EthNotaryResponseMoshiAdapter
 import notary.eth.ENDPOINT_ETHEREUM
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import provider.eth.ETH_PRECISION
 import provider.eth.EthRelayProviderIrohaImpl
@@ -24,8 +25,9 @@ import java.math.BigInteger
 /**
  * Class for Ethereum sidechain infrastructure deployment and communication.
  */
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class WithdrawalIntegrationTest {
+class WithdrawalIntegrationTest : BaseIntergrationTest() {
 
     /** Integration tests util */
     private val integrationHelper = IntegrationHelperUtil()

diff --git a/...-test/src/integration-test/kotlin/integration/eth/WithdrawalMultinotaryIntegrationTest.kt b/...-test/src/integration-test/kotlin/integration/eth/WithdrawalMultinotaryIntegrationTest.kt
@@ -3,15 +3,16 @@ package integration.eth
 import com.squareup.moshi.Moshi
 import config.loadConfigs
 import config.loadEthPasswords
+import integration.BaseIntergrationTest
 import integration.helper.IntegrationHelperUtil
 import notary.endpoint.eth.BigIntegerMoshiAdapter
 import notary.endpoint.eth.EthNotaryResponse
 import notary.endpoint.eth.EthNotaryResponseMoshiAdapter
 import notary.eth.ENDPOINT_ETHEREUM
 import notary.eth.EthNotaryConfig
+import org.junit.Test
 import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.web3j.crypto.ECKeyPair
 import provider.eth.ETH_PRECISION
@@ -26,8 +27,9 @@ import util.getRandomString
 import java.math.BigDecimal
 import java.math.BigInteger
 
+
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-class WithdrawalMultinotaryIntegrationTest {
+class WithdrawalMultinotaryIntegrationTest : BaseIntergrationTest() {
     /** Utility functions for integration tests */
     private val integrationHelper = IntegrationHelperUtil()