Actualized tests

Author: Radiokot

app/src/test/java/org/tokend/template/test/BindExternalDepositAccountTest.kt

@@ -1,11 +1,11 @@
 package org.tokend.template.test
 
-import junit.framework.Assert
+import org.junit.Assert
 import org.junit.Test
 import org.tokend.sdk.factory.JsonApiToolsProvider
-import org.tokend.template.features.assets.model.AssetRecord
 import org.tokend.template.di.providers.*
 import org.tokend.template.features.assets.logic.CreateBalanceUseCase
+import org.tokend.template.features.assets.model.AssetRecord
 import org.tokend.template.features.deposit.logic.BindExternalSystemDepositAccountUseCase
 import org.tokend.template.logic.Session
 import org.tokend.template.logic.TxManager
@@ -73,17 +73,20 @@ class BindExternalDepositAccountTest {
 
         useCase.perform().blockingAwait()
 
-        Assert.assertFalse("Account repository must be invalidated after external account binding",
-                repositoryProvider.account().isFresh)
+        var externalAccount = repositoryProvider.account().item
+                ?.getDepositAccount(asset)
+
+        Assert.assertNotNull("Deposit accounts must contain a newly created account of ${asset.externalSystemType} type",
+                externalAccount)
+
+        Thread.sleep(5000)
 
         repositoryProvider.account().updateDeferred().blockingAwait()
 
-        val externalAccounts = repositoryProvider.account().item?.depositAccounts
-        val externalAccount = externalAccounts?.find {
-            it.type == asset.externalSystemType
-        }
+        externalAccount = repositoryProvider.account().item
+                ?.getDepositAccount(asset)
 
-        Assert.assertNotNull("Deposit accounts must contain a newly created account of ${asset.externalSystemType} type",
+        Assert.assertNotNull("Newly created account must be listed in Horizon",
                 externalAccount)
     }
 

app/src/test/java/org/tokend/template/test/PaymentsTest.kt

@@ -5,17 +5,17 @@ import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runners.MethodSorters
 import org.tokend.sdk.factory.JsonApiToolsProvider
-import org.tokend.template.features.assets.model.SimpleAsset
-import org.tokend.template.features.history.model.details.BalanceChangeCause
 import org.tokend.template.di.providers.AccountProviderFactory
 import org.tokend.template.di.providers.ApiProviderFactory
 import org.tokend.template.di.providers.RepositoryProviderImpl
 import org.tokend.template.di.providers.WalletInfoProviderFactory
+import org.tokend.template.features.assets.model.SimpleAsset
+import org.tokend.template.features.fees.logic.FeeManager
+import org.tokend.template.features.history.model.details.BalanceChangeCause
 import org.tokend.template.features.send.amount.logic.PaymentFeeLoader
 import org.tokend.template.features.send.logic.ConfirmPaymentRequestUseCase
 import org.tokend.template.features.send.logic.CreatePaymentRequestUseCase
 import org.tokend.template.features.send.recipient.logic.PaymentRecipientLoader
-import org.tokend.template.features.fees.logic.FeeManager
 import org.tokend.template.logic.Session
 import org.tokend.template.logic.TxManager
 import org.tokend.wallet.Base32Check

app/src/test/java/org/tokend/template/test/VotingTest.kt

@@ -67,6 +67,8 @@ class VotingTest {
         Assert.assertEquals("Poll choice must be updated locally in the repository",
                 choice, repo.itemsList.first().currentChoice)
 
+        Thread.sleep(5000)
+
         repo.updateDeferred().blockingAwait()
 
         Assert.assertEquals("Remote poll choice must be the same as submitted one",
@@ -134,6 +136,8 @@ class VotingTest {
         Assert.assertNull("Poll choice must be updated locally in repository and should be null",
                 repo.itemsList.first().currentChoice)
 
+        Thread.sleep(5000)
+
         repo.updateDeferred().blockingAwait()
 
         Assert.assertNull("Remote poll choice also must be null",

app/src/test/java/org/tokend/template/test/WithdrawTest.kt

@@ -6,15 +6,15 @@ import org.junit.FixMethodOrder
 import org.junit.Test
 import org.junit.runners.MethodSorters
 import org.tokend.sdk.factory.JsonApiToolsProvider
-import org.tokend.template.features.assets.model.SimpleAsset
-import org.tokend.template.features.history.model.details.BalanceChangeCause
 import org.tokend.template.di.providers.AccountProviderFactory
 import org.tokend.template.di.providers.ApiProviderFactory
 import org.tokend.template.di.providers.RepositoryProviderImpl
 import org.tokend.template.di.providers.WalletInfoProviderFactory
+import org.tokend.template.features.assets.model.SimpleAsset
+import org.tokend.template.features.fees.logic.FeeManager
+import org.tokend.template.features.history.model.details.BalanceChangeCause
 import org.tokend.template.features.withdraw.logic.ConfirmWithdrawalRequestUseCase
 import org.tokend.template.features.withdraw.logic.CreateWithdrawalRequestUseCase
-import org.tokend.template.features.fees.logic.FeeManager
 import org.tokend.template.logic.Session
 import org.tokend.template.logic.TxManager
 import org.tokend.wallet.TransactionBuilder