Skip to content

Commit a10237e

Browse files
joraguajoragua
committed
test: adapt tests to support user groups parameter
1 parent 295c7f7 commit a10237e

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

‎owncloudData/src/test/java/com/owncloud/android/data/spaces/datasources/implementation/OCRemoteSpacesDataSourceTest.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import com.owncloud.android.data.spaces.datasources.implementation.OCRemoteSpace
2727
import com.owncloud.android.lib.resources.spaces.services.OCSpacesService
2828
import com.owncloud.android.testutil.OC_ACCOUNT_NAME
2929
import com.owncloud.android.testutil.OC_SPACE_PROJECT_WITH_IMAGE
30+
import com.owncloud.android.testutil.OC_USER_GROUPS
3031
import com.owncloud.android.testutil.OC_USER_ID
3132
import com.owncloud.android.testutil.SPACE_PERMISSIONS
3233
import com.owncloud.android.testutil.SPACE_RESPONSE
@@ -59,7 +60,7 @@ class OCRemoteSpacesDataSourceTest {
5960

6061
every { ocSpaceService.getSpaces() } returns getRemoteSpacesOperationResult
6162

62-
val resultActual = ocRemoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
63+
val resultActual = ocRemoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
6364

6465
assertEquals(listOf(SPACE_RESPONSE.toModel(OC_ACCOUNT_NAME)), resultActual)
6566

‎owncloudData/src/test/java/com/owncloud/android/data/spaces/repository/OCSpacesRepositoryTest.kt‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.owncloud.android.testutil.OC_SPACE_PERSONAL
3131
import com.owncloud.android.testutil.OC_SPACE_PERSONAL_WITH_LIMITED_QUOTA
3232
import com.owncloud.android.testutil.OC_SPACE_PERSONAL_WITH_UNLIMITED_QUOTA
3333
import com.owncloud.android.testutil.OC_SPACE_PROJECT_WITH_IMAGE
34+
import com.owncloud.android.testutil.OC_USER_GROUPS
3435
import com.owncloud.android.testutil.OC_USER_ID
3536
import com.owncloud.android.testutil.OC_USER_QUOTA_LIMITED
3637
import com.owncloud.android.testutil.OC_USER_QUOTA_UNLIMITED
@@ -58,17 +59,17 @@ class OCSpacesRepositoryTest {
5859
@Test
5960
fun `refreshSpacesForAccount refreshes spaces for account correctly when multipersonal is enabled`() {
6061
every {
61-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
62+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
6263
} returns listOf(OC_SPACE_PERSONAL)
6364

6465
every {
6566
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
6667
} returns OC_CAPABILITY_WITH_MULTIPERSONAL_ENABLED
6768

68-
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
69+
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
6970

7071
verify(exactly = 1) {
71-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
72+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
7273
localSpacesDataSource.saveSpacesForAccount(listOf(OC_SPACE_PERSONAL))
7374
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
7475
localUserDataSource.saveQuotaForAccount(OC_ACCOUNT_NAME, OC_USER_QUOTA_WITHOUT_PERSONAL)
@@ -78,17 +79,17 @@ class OCSpacesRepositoryTest {
7879
@Test
7980
fun `refreshSpacesForAccount refreshes spaces for account correctly when quota is unlimited`() {
8081
every {
81-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
82+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
8283
} returns listOf(OC_SPACE_PERSONAL_WITH_UNLIMITED_QUOTA)
8384

8485
every {
8586
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
8687
} returns OC_CAPABILITY
8788

88-
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
89+
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
8990

9091
verify(exactly = 1) {
91-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
92+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
9293
localSpacesDataSource.saveSpacesForAccount(listOf(OC_SPACE_PERSONAL_WITH_UNLIMITED_QUOTA))
9394
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
9495
localUserDataSource.saveQuotaForAccount(OC_ACCOUNT_NAME, OC_USER_QUOTA_UNLIMITED)
@@ -98,17 +99,17 @@ class OCSpacesRepositoryTest {
9899
@Test
99100
fun `refreshSpacesForAccount refreshes spaces for account correctly when quota is limited`() {
100101
every {
101-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
102+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
102103
} returns listOf(OC_SPACE_PERSONAL_WITH_LIMITED_QUOTA)
103104

104105
every {
105106
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
106107
} returns OC_CAPABILITY
107108

108-
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
109+
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
109110

110111
verify(exactly = 1) {
111-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
112+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
112113
localSpacesDataSource.saveSpacesForAccount(listOf(OC_SPACE_PERSONAL_WITH_LIMITED_QUOTA))
113114
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
114115
localUserDataSource.saveQuotaForAccount(OC_ACCOUNT_NAME, OC_USER_QUOTA_LIMITED)
@@ -118,17 +119,17 @@ class OCSpacesRepositoryTest {
118119
@Test
119120
fun `refreshSpacesForAccount refreshes spaces for account correctly when personal space does not exist`() {
120121
every {
121-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
122+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
122123
} returns listOf(OC_SPACE_PROJECT_WITH_IMAGE)
123124

124125
every {
125126
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
126127
} returns OC_CAPABILITY
127128

128-
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
129+
ocSpacesRepository.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
129130

130131
verify(exactly = 1) {
131-
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID)
132+
remoteSpacesDataSource.refreshSpacesForAccount(OC_ACCOUNT_NAME, OC_USER_ID, OC_USER_GROUPS)
132133
localSpacesDataSource.saveSpacesForAccount(listOf(OC_SPACE_PROJECT_WITH_IMAGE))
133134
localCapabilitiesDataSource.getCapabilitiesForAccount(OC_ACCOUNT_NAME)
134135
localUserDataSource.saveQuotaForAccount(OC_ACCOUNT_NAME, OC_USER_QUOTA_WITHOUT_PERSONAL)

‎owncloudTestUtil/src/main/java/com/owncloud/android/testutil/OCSpace.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ val SPACE_RESPONSE =
314314
deleted = null,
315315
permissions = listOf(
316316
PermissionsResponse(
317-
grantedToV2 = GrantedToV2Response(UserResponse(id = OC_CLIENT_ID)),
317+
grantedToV2 = GrantedToV2Response(UserResponse(id = OC_CLIENT_ID), null),
318318
roles = listOf("manager")
319319
)
320320
)

0 commit comments

Comments
 (0)