New arch/shares

build.gradle

@@ -1,13 +1,32 @@
 buildscript {
-    ext.kotlin_version = '1.3.11'
+    ext {
+        // Android jetpack
+        archLifecycleVersion = '2.0.0'
+        roomVersion = '2.0.0'
+
+        // Kotlin
+        kotlinVersion = '1.3.21'
+
+        // Koin
+        koinVersion = '2.0.1'
+
+        // Testing
+        junitVersion = "4.12"
+        mockitoVersion = "2.24.0"
+
+        // Extensions
+        ktxVersion = "1.0.0"
+    }
 
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
-#Mon May 07 09:46:04 CEST 2018
+#Thu Apr 25 08:58:52 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
-distributionSha256Sum=b7aedd369a26b177147bcb715f8b1fc4fe32b0a6ade0d7fd8ee5ed0c6f731f2c
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionSha256Sum=53b71812f18cdb2777e9f1b2a0f2038683907c90bdc406bc64d8b400e1fb2c3b

owncloudApp/build.gradle

@@ -1,13 +1,15 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-allopen'
+apply plugin: 'kotlin-android-extensions'
 
 def commitSHA1 = 'COMMIT_SHA1'
 def gitRemote = 'GIT_REMOTE'
 
 dependencies {
     /// dependencies for app building
     implementation project(':owncloud-android-library:owncloudComLibrary')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.legacy:legacy-support-v4:$androidX"
     implementation "androidx.annotation:annotation:1.0.1"
     implementation 'com.google.android.material:material:1.0.0'
@@ -19,32 +21,64 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation "androidx.browser:browser:$androidX"
     implementation 'commons-io:commons-io:2.6'
-    /// dependencies for local unit tests
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.mockito:mockito-core:2.19.0'
-    /// dependencies for instrumented tests
+
+    // Dependencies for unit tests
+    testImplementation "junit:junit:$junitVersion"
+    testImplementation "androidx.arch.core:core-testing:$archLifecycleVersion"
+    testImplementation "org.mockito:mockito-core:$mockitoVersion"
+
+    // Dependencies for instrumented tests
+    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     // JUnit4 Rules
     androidTestImplementation 'androidx.test:rules:1.1.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.0'
     // Android JUnit Runner
     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'
     // 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
     androidTestImplementation 'androidx.annotation:annotation:1.0.1'
+    androidTestImplementation "androidx.room:room-testing:$roomVersion"
+    androidTestImplementation "androidx.arch.core:core-testing:$archLifecycleVersion"
+    androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
+    androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
+
     // Image loading
     implementation('com.github.bumptech.glide:glide:4.6.1') {
         exclude group: "com.android.support"
     }
 
     //Zooming Android ImageView.
     implementation 'com.github.chrisbanes:PhotoView:2.1.4'
+
     // Convert Java Objects into JSON and back
     implementation 'com.google.code.gson:gson:2.8.5'
+
+    // Kotlin
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+
+    // Architecture lifecycle components
+    implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$archLifecycleVersion"
+    kapt "androidx.lifecycle:lifecycle-compiler:$archLifecycleVersion"
+
+    // Room
+    implementation "androidx.room:room-runtime:$roomVersion"
+    kapt "androidx.room:room-compiler:$roomVersion"
+
+    // Koin dependency injector
+    implementation "org.koin:koin-androidx-viewmodel:$koinVersion"
+
+    // Kotlin extensions
+    implementation "androidx.core:core-ktx:$ktxVersion"
 }
 
 tasks.withType(Test) {
@@ -54,6 +88,11 @@ tasks.withType(Test) {
     }
 }
 
+allOpen {
+    // allows mocking for classes w/o directly opening them for release builds
+    annotation 'com.owncloud.android.testing.OpenClass'
+}
+
 android {
     compileSdkVersion 28
 
@@ -87,6 +126,11 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
+    sourceSets {
+        androidTest.java.srcDirs += "src/test-common/java"
+        test.java.srcDirs += "src/test-common/java"
+    }
+
     lintOptions {
         abortOnError false
         disable 'MissingTranslation'
@@ -128,6 +172,11 @@ android {
         def appName = System.env.OC_APP_NAME
         setOutputFileName(variant, appName, project)
     }
+
+    testOptions {
+        unitTests.returnDefaultValues = true
+        animationsDisabled = true
+    }
 }
 
 // Updates output file names of a given variant to format

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

@@ -0,0 +1,118 @@
+/**
+ * ownCloud Android client application
+ *
+ * @author David González Verdugo
+ * Copyright (C) 2019 ownCloud GmbH.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+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
+import com.owncloud.android.utils.LiveDataTestUtil.getValue
+import com.owncloud.android.utils.TestUtil
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestRule
+import org.mockito.Mockito.`when`
+import org.mockito.Mockito.mock
+
+class OCLocalCapabilitiesDataSourceTest {
+    private lateinit var ocLocalCapabilitiesDataSource: OCLocalCapabilitiesDataSource
+    private val ocCapabilityDao = mock(OCCapabilityDao::class.java)
+
+    @Rule
+    @JvmField
+    var rule: TestRule = InstantTaskExecutorRule()
+
+    @Before
+    fun init() {
+        val db = mock(OwncloudDatabase::class.java)
+        `when`(db.capabilityDao()).thenReturn(ocCapabilityDao)
+
+        val capabilityAsLiveData: MutableLiveData<OCCapability> = MutableLiveData()
+        capabilityAsLiveData.value = TestUtil.createCapability(
+            "user@server1", 5, 4, 3
+        )
+
+        `when`(
+            ocCapabilityDao.getCapabilityForAccount(
+                "user@server1"
+            )
+        ).thenReturn(
+            capabilityAsLiveData
+        )
+
+        val newCapabilityAsLiveData: MutableLiveData<OCCapability> = MutableLiveData()
+        newCapabilityAsLiveData.value = TestUtil.createCapability(
+            "user@server2", 2, 1, 0
+        )
+
+        `when`(
+            ocCapabilityDao.getCapabilityForAccount(
+                "user@server2"
+            )
+        ).thenReturn(
+            newCapabilityAsLiveData
+        )
+
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+
+        ocLocalCapabilitiesDataSource = OCLocalCapabilitiesDataSource(context, ocCapabilityDao)
+    }
+
+    @Test
+    fun readLocalCapability() {
+        val capability = getValue(
+            ocLocalCapabilitiesDataSource.getCapabilityForAccountAsLiveData(
+                "user@server1"
+            )
+        )
+        assertEquals("user@server1", capability.accountName)
+        assertEquals(5, capability.versionMayor)
+        assertEquals(4, capability.versionMinor)
+        assertEquals(3, capability.versionMicro)
+    }
+
+    @Test
+    fun insertCapabilityAndRead() {
+        ocLocalCapabilitiesDataSource.insert(
+            listOf(
+                TestUtil.createCapability(
+                    "user@server1", 7, 6, 5
+                ),
+                TestUtil.createCapability(
+                    "user@server2", 2, 1, 0
+                )
+            )
+        )
+
+        val capability = getValue(
+            ocLocalCapabilitiesDataSource.getCapabilityForAccountAsLiveData(
+                "user@server2"
+            )
+        )
+        assertEquals("user@server2", capability.accountName)
+        assertEquals(2, capability.versionMayor)
+        assertEquals(1, capability.versionMinor)
+        assertEquals(0, capability.versionMicro)
+    }
+}