From 5934fe8e0a2a31cab742d80522d1c3abd31c3b92 Mon Sep 17 00:00:00 2001
From: Robin Linden <dev@robinlinden.eu>
Date: Tue, 28 Dec 2021 19:37:34 +0100
Subject: [PATCH] Fix androidTest tests not compiling

---
 atox/src/androidTest/kotlin/IntegrationTest.kt | 2 +-
 domain/build.gradle.kts                        | 5 +++++
 domain/src/androidTest/kotlin/tox/ToxTest.kt   | 8 ++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/atox/src/androidTest/kotlin/IntegrationTest.kt b/atox/src/androidTest/kotlin/IntegrationTest.kt
index c20e1940..d3a793c1 100644
--- a/atox/src/androidTest/kotlin/IntegrationTest.kt
+++ b/atox/src/androidTest/kotlin/IntegrationTest.kt
@@ -29,9 +29,9 @@ import javax.inject.Singleton
 import ltd.evilcorp.atox.di.AndroidModule
 import ltd.evilcorp.atox.di.AppComponent
 import ltd.evilcorp.atox.di.AppModule
+import ltd.evilcorp.atox.di.DaoModule
 import ltd.evilcorp.atox.di.ViewModelModule
 import ltd.evilcorp.core.db.Database
-import ltd.evilcorp.core.di.DaoModule
 import ltd.evilcorp.domain.tox.PublicKey
 import ltd.evilcorp.domain.tox.SaveManager
 import org.hamcrest.core.AllOf.allOf
diff --git a/domain/build.gradle.kts b/domain/build.gradle.kts
index 1251dac8..df5b2b4e 100644
--- a/domain/build.gradle.kts
+++ b/domain/build.gradle.kts
@@ -96,5 +96,10 @@ dependencies {
     testImplementation(Test.junit)
     androidTestImplementation(AndroidX.Test.runner)
     androidTestImplementation(AndroidX.Test.Ext.junit)
+    androidTestImplementation(Google.Guava.workaround)
+    androidTestImplementation(KotlinX.Coroutines.test) {
+        // Conflicts with a lot of things due to having embedded "byte buddy" instead of depending on it.A
+        exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-debug")
+    }
     androidTestImplementation(Test.mockk)
 }
diff --git a/domain/src/androidTest/kotlin/tox/ToxTest.kt b/domain/src/androidTest/kotlin/tox/ToxTest.kt
index 6fa94f56..aca949a1 100644
--- a/domain/src/androidTest/kotlin/tox/ToxTest.kt
+++ b/domain/src/androidTest/kotlin/tox/ToxTest.kt
@@ -7,15 +7,23 @@ package ltd.evilcorp.domain.tox
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import io.mockk.mockk
 import java.lang.Thread.sleep
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.TestCoroutineDispatcher
+import kotlinx.coroutines.test.TestCoroutineScope
 import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
 class ToxTest {
+    @ExperimentalCoroutinesApi
     @Test
     fun quitting_does_not_crash() {
+        val dispatcher = TestCoroutineDispatcher()
+        val scope = TestCoroutineScope(dispatcher)
+
         repeat(10) {
             val tox = Tox(
+                scope,
                 mockk(relaxUnitFun = true),
                 mockk(relaxUnitFun = true),
                 mockk(relaxUnitFun = true),