WIP on tests

nbransby · nbransby · commit 25b869e1748c · 2020-05-03T00:50:40.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,7 +20,7 @@ buildscript {
 }
 
 val targetSdkVersion by extra(28)
-val minSdkVersion by extra(14)
+val minSdkVersion by extra(16)
 
 
 tasks {
@@ -140,8 +140,15 @@ subprojects {
             "iosMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-native:1.3.4")
             "commonTestImplementation"(kotlin("test-common"))
             "commonTestImplementation"(kotlin("test-annotations-common"))
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core-common:1.3.4")
+            "commonTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.3.4")
             "jsTestImplementation"(kotlin("test-js"))
-            "androidTestImplementation"(kotlin("test-junit"))
+            "androidAndroidTestImplementation"(kotlin("test-junit"))
+            "androidAndroidTestImplementation"("junit:junit:4.12")
+            "androidAndroidTestImplementation"("androidx.test:core:1.2.0")
+            "androidAndroidTestImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.4")
+            "androidAndroidTestImplementation"("androidx.test.ext:junit:1.1.1")
+            "androidAndroidTestImplementation"("androidx.test:runner:1.1.0")
         }
     }
 
diff --git a/firebase-app/build.gradle.kts b/firebase-app/build.gradle.kts
@@ -26,6 +26,14 @@ android {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
     }
