Reorganize UI tests

app/src/androidTest/java/com/ivy/wallet/compose/IvyComposeTest.kt

@@ -19,7 +19,7 @@ import androidx.work.testing.WorkManagerTestInitHelper
 import com.ivy.frp.test.TestIdlingResource
 import com.ivy.frp.test.TestingContext
 import com.ivy.frp.view.navigation.Navigation
-import com.ivy.wallet.compose.helpers.OnboardingFlow
+import com.ivy.wallet.compose.component.OnboardingFlow
 import com.ivy.wallet.io.network.IvySession
 import com.ivy.wallet.io.persistence.IvyRoomDatabase
 import com.ivy.wallet.io.persistence.SharedPrefs

app/src/androidTest/java/com/ivy/wallet/compose/helpers/DeleteConfirmationModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/DeleteConfirmationModal.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component
 
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick

app/src/androidTest/java/com/ivy/wallet/compose/helpers/DonateScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/DonateScreen.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/ItemStatisticScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/ItemStatisticScreen.kt

@@ -1,13 +1,6 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component
 
-import androidx.activity.ComponentActivity
 import androidx.compose.ui.test.*
-import androidx.compose.ui.test.junit4.AndroidComposeTestRule
-import androidx.test.ext.junit.rules.ActivityScenarioRule
-import androidx.compose.ui.test.assertTextEquals
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.test.onNodeWithText
-import androidx.compose.ui.test.performClick
 import com.ivy.wallet.compose.IvyComposeTestRule
 
 open class ItemStatisticScreen(

app/src/androidTest/java/com/ivy/wallet/compose/helpers/OnboardingFlow.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/OnboardingFlow.kt

@@ -1,10 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component
 
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import com.ivy.wallet.compose.IvyComposeTestRule
 import com.ivy.wallet.compose.clickWithRetry
+import com.ivy.wallet.compose.component.home.HomeTab
 
 class OnboardingFlow(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/PieChartScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/PieChartScreen.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/ReorderModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/ReorderModal.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/AccountModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/account/AccountModal.kt

@@ -1,8 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.account
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.amountinput.AmountInput
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
+import com.ivy.wallet.compose.component.picker.*
 
 class AccountModal(
     private val composeTestRule: IvyComposeTestRule
@@ -56,7 +59,7 @@ class AccountModal(
     }
 
     override fun chooseIcon(icon: String): AccountModal {
-        ChooseIconFlow(composeTestRule).chooseIcon(icon)
+        IvyIconPicker(composeTestRule).chooseIcon(icon)
         return this
     }
 

app/src/androidTest/java/com/ivy/wallet/compose/helpers/AccountsTab.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/account/AccountsTab.kt

@@ -1,8 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.account
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.ItemStatisticScreen
+import com.ivy.wallet.compose.component.ReorderModal
+import com.ivy.wallet.compose.component.home.MainBottomBar
 import com.ivy.wallet.compose.hideKeyboard
 import com.ivy.wallet.compose.printTree
 import com.ivy.wallet.ui.theme.Ivy

app/src/androidTest/java/com/ivy/wallet/compose/helpers/CalculatorAmountInput.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/amountinput/CalculatorAmountInput.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.amountinput
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick

app/src/androidTest/java/com/ivy/wallet/compose/helpers/IvyAmountInput.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/amountinput/IvyAmountInput.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.amountinput
 
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText

app/src/androidTest/java/com/ivy/wallet/compose/helpers/BudgetModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/budget/BudgetModal.kt

@@ -1,7 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.budget
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DeleteConfirmationModal
+import com.ivy.wallet.compose.component.DeleteItem
+import com.ivy.wallet.compose.component.amountinput.AmountInput
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
 
 class BudgetModal(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/BudgetsScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/budget/BudgetsScreen.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.budget
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/CategoriesScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/category/CategoriesScreen.kt

@@ -1,8 +1,10 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.category
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.ItemStatisticScreen
+import com.ivy.wallet.compose.component.ReorderModal
 
 class CategoriesScreen(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/CategoryModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/category/CategoryModal.kt

@@ -1,11 +1,15 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.category
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextReplacement
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.picker.ColorPicker
+import com.ivy.wallet.compose.component.picker.IconPicker
+import com.ivy.wallet.compose.component.picker.IvyColorPicker
+import com.ivy.wallet.compose.component.picker.IvyIconPicker
 
 class CategoryModal(
     private val composeTestRule: IvyComposeTestRule
@@ -38,7 +42,7 @@ class CategoryModal(
     }
 
     override fun chooseIcon(icon: String): CategoryModal {
-        ChooseIconFlow(composeTestRule).chooseIcon(icon)
+        IvyIconPicker(composeTestRule).chooseIcon(icon)
         return this
     }
 }

app/src/androidTest/java/com/ivy/wallet/compose/helpers/ChooseCategoryModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/ChooseCategoryModal.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText

app/src/androidTest/java/com/ivy/wallet/compose/helpers/EditPlannedScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/EditPlannedScreen.kt

@@ -1,7 +1,9 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DeleteConfirmationModal
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
 import com.ivy.wallet.domain.data.IntervalType
 import com.ivy.wallet.domain.data.TransactionType
 import java.time.LocalDateTime

app/src/androidTest/java/com/ivy/wallet/compose/helpers/IncomeExpenseScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/IncomeExpenseScreen.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick

app/src/androidTest/java/com/ivy/wallet/compose/helpers/PlannedPaymentsScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/PlannedPaymentsScreen.kt

@@ -1,7 +1,8 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.home.HomeMoreMenu
 
 class PlannedPaymentsScreen(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/TransactionAmountInput.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/TransactionAmountInput.kt

@@ -1,9 +1,10 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.performClick
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
 
 open class TransactionAmountInput(
     composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/TransactionScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/TransactionScreen.kt

@@ -1,7 +1,9 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DeleteConfirmationModal
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
 import com.ivy.wallet.compose.hideKeyboard
 
 open class TransactionScreen(

app/src/androidTest/java/com/ivy/wallet/compose/helpers/TransferScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/edittrn/TransferScreen.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.edittrn
 
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText

app/src/androidTest/java/com/ivy/wallet/compose/helpers/AddFABMenu.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/home/AddFABMenu.kt

@@ -1,9 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.home
 
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.onNodeWithText
 import com.ivy.wallet.compose.IvyComposeTestRule
 import com.ivy.wallet.compose.clickWithRetry
+import com.ivy.wallet.compose.component.edittrn.EditPlannedScreen
+import com.ivy.wallet.compose.component.edittrn.TransactionScreen
 import com.ivy.wallet.compose.performClickWithRetry
 
 class AddFABMenu(

app/src/androidTest/java/com/ivy/wallet/compose/helpers/HomeMoreMenu.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/home/HomeMoreMenu.kt

@@ -1,7 +1,13 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.home
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DonateScreen
+import com.ivy.wallet.compose.component.budget.BudgetsScreen
+import com.ivy.wallet.compose.component.category.CategoriesScreen
+import com.ivy.wallet.compose.component.edittrn.PlannedPaymentsScreen
+import com.ivy.wallet.compose.component.loan.LoansScreen
+import com.ivy.wallet.compose.component.settings.SettingsScreen
 import com.ivy.wallet.compose.printTree
 
 class HomeMoreMenu(

app/src/androidTest/java/com/ivy/wallet/compose/helpers/HomeTab.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/home/HomeTab.kt

@@ -1,7 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.home
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.PieChartScreen
+import com.ivy.wallet.compose.component.edittrn.ChooseCategoryModal
+import com.ivy.wallet.compose.component.edittrn.TransactionScreen
+import com.ivy.wallet.compose.component.edittrn.TransferScreen
 import com.ivy.wallet.compose.printTree
 import com.ivy.wallet.utils.format
 

app/src/androidTest/java/com/ivy/wallet/compose/helpers/MainBottomBar.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/home/MainBottomBar.kt

@@ -1,8 +1,9 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.home
 
 import androidx.compose.ui.test.hasTestTag
 import com.ivy.wallet.compose.IvyComposeTestRule
 import com.ivy.wallet.compose.clickWithRetry
+import com.ivy.wallet.compose.component.account.AccountsTab
 
 abstract class MainBottomBar<AddFabNext>(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/SavingsGoalModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/home/SavingsGoalModal.kt

@@ -1,9 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.home
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.amountinput.AmountInput
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
 
 class SavingsGoalModal(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/LoanDetailsScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/loan/LoanDetailsScreen.kt

@@ -1,7 +1,9 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.loan
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DeleteConfirmationModal
+import com.ivy.wallet.compose.component.DeleteItem
 import com.ivy.wallet.compose.printTree
 
 class LoanDetailsScreen(

app/src/androidTest/java/com/ivy/wallet/compose/helpers/LoanModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/loan/LoanModal.kt

@@ -1,8 +1,14 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.loan
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.amountinput.AmountInput
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
+import com.ivy.wallet.compose.component.picker.ColorPicker
+import com.ivy.wallet.compose.component.picker.IconPicker
+import com.ivy.wallet.compose.component.picker.IvyColorPicker
+import com.ivy.wallet.compose.component.picker.IvyIconPicker
 import com.ivy.wallet.domain.data.LoanType
 
 class LoanModal(
@@ -52,7 +58,7 @@ class LoanModal(
     }
 
     override fun chooseIcon(icon: String): LoanModal {
-        ChooseIconFlow(composeTestRule).chooseIcon(icon)
+        IvyIconPicker(composeTestRule).chooseIcon(icon)
         return this
     }
 

app/src/androidTest/java/com/ivy/wallet/compose/helpers/LoanRecordModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/loan/LoanRecordModal.kt

@@ -1,10 +1,14 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.loan
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performTextReplacement
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DeleteConfirmationModal
+import com.ivy.wallet.compose.component.DeleteItem
+import com.ivy.wallet.compose.component.amountinput.AmountInput
+import com.ivy.wallet.compose.component.amountinput.IvyAmountInput
 
 class LoanRecordModal(
     private val composeTestRule: IvyComposeTestRule

app/src/androidTest/java/com/ivy/wallet/compose/helpers/LoansScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/loan/LoansScreen.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.loan
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.*

app/src/androidTest/java/com/ivy/wallet/compose/helpers/IvyColorPicker.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/picker/IvyColorPicker.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.picker
 
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.test.hasTestTag

app/src/androidTest/java/com/ivy/wallet/compose/helpers/IvyCurrencyPicker.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/picker/IvyCurrencyPicker.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.picker
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText

app/src/androidTest/java/com/ivy/wallet/compose/helpers/ChooseIconFlow.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/picker/IvyIconPicker.kt

@@ -1,11 +1,11 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.picker
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
 import androidx.compose.ui.test.performScrollTo
 import com.ivy.wallet.compose.IvyComposeTestRule
 
-class ChooseIconFlow(
+class IvyIconPicker(
     private val composeTestRule: IvyComposeTestRule
 ) {
     fun chooseIcon(icon: String) {

app/src/androidTest/java/com/ivy/wallet/compose/helpers/NameModal.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/settings/NameModal.kt

@@ -1,4 +1,4 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.settings
 
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText

app/src/androidTest/java/com/ivy/wallet/compose/helpers/SettingsScreen.kt → app/src/androidTest/java/com/ivy/wallet/compose/component/settings/SettingsScreen.kt

@@ -1,7 +1,9 @@
-package com.ivy.wallet.compose.helpers
+package com.ivy.wallet.compose.component.settings
 
 import androidx.compose.ui.test.*
 import com.ivy.wallet.compose.IvyComposeTestRule
+import com.ivy.wallet.compose.component.DonateScreen
+import com.ivy.wallet.compose.component.home.HomeMoreMenu
 
 class SettingsScreen(
     private val composeTestRule: IvyComposeTestRule