Merge pull request #2569 from owncloud/new_arch/improve_viewmodels

[New architecture] Improve viewmodel behaviour

owncloudApp/build.gradle

@@ -175,7 +175,7 @@ android {
 
     testOptions {
         unitTests.returnDefaultValues = true
-        animationsDisabled = false
+        animationsDisabled = true
     }
 }
 

owncloudApp/src/androidTest/java/com/owncloud/android/shares/ui/FragmentVisibilityIdlingResource.kt

@@ -0,0 +1,39 @@
+package com.owncloud.android.shares.ui
+
+import android.view.View
+import androidx.fragment.app.Fragment
+import androidx.test.espresso.IdlingResource
+
+class FragmentVisibilityIdlingResource(private val fragment: Fragment?, private val expectedVisibility: Int) :
+    IdlingResource {
+    private var idle: Boolean = false
+    private var resourceCallback: IdlingResource.ResourceCallback? = null
+
+    init {
+        this.idle = false
+        this.resourceCallback = null
+    }
+
+    override fun getName(): String {
+        return FragmentVisibilityIdlingResource::class.java.simpleName
+    }
+
+    override fun isIdleNow(): Boolean {
+        if (fragment == null) return false
+
+        idle = idle || (fragment.isVisible && expectedVisibility == View.VISIBLE) ||
+                (!fragment.isVisible && expectedVisibility == View.INVISIBLE)
+
+        if (idle) {
+            if (resourceCallback != null) {
+                resourceCallback!!.onTransitionToIdle()
+            }
+        }
+
+        return idle
+    }
+
+    override fun registerIdleTransitionCallback(resourceCallback: IdlingResource.ResourceCallback) {
+        this.resourceCallback = resourceCallback
+    }
+}

owncloudApp/src/androidTest/java/com/owncloud/android/shares/ui/usecases/CreatePublicShareTest.kt

@@ -24,10 +24,11 @@ import android.accounts.AccountManager
 import android.content.Context
 import android.content.Intent
 import android.os.Parcelable
+import android.view.View
 import androidx.lifecycle.MutableLiveData
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
-import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.IdlingRegistry
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 import androidx.test.espresso.assertion.ViewAssertions.matches
@@ -45,6 +46,7 @@ import com.owncloud.android.lib.common.accounts.AccountUtils
 import com.owncloud.android.lib.resources.status.CapabilityBooleanType
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import com.owncloud.android.shares.db.OCShare
+import com.owncloud.android.shares.ui.FragmentVisibilityIdlingResource
 import com.owncloud.android.shares.ui.ShareActivity
 import com.owncloud.android.shares.viewmodel.OCShareViewModel
 import com.owncloud.android.ui.activity.FileActivity
@@ -123,37 +125,35 @@ class CreatePublicShareTest {
             // obtaining an AccountManager instance
             val accountManager = AccountManager.get(targetContext)
 
-            Thread(Runnable {
-                accountManager.addAccountExplicitly(account, "a", null)
-
-                // include account version, user, server version and token with the new account
-                accountManager.setUserData(
-                    account,
-                    AccountUtils.Constants.KEY_OC_VERSION,
-                    OwnCloudVersion("10.2").toString()
-                )
-                accountManager.setUserData(
-                    account,
-                    AccountUtils.Constants.KEY_OC_BASE_URL,
-                    "serverUrl:port"
-                )
-                accountManager.setUserData(
-                    account,
-                    AccountUtils.Constants.KEY_DISPLAY_NAME,
-                    "admin"
-                )
-                accountManager.setUserData(
-                    account,
-                    AccountUtils.Constants.KEY_OC_ACCOUNT_VERSION,
-                    "1"
-                )
-
-                accountManager.setAuthToken(
-                    account,
-                    KEY_AUTH_TOKEN_TYPE,
-                    "AUTH_TOKEN"
-                )
-            }).start()
+            accountManager.addAccountExplicitly(account, "a", null)
+
+            // include account version, user, server version and token with the new account
+            accountManager.setUserData(
+                account,
+                AccountUtils.Constants.KEY_OC_VERSION,
+                OwnCloudVersion("10.2").toString()
+            )
+            accountManager.setUserData(
+                account,
+                AccountUtils.Constants.KEY_OC_BASE_URL,
+                "serverUrl:port"
+            )
+            accountManager.setUserData(
+                account,
+                AccountUtils.Constants.KEY_DISPLAY_NAME,
+                "admin"
+            )
+            accountManager.setUserData(
+                account,
+                AccountUtils.Constants.KEY_OC_ACCOUNT_VERSION,
+                "1"
+            )
+
+            accountManager.setAuthToken(
+                account,
+                KEY_AUTH_TOKEN_TYPE,
+                "AUTH_TOKEN"
+            )
         }
     }
 
