Skip to content

Commit cc99745

Browse files
AitorbpJuancaG05
Aitorbp
authored and
JuancaG05
committed
Renamed names in tests class and added relaxing mock in LocalAuthenticationDataSource
1 parent 78b2e95 commit cc99745

5 files changed

Lines changed: 28 additions & 78 deletions

File tree

‎owncloudData/src/androidTest/java/com/owncloud/android/data/authentication/datasources/implementation/OCLocalAuthenticationDataSourceTest.kt‎

Lines changed: 13 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class OCLocalAuthenticationDataSourceTest {
7373
val instantExecutorRule = InstantTaskExecutorRule()
7474

7575
private lateinit var ocLocalAuthenticationDataSource: OCLocalAuthenticationDataSource
76-
private val accountManager = mockk<AccountManager>()
76+
private val accountManager = mockk<AccountManager>(relaxUnitFun = true)
7777
private val preferencesProvider = spyk<SharedPreferencesProvider>()
7878

7979
@Before
@@ -86,6 +86,13 @@ class OCLocalAuthenticationDataSourceTest {
8686
preferencesProvider,
8787
OC_ACCOUNT.type
8888
)
89+
getAccountsByType(OC_ACCOUNT.type, arrayOf(OC_ACCOUNT))
90+
}
91+
92+
private fun getAccountsByType(accountType: String, accounts: Array<Account>) {
93+
every {
94+
accountManager.getAccountsByType(accountType)
95+
} returns accounts
8996
}
9097

9198
@Test
@@ -102,7 +109,7 @@ class OCLocalAuthenticationDataSourceTest {
102109
null
103110
)
104111

105-
val newAccount = Account(OC_ACCOUNT_NAME, "owncloud")
112+
val newAccount = Account(OC_ACCOUNT_NAME, OC_ACCOUNT.type)
106113