+    testOptions {
+        unitTests.apply {
+            isIncludeAndroidResources = true
+        }
+    }
+    packagingOptions {
+        pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+    }
 }
 
 kotlin {
diff --git a/firebase-auth/build.gradle.kts b/firebase-auth/build.gradle.kts
@@ -11,11 +11,21 @@ android {
     defaultConfig {
         minSdkVersion(property("minSdkVersion") as Int)
         targetSdkVersion(property("targetSdkVersion") as Int)
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     sourceSets {
         getByName("main") {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
+        getByName("androidTest").java.srcDir(file("src/androidAndroidTest/kotlin"))
+    }
+    testOptions {
+        unitTests.apply {
+            isIncludeAndroidResources = true
+        }
+    }
+    packagingOptions {
+        pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
     }
 }
 
@@ -26,6 +36,8 @@ kotlin {
                 moduleKind = "commonjs"
             }
         }
+        nodejs()
+        browser()
     }
     android {
         publishLibraryVariants("release", "debug")
@@ -53,8 +65,7 @@ kotlin {
                 api("com.google.firebase:firebase-auth:19.1.0")
             }
         }
-//        val iosMain by creating
-        
+
         configure(listOf(iosArm64, iosX64)) {
             compilations.getByName("main") {
                 source(sourceSets.get("iosMain"))
diff --git a/firebase-auth/src/androidAndroidTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/androidAndroidTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+@file:JvmName("tests")
+package dev.gitlive.firebase.auth
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import dev.gitlive.firebase.Firebase
+import dev.gitlive.firebase.FirebaseOptions
+import dev.gitlive.firebase.initialize
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+val context: Any = InstrumentationRegistry.getInstrumentation().targetContext
+
+@RunWith(AndroidJUnit4::class)
+@SmallTest
+class FirebaseAuthTest {
+
+    @Before
+    fun initializeFirebase() {
+        Firebase.initialize(context, FirebaseOptions(
+            applicationId ="fir-kotlin-sdk",
+            apiKey = "AIzaSyDft_DSsVA7KPJj_GItUvMLjk6wbOdGBOs",
+            databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
+            storageBucket = "fir-kotlin-sdk.appspot.com",
+            projectId ="fir-kotlin-sdk"
+        ))
+
+    }
+
+    @org.junit.Test
+    fun testSignInWithUsernameAndPassword() = runBlocking {
+        val result = Firebase.auth.signInWithEmailAndPassword("test@test.com", "test123")
+        assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
+    }
+}
diff --git a/firebase-auth/src/iosTest/kotlin/dev/gitlive/firebase/auth/auth.kt b/firebase-auth/src/iosTest/kotlin/dev/gitlive/firebase/auth/auth.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase.auth
+
+import dev.gitlive.firebase.Firebase
+import dev.gitlive.firebase.FirebaseOptions
+import dev.gitlive.firebase.initialize
+import kotlinx.coroutines.runBlocking
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class FirebaseAuthTest {
+
+    @BeforeTest
+    fun initializeFirebase() {
+        Firebase.initialize(null, FirebaseOptions(
+            applicationId ="fir-kotlin-sdk",
+            apiKey = "AIzaSyDft_DSsVA7KPJj_GItUvMLjk6wbOdGBOs",
+            databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
+            storageBucket = "fir-kotlin-sdk.appspot.com",
+            projectId ="fir-kotlin-sdk"
+        ))
+
+    }
+
+    @Test
+    fun testSignInWithUsernameAndPassword() = runBlocking {
+        val result = Firebase.auth.signInWithEmailAndPassword("test@test.com", "test123")
+        assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
+    }
+}
diff --git a/firebase-auth/src/jsTest/kotlin/auth/auth.kt b/firebase-auth/src/jsTest/kotlin/auth/auth.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase.auth
+
+import dev.gitlive.firebase.Firebase
+import dev.gitlive.firebase.FirebaseOptions
+import dev.gitlive.firebase.initialize
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.promise
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+//expect val context: Any
+
+class FirebaseAuthTest {
+
+    @BeforeTest
+    fun initializeFirebase() {
+        Firebase.initialize(null, FirebaseOptions(
+            applicationId ="fir-kotlin-sdk",
+            apiKey = "AIzaSyDft_DSsVA7KPJj_GItUvMLjk6wbOdGBOs",
+            databaseUrl = "https://fir-kotlin-sdk.firebaseio.com",
+            storageBucket = "fir-kotlin-sdk.appspot.com",
+            projectId ="fir-kotlin-sdk"
+        ))
+
+    }
+
+    @Test
+    fun testSignInWithUsernameAndPassword() = GlobalScope.promise {
+        val result = Firebase.auth.signInWithEmailAndPassword("test@test.com", "test123")
+        assertEquals("mn8kgIFnxLO7il8GpTa5g0ObP6I2", result.user!!.uid)
+    }
+}
diff --git a/firebase-common/build.gradle.kts b/firebase-common/build.gradle.kts
@@ -22,6 +22,14 @@ android {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
     }
+    testOptions {
+        unitTests.apply {
+            isIncludeAndroidResources = true
+        }
+    }
+    packagingOptions {
+        pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+    }
 }
 
 kotlin {
@@ -62,7 +70,7 @@ kotlin {
         }
         val jsMain by getting {
             dependencies {
-//                implementation(npm("firebase", "6.2.3"))
+                api(npm("firebase", "7.14.0"))
                 api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")
             }
         }
diff --git a/firebase-database/build.gradle.kts b/firebase-database/build.gradle.kts
@@ -17,6 +17,14 @@ android {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
     }
+    testOptions {
+        unitTests.apply {
+            isIncludeAndroidResources = true
+        }
+    }
+    packagingOptions {
+        pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+    }
 }
 
 kotlin {
diff --git a/firebase-firestore/build.gradle.kts b/firebase-firestore/build.gradle.kts
@@ -17,6 +17,14 @@ android {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
     }
+    testOptions {
+        unitTests.apply {
+            isIncludeAndroidResources = true
+        }
+    }
+    packagingOptions {
+        pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+    }
 }
 
 kotlin {
diff --git a/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt b/firebase-firestore/src/commonTest/kotlin/dev/gitlive/firebase/firestore/firestore.kt
@@ -0,0 +1,5 @@
+/*
+ * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
+ */
+
+package dev.gitlive.firebase.firestore
diff --git a/firebase-functions/build.gradle.kts b/firebase-functions/build.gradle.kts
@@ -17,6 +17,14 @@ android {
             manifest.srcFile("src/androidMain/AndroidManifest.xml")
         }
     }
+    testOptions {
+        unitTests.apply {
+            isIncludeAndroidResources = true
+        }
+    }
+    packagingOptions {
+        pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")
+    }
 }
 
 kotlin {
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,6 @@
 kotlin.code.style=official
-kotlin.js.experimental.generateKotlinExternals=true
+kotlin.js.experimental.generateKotlinExternals=false
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx2560m
+org.gradle.jvmargs=-Xmx2560m
+android.useAndroidX=true
+testOptions.unitTests.isIncludeAndroidResources = true

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,14 @@ android {`
`26`	`26`	`manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`27`	`27`	`}`
`28`	`28`	`}`
	`29`	`+ testOptions {`
	`30`	`+ unitTests.apply {`
	`31`	`+ isIncludeAndroidResources = true`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+ packagingOptions {`
	`35`	`+ pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")`
	`36`	`+ }`
`29`	`37`	`}`
`30`	`38`
`31`	`39`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,21 @@ android {`
`11`	`11`	`defaultConfig {`
`12`	`12`	`minSdkVersion(property("minSdkVersion") as Int)`
`13`	`13`	`targetSdkVersion(property("targetSdkVersion") as Int)`
	`14`	`+ testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`14`	`15`	`}`
`15`	`16`	`sourceSets {`
`16`	`17`	`getByName("main") {`
`17`	`18`	`manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`18`	`19`	`}`
	`20`	`+ getByName("androidTest").java.srcDir(file("src/androidAndroidTest/kotlin"))`
	`21`	`+ }`
	`22`	`+ testOptions {`
	`23`	`+ unitTests.apply {`
	`24`	`+ isIncludeAndroidResources = true`
	`25`	`+ }`
	`26`	`+ }`
	`27`	`+ packagingOptions {`
	`28`	`+ pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")`
`19`	`29`	`}`
`20`	`30`	`}`
`21`	`31`
`@@ -26,6 +36,8 @@ kotlin {`
`26`	`36`	`moduleKind = "commonjs"`
`27`	`37`	`}`
`28`	`38`	`}`
	`39`	`+ nodejs()`
	`40`	`+ browser()`
`29`	`41`	`}`
`30`	`42`	`android {`
`31`	`43`	`publishLibraryVariants("release", "debug")`
`@@ -53,8 +65,7 @@ kotlin {`
`53`	`65`	`api("com.google.firebase:firebase-auth:19.1.0")`
`54`	`66`	`}`
`55`	`67`	`}`
`56`		`-// val iosMain by creating`
`57`		`-`
	`68`	`+`
`58`	`69`	`configure(listOf(iosArm64, iosX64)) {`
`59`	`70`	`compilations.getByName("main") {`
`60`	`71`	`source(sourceSets.get("iosMain"))`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,14 @@ android {`
`22`	`22`	`manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`23`	`23`	`}`
`24`	`24`	`}`
	`25`	`+ testOptions {`
	`26`	`+ unitTests.apply {`
	`27`	`+ isIncludeAndroidResources = true`
	`28`	`+ }`
	`29`	`+ }`
	`30`	`+ packagingOptions {`
	`31`	`+ pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")`
	`32`	`+ }`
`25`	`33`	`}`
`26`	`34`
`27`	`35`	`kotlin {`
`@@ -62,7 +70,7 @@ kotlin {`
`62`	`70`	`}`
`63`	`71`	`val jsMain by getting {`
`64`	`72`	`dependencies {`
`65`		`-// implementation(npm("firebase", "6.2.3"))`
	`73`	`+ api(npm("firebase", "7.14.0"))`
`66`	`74`	`api("org.jetbrains.kotlinx:kotlinx-serialization-runtime-js:0.20.0")`
`67`	`75`	`}`
`68`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,14 @@ android {`
`17`	`17`	`manifest.srcFile("src/androidMain/AndroidManifest.xml")`
`18`	`18`	`}`
`19`	`19`	`}`
	`20`	`+ testOptions {`
	`21`	`+ unitTests.apply {`
	`22`	`+ isIncludeAndroidResources = true`
	`23`	`+ }`
	`24`	`+ }`
	`25`	`+ packagingOptions {`
	`26`	`+ pickFirst("META-INF/kotlinx-serialization-runtime.kotlin_module")`
	`27`	`+ }`
`20`	`28`	`}`
`21`	`29`
`22`	`30`	`kotlin {`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +/*
 + * Copyright (c) 2020 GitLive Ltd.  Use of this source code is governed by the Apache 2.0 license.
 + */
++
 +package dev.gitlive.firebase.firestore