Skip to content

Commit ecaddcc

Browse files
committed
feat: changed from launch to launchActivityForResult in a ReleaseNotesActivityTest, LoginActivityTest and PassCodeActivityTest
1 parent c7ab79a commit ecaddcc

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

owncloudApp/src/androidTest/java/com/owncloud/android/authentication/LoginActivityTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
* @author Abel García de Prada
55
* @author Juan Carlos Garrote Gascón
66
* @author Jorge Aguado Recio
7+
* @author Aitor Ballesteros Pavón
78
*
89
* Copyright (C) 2024 ownCloud GmbH.
910
*
@@ -193,9 +194,9 @@ class LoginActivityTest {
193194
every { ocContextProvider.getString(R.string.app_name) } returns BRANDED_APP_NAME
194195

195196
activityScenario = if (intent == null) {
196-
ActivityScenario.launch(LoginActivity::class.java)
197+
ActivityScenario.launchActivityForResult(LoginActivity::class.java)
197198
} else {
198-
ActivityScenario.launch(intent)
199+
ActivityScenario.launchActivityForResult(intent)
199200
}
200201
}
201202

owncloudApp/src/androidTest/java/com/owncloud/android/settings/security/PassCodeActivityTest.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
* @author Christian Schabesberger (@theScrabi)
66
* @author Juan Carlos Garrote Gascón (@JuancaG05)
77
* @author David Crespo Ríos (@davcres)
8+
* @author Aitor Ballesteros Pavón (@Aitorbp)
89
*
9-
* Copyright (C) 2021 ownCloud GmbH.
10+
* Copyright (C) 2024 ownCloud GmbH.
1011
*
1112
* This program is free software: you can redistribute it and/or modify
1213
* it under the terms of the GNU General Public License version 2,
@@ -38,12 +39,12 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
3839
import com.owncloud.android.R
3940
import com.owncloud.android.db.PreferenceManager
4041
import com.owncloud.android.domain.utils.Event
42+
import com.owncloud.android.presentation.security.biometric.BiometricViewModel
4143
import com.owncloud.android.presentation.security.passcode.PassCodeActivity
44+
import com.owncloud.android.presentation.security.passcode.PassCodeViewModel
4245
import com.owncloud.android.presentation.security.passcode.PasscodeAction
4346
import com.owncloud.android.presentation.security.passcode.PasscodeType
4447
import com.owncloud.android.presentation.security.passcode.Status
45-
import com.owncloud.android.presentation.security.biometric.BiometricViewModel
46-
import com.owncloud.android.presentation.security.passcode.PassCodeViewModel
4748
import com.owncloud.android.testutil.security.OC_PASSCODE_4_DIGITS
4849
import com.owncloud.android.utils.matchers.isDisplayed
4950
import com.owncloud.android.utils.matchers.withChildCountAndId
@@ -352,6 +353,6 @@ class PassCodeActivityTest {
352353
val intent = Intent(context, PassCodeActivity::class.java).apply {
353354
action = mode
354355
}
355-
activityScenario = ActivityScenario.launch(intent)
356+
activityScenario = ActivityScenario.launchActivityForResult(intent)
356357
}
357358
}

owncloudApp/src/androidTest/java/com/owncloud/android/ui/activity/ReleaseNotesActivityTest.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* ownCloud Android client application
33
*
44
* @author David Crespo Ríos
5-
* Copyright (C) 2022 ownCloud GmbH.
5+
* @author Aitor Ballesteros Pavón
6+
*
7+
* Copyright (C) 2024 ownCloud GmbH.
68
*
79
* This program is free software: you can redistribute it and/or modify
810
* it under the terms of the GNU General Public License version 2,
@@ -70,7 +72,7 @@ class ReleaseNotesActivityTest {
7072
every { releaseNotesViewModel.getReleaseNotes() } returns releaseNotesList
7173

7274
val intent = Intent(context, ReleaseNotesActivity::class.java)
73-
activityScenario = ActivityScenario.launch(intent)
75+
activityScenario = ActivityScenario.launchActivityForResult(intent)
7476
}
7577

7678
@Test

0 commit comments

Comments
 (0)