diff --git a/notary-integration-test/src/integration-test/kotlin/integration/BaseIntergrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/BaseIntergrationTest.kt new file mode 100644 index 000000000..363d7aeb6 --- /dev/null +++ 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/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcAddressGenerationIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcAddressGenerationIntegrationTest.kt index d999998f7..710a81a8e 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcAddressGenerationIntegrationTest.kt +++ b/notary-integration-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/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcNotaryIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcNotaryIntegrationTest.kt index 3a213d437..5a0dd49a7 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcNotaryIntegrationTest.kt +++ b/notary-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/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcRegistrationIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcRegistrationIntegrationTest.kt index 4e0aad64f..64c9a0640 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcRegistrationIntegrationTest.kt +++ b/notary-integration-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/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcWithdrawalIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcWithdrawalIntegrationTest.kt index d6a8ef326..1bc1f7972 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcWithdrawalIntegrationTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/btc/BtcWithdrawalIntegrationTest.kt @@ -2,6 +2,7 @@ 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 @@ -9,8 +10,12 @@ 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() diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/DepositIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/DepositIntegrationTest.kt index b66a6f857..144d57094 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/DepositIntegrationTest.kt +++ b/notary-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/notary-integration-test/src/integration-test/kotlin/integration/eth/DepositMultiIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/DepositMultiIntegrationTest.kt index 5c4e3f02c..849aa69ac 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/DepositMultiIntegrationTest.kt +++ b/notary-integration-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/notary-integration-test/src/integration-test/kotlin/integration/eth/ERC20TokenRegistrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/ERC20TokenRegistrationTest.kt index a29fe9284..3f8f8c63b 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/ERC20TokenRegistrationTest.kt +++ b/notary-integration-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/notary-integration-test/src/integration-test/kotlin/integration/eth/EthFreeRelayProviderTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/EthFreeRelayProviderTest.kt index 519b9ee42..ff80c048c 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/EthFreeRelayProviderTest.kt +++ b/notary-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/notary-integration-test/src/integration-test/kotlin/integration/eth/EthRelayProviderIrohaTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/EthRelayProviderIrohaTest.kt index 40468044d..54bc75a3b 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/EthRelayProviderIrohaTest.kt +++ b/notary-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 index 163c7f4e3..c1ac1acee 100644 --- 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 index 5636654da..99572da14 100644 --- 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 index 8532da7d2..4aa7b8e4f 100644 --- 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/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalIntegrationTest.kt index 7ba125a74..fb045afdb 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalIntegrationTest.kt +++ b/notary-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/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalMultinotaryIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalMultinotaryIntegrationTest.kt index a51e2ccf7..0c44664c8 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalMultinotaryIntegrationTest.kt +++ b/notary-integration-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() diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalPipelineIntegrationTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalPipelineIntegrationTest.kt index 39449e5bb..9066fae1f 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalPipelineIntegrationTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/eth/WithdrawalPipelineIntegrationTest.kt @@ -1,11 +1,16 @@ package integration.eth +import integration.BaseIntergrationTest import integration.helper.IntegrationHelperUtil import jp.co.soramitsu.iroha.Keypair import jp.co.soramitsu.iroha.ModelCrypto import kotlinx.coroutines.experimental.Job import kotlinx.coroutines.experimental.launch -import org.junit.jupiter.api.* +import org.junit.Test +import org.junit.jupiter.api.AfterAll +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.BeforeEach +import org.junit.jupiter.api.TestInstance import provider.eth.ETH_PRECISION import sidechain.iroha.CLIENT_DOMAIN import util.getRandomString @@ -16,8 +21,9 @@ import kotlin.test.assertEquals /** * Integration tests for withdrawal service. */ + @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class WithdrawalPipelineIntegrationTest { +class WithdrawalPipelineIntegrationTest : BaseIntergrationTest() { /** Integration tests util */ private val integrationHelper = IntegrationHelperUtil() diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/MasterTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/MasterTest.kt index f9a5d3bfe..a11dbee64 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/MasterTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/MasterTest.kt @@ -2,17 +2,19 @@ package integration.eth.contracts import contract.BasicCoin import contract.Master +import integration.BaseIntergrationTest import integration.helper.ContractTestHelper +import org.junit.Test import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test import org.web3j.crypto.ECKeyPair import org.web3j.crypto.Keys import org.web3j.protocol.exceptions.TransactionException import sidechain.eth.util.hashToWithdraw import java.math.BigInteger -class MasterTest { + +class MasterTest : BaseIntergrationTest() { private lateinit var cth: ContractTestHelper private lateinit var master: Master private lateinit var token: BasicCoin diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayRegistryTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayRegistryTest.kt index 68b6b7ce0..bb06e31bf 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayRegistryTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayRegistryTest.kt @@ -1,16 +1,18 @@ package integration.eth.contracts import contract.RelayRegistry +import integration.BaseIntergrationTest import integration.helper.ContractTestHelper +import org.junit.Test import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test import org.web3j.crypto.ECKeyPair import org.web3j.crypto.Keys import org.web3j.protocol.exceptions.TransactionException -class RelayRegistryTest { + +class RelayRegistryTest : BaseIntergrationTest() { private lateinit var cth: ContractTestHelper private lateinit var relayRegistry: RelayRegistry private lateinit var accGreen: String diff --git a/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayTest.kt index e23371d12..0db07e36a 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/eth/contracts/RelayTest.kt @@ -3,14 +3,16 @@ package integration.eth.contracts import contract.BasicCoin import contract.Master import contract.Relay +import integration.BaseIntergrationTest import integration.helper.ContractTestHelper +import org.junit.Test import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach -import org.junit.jupiter.api.Test import org.web3j.protocol.exceptions.TransactionException import java.math.BigInteger -class RelayTest { + +class RelayTest : BaseIntergrationTest() { private lateinit var cth: ContractTestHelper private lateinit var master: Master private lateinit var token: BasicCoin diff --git a/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBatchTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBatchTest.kt index da8754614..b69c8178f 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBatchTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBatchTest.kt @@ -1,6 +1,7 @@ package integration.iroha import config.loadConfigs +import integration.BaseIntergrationTest import integration.helper.IntegrationHelperUtil import jp.co.soramitsu.iroha.Blob import jp.co.soramitsu.iroha.ModelCrypto @@ -12,8 +13,8 @@ import notary.IrohaCommand import notary.IrohaOrderedBatch import notary.IrohaTransaction import notary.eth.EthNotaryConfig +import org.junit.Test import org.junit.jupiter.api.AfterAll -import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import sidechain.iroha.CLIENT_DOMAIN import sidechain.iroha.IrohaChainListener @@ -28,8 +29,9 @@ import util.getRandomString import java.util.concurrent.TimeUnit import kotlin.test.assertEquals + @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class IrohaBatchTest { +class IrohaBatchTest : BaseIntergrationTest() { init { System.loadLibrary("irohajava") diff --git a/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBlockStreamingTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBlockStreamingTest.kt index ab7052f11..45253bc32 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBlockStreamingTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/iroha/IrohaBlockStreamingTest.kt @@ -2,16 +2,17 @@ package integration.iroha import com.github.kittinunf.result.map import config.loadConfigs +import integration.BaseIntergrationTest import integration.TestConfig import integration.helper.IntegrationHelperUtil import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.experimental.async import kotlinx.coroutines.experimental.delay import kotlinx.coroutines.experimental.runBlocking +import org.junit.Test import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeAll -import org.junit.jupiter.api.Test import org.junit.jupiter.api.TestInstance import sidechain.iroha.IrohaChainListener import sidechain.iroha.consumer.IrohaConsumerImpl @@ -24,7 +25,7 @@ import java.util.concurrent.TimeUnit * Note: Requires Iroha is running. */ @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class IrohaBlockStreamingTest { +class IrohaBlockStreamingTest : BaseIntergrationTest() { /** Test configurations */ private val testConfig = loadConfigs("test", TestConfig::class.java, "/test.properties") diff --git a/notary-integration-test/src/integration-test/kotlin/integration/iroha/RequestHelperTest.kt b/notary-integration-test/src/integration-test/kotlin/integration/iroha/RequestHelperTest.kt index 5dc521951..bc742099c 100644 --- a/notary-integration-test/src/integration-test/kotlin/integration/iroha/RequestHelperTest.kt +++ b/notary-integration-test/src/integration-test/kotlin/integration/iroha/RequestHelperTest.kt @@ -1,8 +1,9 @@ package integration.iroha +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 sidechain.iroha.consumer.IrohaNetworkImpl import sidechain.iroha.util.getAccountAsset @@ -13,8 +14,9 @@ import kotlin.test.assertEquals * * Note: Requires Iroha running. */ + @TestInstance(TestInstance.Lifecycle.PER_CLASS) -class RequestHelperTest { +class RequestHelperTest : BaseIntergrationTest() { init { System.loadLibrary("irohajava")