107114
// One for checking if the account exists and another one for getting the new account
108115
verifyAccountsByTypeAreGot(newAccount.type, 2)
@@ -115,9 +122,6 @@ class OCLocalAuthenticationDataSourceTest {
115122

116123
@Test(expected = AccountNotNewException::class)
117124
fun addBasicAccountAlreadyExistsNoUpdate() {
118-
every {
119-
accountManager.getAccountsByType(OC_ACCOUNT.type)
120-
} returns arrayOf(OC_ACCOUNT) // The account is already there
121125

122126
ocLocalAuthenticationDataSource.addBasicAccount(
123127
OC_ACCOUNT_ID,
@@ -131,17 +135,6 @@ class OCLocalAuthenticationDataSourceTest {
131135

132136
@Test
133137
fun addBasicAccountAlreadyExistsUpdateSameUsername() {
134-
every {
135-
accountManager.getAccountsByType(OC_ACCOUNT.type)
136-
} returns arrayOf(OC_ACCOUNT) // The account is already there
137-
138-
every {
139-
accountManager.setPassword(any(), any())
140-
} returns Unit
141-
142-
every {
143-
accountManager.setUserData(any(), any(), any())
144-
} returns Unit
145138

146139
mockSelectedAccountNameInPreferences()
147140

@@ -167,10 +160,6 @@ class OCLocalAuthenticationDataSourceTest {
167160
@Test
168161
fun addBasicAccountAlreadyExistsUpdateDifferentUsername() {
169162

170-
every {
171-
accountManager.setUserData(any(), any(), any())
172-
} returns Unit
173-
174163
mockSelectedAccountNameInPreferences()
175164

176165
try {
@@ -198,10 +187,6 @@ class OCLocalAuthenticationDataSourceTest {
198187
mockRegularAccountCreationFlow()
199188
mockSelectedAccountNameInPreferences()
200189

201-
every {
202-
accountManager.setAuthToken(any(), any(), any())
203-
} returns Unit
204-
205190
val newAccountName = ocLocalAuthenticationDataSource.addOAuthAccount(
206191
OC_ACCOUNT_ID,
207192
OC_REDIRECTION_PATH.lastPermanentLocation,
@@ -215,7 +200,7 @@ class OCLocalAuthenticationDataSourceTest {
215200
OC_CLIENT_REGISTRATION
216201
)
217202

218-
val newAccount = Account(OC_ACCOUNT_NAME, "owncloud")
203+
val newAccount = Account(OC_ACCOUNT_NAME, OC_ACCOUNT.type)
219204

220205
// One for checking if the account exists and another one for getting the new account
221206
verifyAccountsByTypeAreGot(newAccount.type, 2)
@@ -231,9 +216,6 @@ class OCLocalAuthenticationDataSourceTest {
231216

232217
@Test(expected = AccountNotNewException::class)
233218
fun addOAuthAccountAlreadyExistsNoUpdate() {
234-
every {
235-
accountManager.getAccountsByType(OC_ACCOUNT.type)
236-
} returns arrayOf(OC_ACCOUNT) // The account is already there
237219

238220
ocLocalAuthenticationDataSource.addOAuthAccount(
239221
OC_ACCOUNT_ID,
@@ -251,17 +233,6 @@ class OCLocalAuthenticationDataSourceTest {
251233

252234
@Test
253235
fun addOAuthAccountAlreadyExistsUpdateSameUsername() {
254-
every {
255-
accountManager.getAccountsByType(OC_ACCOUNT.type)
256-
} returns arrayOf(OC_ACCOUNT) // The account is already there
257-
258-
every {
259-
accountManager.setUserData(any(), any(), any())
260-
} returns Unit
261-
262-
every {
263-
accountManager.setAuthToken(any(), any(), any())
264-
} returns Unit
265236

266237
mockSelectedAccountNameInPreferences()
267238

@@ -292,14 +263,6 @@ class OCLocalAuthenticationDataSourceTest {
292263
@Test
293264
fun addOAuthAccountAlreadyExistsUpdateDifferentUsername() {
294265

295-
every {
296-
accountManager.setUserData(any(), any(), any())
297-
} returns Unit
298-
299-
every {
300-
accountManager.setAuthToken(any(), any(), any())
301-
} returns Unit
302-
303266
mockSelectedAccountNameInPreferences()
304267

305268
try {
@@ -337,9 +300,6 @@ class OCLocalAuthenticationDataSourceTest {
337300

338301
@Test
339302
fun supportsOAuthOk() {
340-
every {
341-
accountManager.getAccountsByType(OC_ACCOUNT.type)
342-
} returns arrayOf(OC_ACCOUNT)
343303

344304
every {
345305
accountManager.getUserData(OC_ACCOUNT, KEY_SUPPORTS_OAUTH2)
@@ -355,18 +315,13 @@ class OCLocalAuthenticationDataSourceTest {
355315

356316
@Test(expected = AccountNotFoundException::class)
357317
fun supportsOAuthAccountNotFound() {
358-
every {
359-
accountManager.getAccountsByType(OC_ACCOUNT.type)
360-
} returns arrayOf() // That account does not exist
318+
getAccountsByType(OC_ACCOUNT.type, arrayOf())// That account does not exist
361319

362320
ocLocalAuthenticationDataSource.supportsOAuth2(OC_ACCOUNT.name)
363321
}
364322

365323
@Test
366324
fun getBaseUrlOk() {
367-
every {
368-
accountManager.getAccountsByType(OC_ACCOUNT.type)
369-
} returns arrayOf(OC_ACCOUNT)
370325

371326
every {
372327
accountManager.getUserData(OC_ACCOUNT, KEY_OC_BASE_URL)
@@ -382,9 +337,7 @@ class OCLocalAuthenticationDataSourceTest {
382337

383338
@Test(expected = AccountNotFoundException::class)
384339
fun getBaseUrlAccountNotFound() {
385-
every {
386-
accountManager.getAccountsByType(OC_ACCOUNT.type)
387-
} returns arrayOf() // That account does not exist
340+
getAccountsByType(OC_ACCOUNT.type, arrayOf()) // That account does not exist
388341

389342
ocLocalAuthenticationDataSource.getBaseUrl(OC_ACCOUNT.name)
390343
}
@@ -402,9 +355,7 @@ class OCLocalAuthenticationDataSourceTest {
402355

403356
private fun mockRegularAccountCreationFlow() {
404357
// Step 1: Get accounts to know if the current account exists
405-
every {
406-
accountManager.getAccountsByType("owncloud")
407-
} returns arrayOf() // There's no accounts yet
358+
getAccountsByType(OC_ACCOUNT.type, arrayOf()) // There's no accounts yet
408359

409360
// Step 2: Add new account
410361
every {

‎owncloudData/src/test/java/com/owncloud/android/data/shares/datasources/OCLocalShareDataSourceTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class OCLocalShareDataSourceTest {
292292
**************************************************************************************************************/
293293

294294
@Test
295-
fun `replaceShares renewal shares related to a list of files`() {
295+
fun `replaceShares renewal shares related to a list of shares`() {
296296
val expectedValues = listOf<Long>(1, 2)
297297
every { ocSharesDao.replaceShares(publicShares) } returns expectedValues
298298

@@ -313,7 +313,7 @@ class OCLocalShareDataSourceTest {
313313
}
314314

315315
@Test
316-
fun `deleteShare removes a share related to a file`() {
316+
fun `deleteShare removes a share correctly`() {
317317
every { ocSharesDao.deleteShare(OC_SHARE.remoteId) } returns 1
318318

319319
val deletedRows = ocLocalSharesDataSource.deleteShare(OC_SHARE.remoteId)
@@ -323,7 +323,7 @@ class OCLocalShareDataSourceTest {
323323
verify(exactly = 1) { ocSharesDao.deleteShare(OC_SHARE.remoteId) }
324324
}
325325
@Test
326-
fun `deleteSharesForAccount removes shares related to a file`() {
326+
fun `deleteSharesForAccount removes shares related to an account`() {
327327

328328
ocLocalSharesDataSource.deleteSharesForAccount(OC_SHARE.accountOwner)
329329

‎owncloudData/src/test/java/com/owncloud/android/data/shares/datasources/OCRemoteShareDataSourceTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ class OCRemoteShareDataSourceTest {
247247
}
248248

249249
@Test
250-
fun `updateShare update a public share returns OCShare`() {
250+
fun `updateShare for public share returns OCShare`() {
251251
val updateRemoteShareOperationResult = createRemoteOperationResultMock(
252252
ShareResponse(
253253
listOf(
@@ -463,7 +463,7 @@ class OCRemoteShareDataSourceTest {
463463
}
464464

465465
@Test
466-
fun `deleteShare remove a share correctly`() {
466+
fun `deleteShare removes a share correctly`() {
467467
val removeRemoteShareOperationResult = createRemoteOperationResultMock(
468468
Unit,
469469
isSuccess = true

‎owncloudData/src/test/java/com/owncloud/android/data/transfers/implementation/OCLocalTransferDataSourceTest.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,17 +204,16 @@ class OCLocalTransferDataSourceTest {
204204
@Test
205205
fun `getAllTransfersAsStream returns a flow of list of OCTransfer ordered by status`() = runBlocking {
206206

207-
val transferEntityInProgress: OCTransferEntity = ocTransfer.toEntity().copy(status = 0)
207+
val transferEntityInProgress: OCTransferEntity = ocTransfer.copy(status = TransferStatus.TRANSFER_IN_PROGRESS).toEntity()
208208

209-
val transferEntityQueue: OCTransferEntity = ocTransfer.toEntity().copy(status = 1)
209+
val transferEntityQueue: OCTransferEntity = ocTransfer.copy(status = TransferStatus.TRANSFER_QUEUED).toEntity()
210210

211-
val transferEntityFailed: OCTransferEntity = ocTransfer.toEntity().copy(status = 2)
211+
val transferEntityFailed: OCTransferEntity = ocTransfer.copy(status = TransferStatus.TRANSFER_FAILED).toEntity()
212212

213-
val transferEntitySucceeded: OCTransferEntity = ocTransfer.toEntity().copy(status = 3)
213+
val transferEntitySucceeded: OCTransferEntity = ocTransfer.copy(status = TransferStatus.TRANSFER_SUCCEEDED).toEntity()
214214

215215
val transferListRandom = listOf(transferEntityQueue, transferEntityFailed, transferEntityInProgress, transferEntitySucceeded)
216216

217-
218217
val transferQueue = ocTransfer.copy()
219218
transferQueue.status = TransferStatus.TRANSFER_QUEUED
220219

@@ -230,7 +229,7 @@ class OCLocalTransferDataSourceTest {
230229
transferDao.getAllTransfersAsStream()
231230
} returns flowOf(transferListRandom)
232231

233-
val actualResult = ocLocalTransferDataSource.getAllTransfersAsStream().first().map { it }
232+
val actualResult = ocLocalTransferDataSource.getAllTransfersAsStream().first()
234233

235234
assertEquals(transferListOrdered, actualResult)
236235

@@ -305,7 +304,7 @@ class OCLocalTransferDataSourceTest {
305304
}
306305

307306
@Test
308-
fun `clearFailedTransfers clears it correctly`() {
307+
fun `clearFailedTransfers removes transfers correctly`() {
309308

310309
ocLocalTransferDataSource.clearFailedTransfers()
311310

@@ -315,7 +314,7 @@ class OCLocalTransferDataSourceTest {
315314
}
316315

317316
@Test
318-
fun `clearSuccessfulTransfers clears it correctly`() {
317+
fun `clearSuccessfulTransfers removes transfers correctly`() {
319318

320319
ocLocalTransferDataSource.clearSuccessfulTransfers()
321320

‎owncloudData/src/test/java/com/owncloud/android/data/webfinger/datasource/implementation/OCRemoteWebFingerDatasourceTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class OCRemoteWebFingerDatasourceTest {
4444
private val clientManager: ClientManager = mockk(relaxed = true)
4545
private val ownCloudClient: OwnCloudClient = mockk(relaxed = true)
4646
private val ocWebFingerService: OCWebFingerService = mockk()
47-
private val listString: List<String> = listOf(
47+
private val urls: List<String> = listOf(
4848
"http://webfinger.owncloud/tests/server-instance1",
4949
"http://webfinger.owncloud/tests/server-instance2",
5050
"http://webfinger.owncloud/tests/server-instance3",
@@ -65,7 +65,7 @@ class OCRemoteWebFingerDatasourceTest {
6565
fun `getInstancesFromWebFinger returns a list of web finger`() {
6666

6767
val getInstancesFromWebFingerResult: RemoteOperationResult<List<String>> =
68-
createRemoteOperationResultMock(data = listString, isSuccess = true)
68+
createRemoteOperationResultMock(data = urls, isSuccess = true)
6969

7070
every {
7171
ocWebFingerService.getInstancesFromWebFinger(
@@ -99,7 +99,7 @@ class OCRemoteWebFingerDatasourceTest {
9999
fun `getInstancesFromAuthenticatedWebFinger returns a list of web finger`() {
100100

101101
val getInstancesFromAuthenticatedWebFingerResult: RemoteOperationResult<List<String>> =
102-
createRemoteOperationResultMock(data = listString, isSuccess = true)
102+
createRemoteOperationResultMock(data = urls, isSuccess = true)
103103

104104
every {
105105
ocWebFingerService.getInstancesFromWebFinger(

0 commit comments

Comments
 (0)