AtaraxiaDev/cryptomator-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Final clean-up

Browse Source 
[ci skip]
This commit is contained in:
Julian Raufelder 2021-02-10 19:39:46 +01:00
parent 6f7caf9028
commit 93ae29e1a2
No known key found for this signature in database
GPG Key ID: 17EE71F6634E381D
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
domain/src/main/java/org/cryptomator/domain/Vault.java
View File

@ -19,7 +19,7 @@ public class Vault implements Serializable {
.withPath(vault.getPath()) //
.withUnlocked(vault.isUnlocked()) //
.withSavedPassword(vault.getPassword()) //
.withVersion(vault.getVersion())
.withVersion(vault.getVersion()) //
.withPosition(vault.getPosition());
}

24
domain/src/test/java/org/cryptomator/domain/usecases/vault/MoveVaultHelperTest.kt
View File

@ -41,26 +41,26 @@ class MoveVaultHelperTest {
fun movePositionDown() {
Mockito.`when`(vaultRepository.vaults()).thenReturn(orderedVaults)
val resultList2 = ArrayList<Vault>()
resultList2.add(Vault.aVault().withId(3).withPath("").withCloudType(cloudType).withName("foo 10").withPosition(0).build())
resultList2.add(Vault.aVault().withId(24).withPath("").withCloudType(cloudType).withName("foo 1").withPosition(1).build())
resultList2.add(Vault.aVault().withId(2).withPath("").withCloudType(cloudType).withName("foo 5").withPosition(2).build())
resultList2.add(Vault.aVault().withId(4).withPath("").withCloudType(cloudType).withName("foo 15").withPosition(3).build())
val resultList = ArrayList<Vault>()
resultList.add(Vault.aVault().withId(3).withPath("").withCloudType(cloudType).withName("foo 10").withPosition(0).build())
resultList.add(Vault.aVault().withId(24).withPath("").withCloudType(cloudType).withName("foo 1").withPosition(1).build())
resultList.add(Vault.aVault().withId(2).withPath("").withCloudType(cloudType).withName("foo 5").withPosition(2).build())
resultList.add(Vault.aVault().withId(4).withPath("").withCloudType(cloudType).withName("foo 15").withPosition(3).build())
assertEquals(resultList2, MoveVaultHelper.Companion.updateVaultPosition(2, 0, vaultRepository), "Failed to movePositionDown")
assertEquals(resultList, MoveVaultHelper.Companion.updateVaultPosition(2, 0, vaultRepository), "Failed to movePositionDown")
}
@Test
fun movePositionToSelf() {
Mockito.`when`(vaultRepository.vaults()).thenReturn(orderedVaults)
val resultList2 = ArrayList<Vault>()
resultList2.add(Vault.aVault().withId(24).withPath("").withCloudType(cloudType).withName("foo 1").withPosition(0).build())
resultList2.add(Vault.aVault().withId(2).withPath("").withCloudType(cloudType).withName("foo 5").withPosition(1).build())
resultList2.add(Vault.aVault().withId(3).withPath("").withCloudType(cloudType).withName("foo 10").withPosition(2).build())
resultList2.add(Vault.aVault().withId(4).withPath("").withCloudType(cloudType).withName("foo 15").withPosition(3).build())
val resultList = ArrayList<Vault>()
resultList.add(Vault.aVault().withId(24).withPath("").withCloudType(cloudType).withName("foo 1").withPosition(0).build())
resultList.add(Vault.aVault().withId(2).withPath("").withCloudType(cloudType).withName("foo 5").withPosition(1).build())
resultList.add(Vault.aVault().withId(3).withPath("").withCloudType(cloudType).withName("foo 10").withPosition(2).build())
resultList.add(Vault.aVault().withId(4).withPath("").withCloudType(cloudType).withName("foo 15").withPosition(3).build())
assertEquals(resultList2, MoveVaultHelper.Companion.updateVaultPosition(1, 1, vaultRepository), "Failed to movePositionToSelf")
assertEquals(resultList, MoveVaultHelper.Companion.updateVaultPosition(1, 1, vaultRepository), "Failed to movePositionToSelf")
}
@Test

2
presentation/src/main/java/org/cryptomator/presentation/workflow/AddExistingVaultWorkflow.java
View File

@ -41,7 +41,7 @@ public class AddExistingVaultWorkflow extends Workflow<AddExistingVaultWorkflow.
@Inject
public AddExistingVaultWorkflow( //
Context context, //
SaveVaultUseCase saveVaultUseCase,
SaveVaultUseCase saveVaultUseCase, //
GetVaultListUseCase getVaultListUseCase, //
GetRootFolderUseCase getRootFolderUseCase, //
CloudModelMapper cloudModelMapper, //