Apply CR changes

owncloud · Jun 11, 2019 · 34d458f · 34d458f
1 parent 420413a
commit 34d458f
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 41 deletions.
diff --git a/...App/src/androidTest/java/com/owncloud/android/shares/ui/usecases/CreatePublicShareTest.kt b/...App/src/androidTest/java/com/owncloud/android/shares/ui/usecases/CreatePublicShareTest.kt
@@ -28,7 +28,6 @@ import android.view.View
 import androidx.lifecycle.MutableLiveData
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.IdlingPolicies
 import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
@@ -67,7 +66,6 @@ import org.koin.dsl.module
 import org.mockito.Mockito.`when`
 import org.mockito.Mockito.mock
 import org.mockito.Mockito.spy
-import java.util.concurrent.TimeUnit
 
 class CreatePublicShareTest {
     @Rule
@@ -358,7 +356,7 @@ class CreatePublicShareTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -371,9 +369,7 @@ class CreatePublicShareTest {
             activityRule.activity.supportFragmentManager.findFragmentByTag(ShareActivity.TAG_PUBLIC_SHARE_DIALOG_FRAGMENT),
             View.VISIBLE
         )
-        IdlingPolicies.setIdlingResourceTimeout(1, TimeUnit.HOURS);
         IdlingRegistry.getInstance().register(idlingResource)
-
         return idlingResource
     }
 

