diff --git a/coverage.gradle b/coverage.gradle index f335ed8063..d0a15f62d0 100644 --- a/coverage.gradle +++ b/coverage.gradle @@ -87,5 +87,5 @@ task unitTestsWithCoverage(type: GradleBuild) { task instrumentationTestsWithCoverage(type: GradleBuild) { startParameter.projectProperties.coverage = [enableTestCoverage: true] startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui' - tasks = [':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] + tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedGplayDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] } diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 40b74ac5eb..7cce15a85d 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -352,4 +352,27 @@ dependencies { implementation "androidx.sharetarget:sharetarget:1.1.0" kapt libs.dagger.hiltCompiler + + androidTestImplementation libs.androidx.testCore + androidTestImplementation libs.androidx.testRunner + androidTestImplementation libs.androidx.testRules + androidTestImplementation libs.androidx.junit + androidTestImplementation libs.androidx.espressoCore + androidTestImplementation libs.androidx.espressoContrib + androidTestImplementation libs.androidx.espressoIntents + androidTestImplementation libs.tests.kluent + androidTestImplementation libs.androidx.coreTesting + androidTestImplementation(libs.jetbrains.coroutinesTest) { + exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" + } + // Plant Timber tree for test + androidTestImplementation libs.tests.timberJunitRule + // "The one who serves a great Espresso" + androidTestImplementation('com.adevinta.android:barista:4.2.0') { + exclude group: 'org.jetbrains.kotlin' + } + androidTestImplementation libs.mockk.mockkAndroid + androidTestUtil libs.androidx.orchestrator + androidTestImplementation libs.androidx.fragmentTesting + androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:1.7.10" } diff --git a/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt b/vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt similarity index 96% rename from vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt rename to vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt index e6b17c1e9e..6f9d6cdde9 100644 --- a/vector/src/androidTest/java/im/vector/app/CantVerifyTest.kt +++ b/vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt @@ -23,6 +23,7 @@ import androidx.test.espresso.matcher.ViewMatchers import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest +import com.adevinta.android.barista.internal.viewaction.SleepViewAction import im.vector.app.features.MainActivity import im.vector.app.ui.robot.ElementRobot import org.junit.Rule @@ -33,7 +34,7 @@ import java.util.UUID @RunWith(AndroidJUnit4::class) @LargeTest -class CantVerifyTest : VerificationTestBase() { +class CantVerifyTest { @get:Rule val testRule = RuleChain diff --git a/vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt b/vector-app/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt rename to vector-app/src/androidTest/java/im/vector/app/ClearCurrentSessionRule.kt diff --git a/vector/src/androidTest/java/im/vector/app/EspressoExt.kt b/vector-app/src/androidTest/java/im/vector/app/EspressoExt.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/EspressoExt.kt rename to vector-app/src/androidTest/java/im/vector/app/EspressoExt.kt diff --git a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt b/vector-app/src/androidTest/java/im/vector/app/RegistrationTest.kt similarity index 99% rename from vector/src/androidTest/java/im/vector/app/RegistrationTest.kt rename to vector-app/src/androidTest/java/im/vector/app/RegistrationTest.kt index 7920e8e0d8..68a4d27deb 100644 --- a/vector/src/androidTest/java/im/vector/app/RegistrationTest.kt +++ b/vector-app/src/androidTest/java/im/vector/app/RegistrationTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt b/vector-app/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt similarity index 99% rename from vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt rename to vector-app/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt index 7dc20178f2..1243758b2f 100644 --- a/vector/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt +++ b/vector-app/src/androidTest/java/im/vector/app/SecurityBootstrapTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt b/vector-app/src/androidTest/java/im/vector/app/TestMatrixCallback.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/TestMatrixCallback.kt rename to vector-app/src/androidTest/java/im/vector/app/TestMatrixCallback.kt diff --git a/vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt b/vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/VerificationTestBase.kt rename to vector-app/src/androidTest/java/im/vector/app/VerificationTestBase.kt diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt b/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt similarity index 99% rename from vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt rename to vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt index 8c9faee336..da13e49e84 100644 --- a/vector/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt +++ b/vector-app/src/androidTest/java/im/vector/app/VerifySessionInteractiveTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest +import com.adevinta.android.barista.internal.viewaction.SleepViewAction import im.vector.app.core.utils.getMatrixInstance import im.vector.app.features.MainActivity import im.vector.app.features.home.HomeActivity diff --git a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt b/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt similarity index 98% rename from vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt rename to vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt index 23a662dcc8..53e088118b 100644 --- a/vector/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt +++ b/vector-app/src/androidTest/java/im/vector/app/VerifySessionPassphraseTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 New Vector Ltd + * Copyright (c) 2022 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.filters.LargeTest import androidx.test.platform.app.InstrumentationRegistry +import com.adevinta.android.barista.internal.viewaction.SleepViewAction import im.vector.app.core.resources.StringProvider import im.vector.app.core.utils.getMatrixInstance import im.vector.app.features.MainActivity diff --git a/vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt b/vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt rename to vector-app/src/androidTest/java/im/vector/app/core/utils/TestMatrixHelper.kt diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt rename to vector-app/src/androidTest/java/im/vector/app/espresso/tools/EspressoPreference.kt diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt rename to vector-app/src/androidTest/java/im/vector/app/espresso/tools/ScreenshotFailureRule.kt diff --git a/vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt b/vector-app/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt rename to vector-app/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt b/vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/AnalyticsRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/CreateNewRoomRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/DialogRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/MessageMenuRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/NewDirectMessageRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/NewRoomRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/OnboardingServersRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomListRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/RoomSettingsRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsAdvancedRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsGeneralRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsHelpRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsLegalsRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsNotificationsRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsPreferencesRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/SettingsSecurityRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/settings/labs/LabFeature.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceCreateRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceMenuRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceRobot.kt diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt b/vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt similarity index 100% rename from vector/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt rename to vector-app/src/androidTest/java/im/vector/app/ui/robot/space/SpaceSettingsRobot.kt diff --git a/vector/build.gradle b/vector/build.gradle index e717ec2cd3..5a2a90d600 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -170,7 +170,7 @@ dependencies { api libs.androidx.lifecycleProcess implementation libs.androidx.lifecycleRuntimeKtx - implementation libs.androidx.datastorepreferences + api libs.androidx.datastorepreferences // Opus Encoder implementation libs.element.opusencoder