@@ -194,32 +194,56 @@ class CreatePublicShareTest {
         loadCapabilitiesSuccessfully()
         loadSharesSuccessfully(arrayListOf())
 
+        // Create share
+        onView(withId(R.id.addPublicLinkButton)).perform(click())
+
+        // Force Espresso to wait until dialog fragment is visible
+        val createShareFragmentIdlingResource = registerCreateShareFragmentAsIdlingResource()
+
         val newPublicShare = publicShares[0]
+        savePublicShare(newPublicShare)
 
-        createPublicShareSuccesfully(newPublicShare, arrayListOf(newPublicShare))
+        // New share properly created
+        sharesLiveData.postValue(
+            Resource.success(
+                arrayListOf(newPublicShare)
+            )
+        )
 
         // Check whether the dialog to create the public share has been properly closed
         onView(withText(R.string.share_via_link_create_title)).check(doesNotExist())
         onView(withText(newPublicShare.name)).check(matches(isDisplayed()))
+
+        unregisterCreateShareFragmentAsIdlingResource(createShareFragmentIdlingResource)
     }
 
     @Test
     fun createPublicShareWithAlreadyExistingShares() {
         loadCapabilitiesSuccessfully()
-
         val existingPublicShares = publicShares.take(2) as ArrayList<OCShare>
-
         loadSharesSuccessfully(
             existingPublicShares
         )
 
+        onView(withId(R.id.addPublicLinkButton)).perform(click())
+
+        val createShareFragmentIdlingResource = registerCreateShareFragmentAsIdlingResource()
+
         val newPublicShare = publicShares[2]
+        savePublicShare(newPublicShare)
 
-        createPublicShareSuccesfully(newPublicShare, publicShares)
+        // New share properly created
+        sharesLiveData.postValue(
+            Resource.success(
+                publicShares
+            )
+        )
 
         // Check whether the dialog to create the public share has been properly closed
         onView(withText(R.string.share_via_link_create_title)).check(doesNotExist())
         onView(withText(newPublicShare.name)).check(matches(isDisplayed()))
+
+        unregisterCreateShareFragmentAsIdlingResource(createShareFragmentIdlingResource)
     }
 
     @Test
@@ -230,35 +254,71 @@ class CreatePublicShareTest {
         /**
          * 1st public share
          */
+        onView(withId(R.id.addPublicLinkButton)).perform(click())
+
+        val createShareFragmentIdlingResource = registerCreateShareFragmentAsIdlingResource()
+
         val newPublicShare1 = publicShares[0]
+        savePublicShare(newPublicShare1)
 
-        createPublicShareSuccesfully(newPublicShare1, arrayListOf(newPublicShare1))
+        // New share properly created
+        sharesLiveData.postValue(
+            Resource.success(
+                arrayListOf(newPublicShare1)
+            )
+        )
 
         // Check whether the dialog to create the public share has been properly closed
         onView(withText(R.string.share_via_link_create_title)).check(doesNotExist())
         onView(withText(newPublicShare1.name)).check(matches(isDisplayed()))
 
+        unregisterCreateShareFragmentAsIdlingResource(createShareFragmentIdlingResource)
+
         /**
          * 2nd public share
          */
+        onView(withId(R.id.addPublicLinkButton)).perform(click())
+
+        val create2ndShareFragmentIdlingResource = registerCreateShareFragmentAsIdlingResource()
+
         val newPublicShare2 = publicShares[1]
+        savePublicShare(newPublicShare2)
 
-        createPublicShareSuccesfully(newPublicShare2, publicShares.take(2))
+        // New share properly created
+        sharesLiveData.postValue(
+            Resource.success(
+                publicShares.take(2)
+            )
+        )
 
         // Check whether the dialog to create the public share has been properly closed
         onView(withText(R.string.share_via_link_create_title)).check(doesNotExist())
         onView(withText(newPublicShare2.name)).check(matches(isDisplayed()))
 
+        unregisterCreateShareFragmentAsIdlingResource(create2ndShareFragmentIdlingResource)
+
         /**
          * 3rd public share
          */
+        onView(withId(R.id.addPublicLinkButton)).perform(click())
+
+        val create3rdShareFragmentIdlingResource = registerCreateShareFragmentAsIdlingResource()
+
         val newPublicShare3 = publicShares[2]
+        savePublicShare(newPublicShare3)
 
-        createPublicShareSuccesfully(newPublicShare3, publicShares)
+        // New share properly created
+        sharesLiveData.postValue(
+            Resource.success(
+                publicShares
+            )
+        )
 
         // Check whether the dialog to create the public share has been properly closed
         onView(withText(R.string.share_via_link_create_title)).check(doesNotExist())
         onView(withText(newPublicShare3.name)).check(matches(isDisplayed()))
+
+        unregisterCreateShareFragmentAsIdlingResource(create3rdShareFragmentIdlingResource)
     }
 
     private fun getOCFileForTesting(name: String = "default") = OCFile("/Photos").apply {
@@ -286,7 +346,7 @@ class CreatePublicShareTest {
         sharesLiveData.postValue(Resource.success(shares))
     }
 
-    private fun createPublicShareSuccesfully(newShare: OCShare, sharesAfterCreation: List<OCShare>) {
+    private fun savePublicShare(newShare: OCShare) {
         `when`(
             ocShareViewModel.insertPublicShareForFile(
                 1,
@@ -295,19 +355,27 @@ class CreatePublicShareTest {
                 -1,
                 false
             )
-        ).thenReturn(sharesLiveData)
-
-        // 1. Open dialog to create new public share
-        onView(withId(R.id.addPublicLinkButton)).perform(click())
+        ).thenReturn(
+            MutableLiveData<Resource<Unit>>().apply {
+                postValue(Resource.success())
+            }
+        )
 
-        // 2. Save share
         onView(withId(R.id.saveButton)).perform(click())
+    }
 
-        // 3. New share properly created
-        sharesLiveData.postValue(
-            Resource.success(
-                sharesAfterCreation
-            )
+    private fun registerCreateShareFragmentAsIdlingResource(): FragmentVisibilityIdlingResource {
+        val idlingResource = FragmentVisibilityIdlingResource(
+            activityRule.activity.supportFragmentManager.findFragmentByTag(ShareActivity.TAG_PUBLIC_SHARE_DIALOG_FRAGMENT),
+            View.VISIBLE
         )
+        IdlingRegistry.getInstance().register(idlingResource)
+        return idlingResource
+    }
+
+    private fun unregisterCreateShareFragmentAsIdlingResource(
+        fragmentVisibilityIdlingResource: FragmentVisibilityIdlingResource
+    ) {
+        IdlingRegistry.getInstance().unregister(fragmentVisibilityIdlingResource)
     }
 }