[New architecture] Whole flow tests for sharing

build.gradle

@@ -4,6 +4,7 @@ buildscript {
         kotlinVersion = '1.3.21'
         archLifecycleVersion = '2.0.0'
         roomVersion = '2.0.0'
+        koinVersion = '2.0.1'
 
         // Testing
         junitVersion = "4.12"

owncloudApp/build.gradle

@@ -36,12 +36,12 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.1'
     // Espresso core
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+    // Espresso contrib
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.1.1'
     // Espresso intents
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1'
     // Espresso web
     androidTestImplementation 'androidx.test.espresso:espresso-web:3.1.1'
-    // Espresso intents
-    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.0'
     // UIAutomator - for cross-app UI tests, and to grant screen is turned on in Espresso tests
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
     // fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
@@ -76,6 +76,9 @@ dependencies {
     // Room
     implementation "androidx.room:room-runtime:$roomVersion"
     kapt "androidx.room:room-compiler:$roomVersion"
+
+    // Koin dependency injector
+    implementation "org.koin:koin-androidx-viewmodel:$koinVersion"
 }
 
 tasks.withType(Test) {
@@ -172,7 +175,7 @@ android {
 
     testOptions {
         unitTests.returnDefaultValues = true
-        animationsDisabled = false
+        animationsDisabled = true
     }
 }
 

owncloudApp/src/test/java/com/owncloud/android/capabilities/datasource/OCLocalCapabilitiesDataSourceTest.kt → owncloudApp/src/androidTest/java/com/owncloud/android/capabilities/datasource/OCLocalCapabilitiesDataSourceTest.kt

@@ -21,6 +21,7 @@ package com.owncloud.android.capabilities.datasource
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
+import androidx.test.platform.app.InstrumentationRegistry
 import com.owncloud.android.capabilities.db.OCCapability
 import com.owncloud.android.capabilities.db.OCCapabilityDao
 import com.owncloud.android.db.OwncloudDatabase
@@ -73,7 +74,9 @@ class OCLocalCapabilitiesDataSourceTest {
             newCapabilityAsLiveData
         )
 
-        ocLocalCapabilitiesDataSource = OCLocalCapabilitiesDataSource(ocCapabilityDao)
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        ocLocalCapabilitiesDataSource = OCLocalCapabilitiesDataSource(context, ocCapabilityDao)
     }
 
     @Test

owncloudApp/src/test/java/com/owncloud/android/capabilities/viewmodel/OCCapabilityViewModelTest.kt → owncloudApp/src/androidTest/java/com/owncloud/android/capabilities/viewmodel/OCCapabilityViewModelTest.kt

@@ -22,6 +22,7 @@ package com.owncloud.android.capabilities.viewmodel
 import android.accounts.Account
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
+import androidx.test.platform.app.InstrumentationRegistry
 import com.owncloud.android.capabilities.db.OCCapability
 import com.owncloud.android.capabilities.repository.OCCapabilityRepository
 import com.owncloud.android.utils.TestUtil
@@ -38,7 +39,6 @@ import org.mockito.Mockito.mock
 @RunWith(JUnit4::class)
 class OCCapabilityViewModelTest {
     private var testAccount: Account = TestUtil.createAccount("admin@server", "test")
-
     private lateinit var capability: OCCapability
 
     @Rule
@@ -54,18 +54,20 @@ class OCCapabilityViewModelTest {
     fun loadCapability() {
         val ocCapabilityRepository = mock(OCCapabilityRepository::class.java)
 
-        val capabilityResourceAsLiveData: MutableLiveData<Resource<OCCapability>> = MutableLiveData()
-        capabilityResourceAsLiveData.value = Resource.success(capability)
-
         `when`(
             ocCapabilityRepository.loadCapabilityForAccount(
                 "admin@server"
             )
         ).thenReturn(
-            capabilityResourceAsLiveData
+            MutableLiveData<Resource<OCCapability>>().apply {
+                value = Resource.success(capability)
+            }
         )
 
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+
         val ocCapabilityViewModel = OCCapabilityViewModel(
+            context,
             account = testAccount,
             capabilityRepository = ocCapabilityRepository
         )

owncloudApp/src/test/java/com/owncloud/android/shares/datasource/OCLocalShareDataSourceTest.kt → owncloudApp/src/androidTest/java/com/owncloud/android/shares/datasource/OCLocalShareDataSourceTest.kt

@@ -21,6 +21,7 @@ package com.owncloud.android.shares.datasource
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.MutableLiveData
+import androidx.test.platform.app.InstrumentationRegistry
 import com.owncloud.android.db.OwncloudDatabase
 import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.shares.db.OCShare
@@ -115,7 +116,9 @@ class OCLocalDataSourceTest {
             1
         )
 
-        ocLocalSharesDataSource = OCLocalSharesDataSource(ocSharesDao)
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        ocLocalSharesDataSource = OCLocalSharesDataSource(context, ocSharesDao)
     }
 
     @Test

owncloudApp/src/androidTest/java/com/owncloud/android/shares/db/OCShareDaoTest.kt

@@ -25,6 +25,7 @@ import androidx.test.filters.SmallTest
 import androidx.test.platform.app.InstrumentationRegistry
 import com.owncloud.android.db.OwncloudDatabase
 import com.owncloud.android.lib.resources.shares.ShareType
+import com.owncloud.android.shares.db.OCShareDao
 import com.owncloud.android.utils.LiveDataTestUtil.getValue
 import com.owncloud.android.utils.TestUtil
 import junit.framework.Assert.assertEquals

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

@@ -23,6 +23,7 @@ import android.accounts.Account
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -102,6 +103,12 @@ class ShareFileFragmentTest {
     fun showPublicShares() {
         loadShareFileFragment()
         onView(withText("Image link")).check(matches(isDisplayed()))
+        onView(withText("Image link")).check(matches(hasSibling(withId(R.id.getPublicLinkButton))))
+            .check(matches(isDisplayed()))
+        onView(withText("Image link")).check(matches(hasSibling(withId(R.id.deletePublicLinkButton))))
+            .check(matches(isDisplayed()))
+        onView(withText("Image link")).check(matches(hasSibling(withId(R.id.editPublicLinkButton))))
+            .check(matches(isDisplayed()))
         onView(withText("Image link 2")).check(matches(isDisplayed()))
         onView(withText("Image link 3")).check(matches(isDisplayed()))
     }