diff --git a/...App/src/androidTest/java/com/owncloud/android/shares/ui/usecases/DeletePublicShareTest.kt b/...App/src/androidTest/java/com/owncloud/android/shares/ui/usecases/DeletePublicShareTest.kt
@@ -195,7 +195,7 @@ class DeletePublicShareTest {
         `when`(
             ocShareViewModel.deletePublicShare(ArgumentMatchers.anyLong())
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -224,7 +224,7 @@ class DeletePublicShareTest {
         `when`(
             ocShareViewModel.deletePublicShare(ArgumentMatchers.anyLong())
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )

diff --git a/...src/androidTest/java/com/owncloud/android/shares/ui/usecases/EditPublicShareFolderTest.kt b/...src/androidTest/java/com/owncloud/android/shares/ui/usecases/EditPublicShareFolderTest.kt
@@ -229,7 +229,7 @@ class EditPublicShareFolderTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -273,7 +273,7 @@ class EditPublicShareFolderTest {
                 true
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -318,7 +318,7 @@ class EditPublicShareFolderTest {
                 true
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -363,7 +363,7 @@ class EditPublicShareFolderTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )

diff --git a/...udApp/src/androidTest/java/com/owncloud/android/shares/ui/usecases/EditPublicShareTest.kt b/...udApp/src/androidTest/java/com/owncloud/android/shares/ui/usecases/EditPublicShareTest.kt
@@ -231,7 +231,7 @@ class EditPublicShareTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -276,7 +276,7 @@ class EditPublicShareTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -324,7 +324,7 @@ class EditPublicShareTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -374,7 +374,7 @@ class EditPublicShareTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )
@@ -427,7 +427,7 @@ class EditPublicShareTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 postValue(Resource.success())
             }
         )

diff --git a/owncloudApp/src/main/java/com/owncloud/android/shares/repository/OCShareRepository.kt b/owncloudApp/src/main/java/com/owncloud/android/shares/repository/OCShareRepository.kt
@@ -71,8 +71,8 @@ class OCShareRepository(
         password: String,
         expirationTimeInMillis: Long,
         publicUpload: Boolean
-    ): LiveData<Resource<Void>> {
-        val result = MutableLiveData<Resource<Void>>()
+    ): LiveData<Resource<Unit>> {
+        val result = MutableLiveData<Resource<Unit>>()
         result.postValue(Resource.loading())
 
         appExecutors.networkIO().execute() {
@@ -114,8 +114,8 @@ class OCShareRepository(
         expirationDateInMillis: Long,
         permissions: Int,
         publicUpload: Boolean
-    ): LiveData<Resource<Void>> {
-        val result = MutableLiveData<Resource<Void>>()
+    ): LiveData<Resource<Unit>> {
+        val result = MutableLiveData<Resource<Unit>>()
         result.postValue(Resource.loading())
 
         appExecutors.networkIO().execute() {
@@ -150,8 +150,8 @@ class OCShareRepository(
 
     override fun deletePublicShare(
         remoteId: Long
-    ): LiveData<Resource<Void>> {
-        val result = MutableLiveData<Resource<Void>>()
+    ): LiveData<Resource<Unit>> {
+        val result = MutableLiveData<Resource<Unit>>()
 
         result.postValue(Resource.loading())
 

diff --git a/owncloudApp/src/main/java/com/owncloud/android/shares/repository/ShareRepository.kt b/owncloudApp/src/main/java/com/owncloud/android/shares/repository/ShareRepository.kt
@@ -32,7 +32,7 @@ interface ShareRepository {
         password: String,
         expirationTimeInMillis: Long,
         publicUpload: Boolean
-    ): LiveData<Resource<Void>>
+    ): LiveData<Resource<Unit>>
 
     fun updatePublicShareForFile(
         remoteId: Long,
@@ -41,9 +41,9 @@ interface ShareRepository {
         expirationDateInMillis: Long,
         permissions: Int,
         publicUpload: Boolean
-    ): LiveData<Resource<Void>>
+    ): LiveData<Resource<Unit>>
 
     fun deletePublicShare(
         remoteId: Long
-    ): LiveData<Resource<Void>>
+    ): LiveData<Resource<Unit>>
 }
diff --git a/owncloudApp/src/main/java/com/owncloud/android/shares/viewmodel/OCShareViewModel.kt b/owncloudApp/src/main/java/com/owncloud/android/shares/viewmodel/OCShareViewModel.kt
@@ -67,7 +67,7 @@ class OCShareViewModel(
         password: String,
         expirationTimeInMillis: Long,
         publicUpload: Boolean
-    ): LiveData<Resource<Void>> = shareRepository.insertPublicShareForFile(
+    ): LiveData<Resource<Unit>> = shareRepository.insertPublicShareForFile(
         permissions, name, password, expirationTimeInMillis, publicUpload
     )
 
@@ -78,11 +78,11 @@ class OCShareViewModel(
         expirationDateInMillis: Long,
         permissions: Int,
         publicUpload: Boolean
-    ): LiveData<Resource<Void>> = shareRepository.updatePublicShareForFile(
+    ): LiveData<Resource<Unit>> = shareRepository.updatePublicShareForFile(
         remoteId, name, password, expirationDateInMillis, permissions, publicUpload
     )
 
     fun deletePublicShare(
         remoteId: Long
-    ): LiveData<Resource<Void>> = shareRepository.deletePublicShare(remoteId)
+    ): LiveData<Resource<Unit>> = shareRepository.deletePublicShare(remoteId)
 }
diff --git a/owncloudApp/src/test/java/com/owncloud/android/shares/repository/OCShareRepositoryTest.kt b/owncloudApp/src/test/java/com/owncloud/android/shares/repository/OCShareRepositoryTest.kt
@@ -189,7 +189,7 @@ class OCShareRepositoryTest {
         )
 
         val data = insertShare(localData, remoteOperationResult)
-        val observer = mock<Observer<Resource<Void>>>()
+        val observer = mock<Observer<Resource<Unit>>>()
         data.observeForever(observer)
 
         // Get public shares from database is called once, when creating the repository
@@ -231,7 +231,7 @@ class OCShareRepositoryTest {
         // Retrieving public shares from server...
 
         // Observe changes in database livedata when there's an error from server
-        val observer = mock<Observer<Resource<Void>>>()
+        val observer = mock<Observer<Resource<Unit>>>()
         data.observeForever(observer)
 
         verify(observer).onChanged(
@@ -252,7 +252,7 @@ class OCShareRepositoryTest {
 
         val data = updateShare(localData, remoteOperationResult)
 
-        val observer = mock<Observer<Resource<Void>>>()
+        val observer = mock<Observer<Resource<Unit>>>()
         data.observeForever(observer)
 
         // Get public shares from database is called once, when creating the repository
@@ -279,7 +279,7 @@ class OCShareRepositoryTest {
 
         val data = deleteShare(localData, remoteOperationResult)
 
-        val observer = mock<Observer<Resource<Void>>>()
+        val observer = mock<Observer<Resource<Unit>>>()
         data.observeForever(observer)
 
         // Get public shares from database is called once, when creating the repository
@@ -329,7 +329,7 @@ class OCShareRepositoryTest {
     private fun insertShare(
         localData: MutableLiveData<List<OCShare>>,
         remoteOperationResult: RemoteOperationResult<ShareParserResult>
-    ): LiveData<Resource<Void>> {
+    ): LiveData<Resource<Unit>> {
         val ocShareRepository = createRepositoryWithData(localData, remoteOperationResult)
 
         return ocShareRepository.insertPublicShareForFile(
@@ -344,7 +344,7 @@ class OCShareRepositoryTest {
     private fun updateShare(
         localData: MutableLiveData<List<OCShare>>,
         remoteOperationResult: RemoteOperationResult<ShareParserResult>
-    ): LiveData<Resource<Void>> {
+    ): LiveData<Resource<Unit>> {
         val ocShareRepository = createRepositoryWithData(localData, remoteOperationResult)
 
         return ocShareRepository.updatePublicShareForFile(
@@ -360,7 +360,7 @@ class OCShareRepositoryTest {
     private fun deleteShare(
         localData: MutableLiveData<List<OCShare>>,
         remoteOperationResult: RemoteOperationResult<ShareParserResult>
-    ): LiveData<Resource<Void>> {
+    ): LiveData<Resource<Unit>> {
         val ocShareRepository = createRepositoryWithData(localData, remoteOperationResult)
         return ocShareRepository.deletePublicShare(
             1

diff --git a/owncloudApp/src/test/java/com/owncloud/android/shares/viewmodel/OCShareViewModelTest.kt b/owncloudApp/src/test/java/com/owncloud/android/shares/viewmodel/OCShareViewModelTest.kt
@@ -90,15 +90,15 @@ class OCShareViewModelTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 value = Resource.success()
             }
         )
 
         // Viewmodel that will ask ocShareRepository for shares
         val ocShareViewModel = createOCShareViewModel(ocShareRepository)
 
-        val resource: Resource<Void>? = ocShareViewModel.insertPublicShareForFile(
+        val resource: Resource<Unit>? = ocShareViewModel.insertPublicShareForFile(
             1,
             "Photos 2 link",
             "1234",
@@ -123,15 +123,15 @@ class OCShareViewModelTest {
                 false
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 value = Resource.success()
             }
         )
 
         // Viewmodel that will ask ocShareRepository for shares
         val ocShareViewModel = createOCShareViewModel(ocShareRepository)
 
-        val resource: Resource<Void>? = ocShareViewModel.updatePublicShareForFile(
+        val resource: Resource<Unit>? = ocShareViewModel.updatePublicShareForFile(
             1,
             "Photos 1 link",
             "123456",
@@ -152,15 +152,15 @@ class OCShareViewModelTest {
                 3
             )
         ).thenReturn(
-            MutableLiveData<Resource<Void>>().apply {
+            MutableLiveData<Resource<Unit>>().apply {
                 value = Resource.success()
             }
         )
 
         // Viewmodel that will ask ocShareRepository for shares
         val ocShareViewModel = createOCShareViewModel(ocShareRepository)
 
-        val resource: Resource<Void>? = ocShareViewModel.deletePublicShare(
+        val resource: Resource<Unit>? = ocShareViewModel.deletePublicShare(
             3
         ).value