Merge pull request #218 from ILIYANGERMANOV/develop

Develop
Ivy-Apps · Dec 6, 2021 · cd9fffb · cd9fffb
2 parents 731e822 + 3c2acf6
commit cd9fffb
Show file tree

Hide file tree

Showing 26 changed files with 764 additions and 84 deletions.
diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/IvyComposeTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/IvyComposeTest.kt
@@ -70,15 +70,19 @@ abstract class IvyComposeTest {
 
     @After
     fun tearDown() {
-        idlingResource?.let {
-            composeTestRule.unregisterIdlingResource(it)
-        }
+        resetTestIdling()
 
         TestingContext.inTest = false
 
         resetApp()
     }
 
+    private fun resetTestIdling() {
+        idlingResource?.let {
+            composeTestRule.unregisterIdlingResource(it)
+        }
+    }
+
     private fun resetApp() {
         clearSharedPrefs()
         resetDatabase()
@@ -105,11 +109,12 @@ abstract class IvyComposeTest {
     protected fun testWithRetry(
         attempt: Int = 0,
         maxAttempts: Int = 3,
+        firstFailure: Throwable? = null,
         test: () -> Unit
     ) {
         try {
             test()
-        } catch (e: AssertionError) {
+        } catch (e: Throwable) {
             if (attempt < maxAttempts) {
                 //reset state && retry test
                 resetApp()
@@ -118,20 +123,19 @@ abstract class IvyComposeTest {
                 TestIdlingResource.reset()
 
                 //Restart IvyActivity
-                val intent = composeTestRule.activity.intent
-                composeTestRule.activity.finish()
-                composeTestRule.activity.startActivity(intent)
+                composeTestRule.activityRule.scenario.recreate()
 
                 composeTestRule.waitMillis(300) //wait for activity to start
 
                 testWithRetry(
                     attempt = attempt + 1,
                     maxAttempts = maxAttempts,
+                    firstFailure = if (attempt == 0) e else firstFailure,
                     test = test
                 )
             } else {
                 //propagate exception
-                throw e
+                throw firstFailure ?: e
             }
         }
     }

diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/helpers/LoansScreen.kt b/app/src/androidTest/java/com/ivy/wallet/compose/helpers/LoansScreen.kt
@@ -20,8 +20,9 @@ class LoansScreen<A : ComponentActivity>(
     fun assertLoan(
         name: String,
         loanType: LoanType,
-        amount: String,
-        amountDecimal: String,
+        amountLeft: String,
+        amountLeftDecimal: String,
+        loanAmount: String,
         amountPaid: String,
         percentPaid: String,
         currency: String = "USD"
@@ -39,8 +40,8 @@ class LoansScreen<A : ComponentActivity>(
         )
             .performScrollTo()
             .assertTextEquals(
-                name, typeText, amount, amountDecimal, currency,
-                "$amountPaid $currency / $amount$amountDecimal $currency ($percentPaid%)"
+                name, typeText, amountLeft, amountLeftDecimal, currency,
+                "$amountPaid $currency / $loanAmount $currency ($percentPaid%)"
             )
     }
 
@@ -73,11 +74,14 @@ class LoansScreen<A : ComponentActivity>(
             clickAdd()
         }
 
+        val loanAmount = amount.split(".").first()
+        val loanAmountDecimal = amount.split(".").getOrNull(1)?.let { ".$it" } ?: ".00"
         assertLoan(
             name = loanName,
-            amount = amount.split(".").first(),
-            amountDecimal = amount.split(".").getOrNull(1)?.let { ".$it" } ?: ".00",
             loanType = loanType,
+            amountLeft = loanAmount,
+            amountLeftDecimal = loanAmountDecimal,
+            loanAmount = loanAmount + loanAmountDecimal,
             currency = "USD",
             amountPaid = "0.00",
             percentPaid = "0.00"

diff --git a/app/src/androidTest/java/com/ivy/wallet/compose/scenario/LoansTest.kt b/app/src/androidTest/java/com/ivy/wallet/compose/scenario/LoansTest.kt
@@ -38,8 +38,9 @@ class LoansTest : IvyComposeTest() {
 
         loansScreen.assertLoan(
             name = "Loan 1",
-            amount = "4,800",
-            amountDecimal = ".32",
+            amountLeft = "4,800",
+            amountLeftDecimal = ".32",
+            loanAmount = "4,800.32",
             loanType = LoanType.BORROW,
             currency = "USD",
             amountPaid = "0.00",
@@ -66,8 +67,9 @@ class LoansTest : IvyComposeTest() {
         }
         loansScreen.assertLoan(
             name = "Razer Blade",
-            amount = "4,800",
-            amountDecimal = ".00",
+            amountLeft = "4,800",
+            amountLeftDecimal = ".00",
+            loanAmount = "4,800.00",
             loanType = LoanType.LEND,
             currency = "USD",
             amountPaid = "0.00",
@@ -111,8 +113,9 @@ class LoansTest : IvyComposeTest() {
         loansScreen.assertLoan(
             name = "Laptop",
             loanType = LoanType.BORROW,
-            amount = "4,000",
-            amountDecimal = ".25",
+            amountLeft = "4,000",
+            amountLeftDecimal = ".25",
+            loanAmount = "4,000.25",
             amountPaid = "0.00",
             percentPaid = "0.00"
         )
@@ -222,8 +225,9 @@ class LoansTest : IvyComposeTest() {
         loansScreen.assertLoan(
             name = "Loan 1",
             loanType = LoanType.BORROW,
-            amount = "1,000",
-            amountDecimal = ".00",
+            amountLeft = "749",
+            amountLeftDecimal = ".50",
+            loanAmount = "1,000.00",
             amountPaid = "250.50",
             percentPaid = "25.05"
         )
@@ -284,8 +288,9 @@ class LoansTest : IvyComposeTest() {
         loansScreen.assertLoan(
             name = "Loan",
             loanType = LoanType.LEND,
-            amount = "10,000",
-            amountDecimal = ".00",
+            amountLeft = "5,000",
+            amountLeftDecimal = ".00",
+            loanAmount = "10,000.00",
             amountPaid = "5,000.00",
             percentPaid = "50.00"
         )
@@ -338,8 +343,9 @@ class LoansTest : IvyComposeTest() {
         loansScreen.assertLoan(
             name = "Loan",
             loanType = LoanType.LEND,
-            amount = "1,250",
-            amountDecimal = ".50",
+            amountLeft = "1,250",
+            amountLeftDecimal = ".50",
+            loanAmount = "1,250.50",
             amountPaid = "0.00",
             percentPaid = "0.00"
         )
@@ -465,9 +471,10 @@ class LoansTest : IvyComposeTest() {
 
         loansScreen.assertLoan(
             name = "Loan",
-            amount = "1,000",
-            amountDecimal = ".00",
+            amountLeft = "-1,000",
+            amountLeftDecimal = ".50",
             amountPaid = "2,000.50",
+            loanAmount = "1,000.00",
             percentPaid = "200.05",
             loanType = LoanType.BORROW
         )

diff --git a/...ava/com/ivy/wallet/base/ComposeTesting.kt → ...com/ivy/wallet/base/TestIdlingResource.kt b/...ava/com/ivy/wallet/base/ComposeTesting.kt → ...com/ivy/wallet/base/TestIdlingResource.kt
@@ -4,10 +4,6 @@ import androidx.compose.ui.test.IdlingResource
 import com.ivy.wallet.BuildConfig
 import java.util.concurrent.atomic.AtomicInteger
 
-object TestingContext {
-    var inTest = false
-}
-
 object TestIdlingResource {
     private val counter = AtomicInteger(0)
 
@@ -34,4 +30,8 @@ object TestIdlingResource {
     fun reset() {
         counter.set(0)
     }
+
+    fun get(): Int {
+        return counter.get()
+    }
 }
diff --git a/app/src/main/java/com/ivy/wallet/base/TestingContext.kt b/app/src/main/java/com/ivy/wallet/base/TestingContext.kt
@@ -0,0 +1,5 @@
+package com.ivy.wallet.base
+
+object TestingContext {
+    var inTest = false
+}
diff --git a/app/src/main/java/com/ivy/wallet/ui/IvyActivity.kt b/app/src/main/java/com/ivy/wallet/ui/IvyActivity.kt
@@ -56,6 +56,7 @@ import com.ivy.wallet.ui.paywall.PaywallScreen
 import com.ivy.wallet.ui.planned.edit.EditPlannedScreen
 import com.ivy.wallet.ui.planned.list.PlannedPaymentsScreen
 import com.ivy.wallet.ui.reports.ReportScreen
+import com.ivy.wallet.ui.search.SearchScreen
 import com.ivy.wallet.ui.settings.SettingsScreen
 import com.ivy.wallet.ui.statistic.level1.PieChartStatisticScreen
 import com.ivy.wallet.ui.statistic.level2.ItemStatisticScreen
@@ -172,6 +173,7 @@ class IvyActivity : AppCompatActivity() {
                             is Screen.Budget -> BudgetScreen(screen = screen)
                             is Screen.Loans -> LoansScreen(screen = screen)
                             is Screen.LoanDetails -> LoanDetailsScreen(screen = screen)
+                            is Screen.Search -> SearchScreen(screen = screen)
                             is Screen.WebView -> WebViewScreen(screen = screen)
                             null -> {
                             }

diff --git a/app/src/main/java/com/ivy/wallet/ui/Screens.kt b/app/src/main/java/com/ivy/wallet/ui/Screens.kt
@@ -70,6 +70,8 @@ sealed class Screen {
 
     object Loans : Screen()
 
+    object Search : Screen()
+
     data class LoanDetails(
         val loanId: UUID
     ) : Screen()