Merge branch 'master' of github.com:PolymerLabs/arcs into r2p

Author: alxmrs

javatests/arcs/android/host/AndroidAllocatorTest.kt

@@ -13,7 +13,6 @@ package arcs.android.host
 
 import android.content.Context
 import androidx.lifecycle.Lifecycle
-import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.work.testing.WorkManagerTestInitHelper
@@ -26,12 +25,9 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.TestCoroutineScope
-import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
 import org.junit.runner.RunWith
 import org.robolectric.Robolectric
-import kotlin.coroutines.CoroutineContext
 
 /**
  * These tests are the same as [AllocatorTestBase] but run with Android Services,
@@ -82,24 +78,4 @@ open class AndroidAllocatorTest : AllocatorTestBase() {
         writingService = Robolectric.setupService(TestWritingExternalHostService::class.java)
         super.setUp()
     }
-
-    override fun runAllocatorTest(
-        coroutineContext: CoroutineContext,
-        testBody: suspend TestCoroutineScope.() -> Unit
-    ) = runBlockingTest(coroutineContext) {
-        val scenario = ActivityScenario.launch(TestActivity::class.java)
-
-        scenario.moveToState(Lifecycle.State.STARTED)
-
-        val activityJob = launch {
-            scenario.onActivity { activity ->
-                runBlocking {
-                    this@runBlockingTest.testBody()
-                }
-                scenario.close()
-            }
-        }
-
-        activityJob.join()
-    }
 }

javatests/arcs/android/host/AndroidEntityHandleManagerTest.kt

@@ -2,7 +2,8 @@ package arcs.android.host
 
 import android.app.Application
 import androidx.lifecycle.Lifecycle
-import androidx.test.core.app.ActivityScenario
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.work.testing.WorkManagerTestInitHelper
@@ -27,8 +28,6 @@ import arcs.sdk.android.storage.service.testutil.TestBindingDelegate
 import com.google.common.truth.Truth.assertThat
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.TestCoroutineScope
-import kotlinx.coroutines.test.runBlockingTest
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -38,12 +37,15 @@ typealias Person = TestParticleInternal1
 
 @Suppress("EXPERIMENTAL_API_USAGE")
 @RunWith(AndroidJUnit4::class)
-class AndroidEntityHandleManagerTest {
+class AndroidEntityHandleManagerTest : LifecycleOwner {
     private lateinit var app: Application
+    private lateinit var lifecycle: LifecycleRegistry
+    override fun getLifecycle() = lifecycle
 
     val entity1 = Person("Jason", 21.0, false)
     val entity2 = Person("Jason", 22.0, true)
     lateinit var handleHolder: TestParticleHandles
+    private lateinit var handleManager: EntityHandleManager
 
     private val schema = Schema(
         listOf(SchemaName("Person")),
@@ -69,37 +71,24 @@ class AndroidEntityHandleManagerTest {
     @Before
     fun setUp() {
         app = ApplicationProvider.getApplicationContext()
-        app.setTheme(R.style.Theme_AppCompat);
+        lifecycle = LifecycleRegistry(this).apply {
+            setCurrentState(Lifecycle.State.CREATED)
+            setCurrentState(Lifecycle.State.STARTED)
+            setCurrentState(Lifecycle.State.RESUMED)
+        }
 
         // Initialize WorkManager for instrumentation tests.
         WorkManagerTestInitHelper.initializeTestWorkManager(app)
 
         handleHolder = TestParticleHandles()
-    }
 
-    fun handleManagerTest(
-        block: suspend TestCoroutineScope.(EntityHandleManager) -> Unit
-    ) = runBlockingTest {
-        val scenario = ActivityScenario.launch(TestActivity::class.java)
-
-        scenario.moveToState(Lifecycle.State.STARTED)
-
-        val activityJob = launch {
-            scenario.onActivity { activity ->
-                val hf = AndroidHandleManager(
-                    lifecycle = activity.lifecycle, context = activity,
-                    connectionFactory = DefaultConnectionFactory(
-                        activity, TestBindingDelegate(app), coroutineContext
-                    ),
-                    coroutineContext = coroutineContext
-                )
-                runBlocking {
-                    this@runBlockingTest.block(EntityHandleManager(hf))
-                }
-                scenario.close()
-            }
-        }
-        activityJob.join()
+        handleManager = EntityHandleManager(
+            AndroidHandleManager(
+                lifecycle = lifecycle,
+                context = app,
+                connectionFactory = DefaultConnectionFactory(app, TestBindingDelegate(app))
+            )
+        )
     }
 
     private fun expectHandleException(handleName: String, block: () -> Unit) {
@@ -110,7 +99,7 @@ class AndroidEntityHandleManagerTest {
     }
 
     @Test
-    fun handle_uninitializedThrowsException() = handleManagerTest {
+    fun handle_uninitializedThrowsException() = runBlocking {
         expectHandleException("writeHandle") {
             handleHolder.writeHandle
         }
@@ -161,7 +150,7 @@ class AndroidEntityHandleManagerTest {
     )
 
     @Test
-    fun singletonHandle_writeFollowedByReadWithOnUpdate() = handleManagerTest { handleManager ->
+    fun singletonHandle_writeFollowedByReadWithOnUpdate() = runBlocking {
         val writeHandle = createSingletonHandle(
             handleManager,
             "writeHandle",
@@ -208,7 +197,7 @@ class AndroidEntityHandleManagerTest {
     }
 
     @Test
-    fun setHandle_writeFollowedByReadWithOnUpdate() = handleManagerTest { handleManager ->
+    fun setHandle_writeFollowedByReadWithOnUpdate() = runBlocking<Unit> {
         val writeSetHandle = createSetHandle(
             handleManager,
             "writeSetHandle",

javatests/arcs/android/host/AndroidManifest.xml

@@ -15,12 +15,6 @@
       </intent-filter>
     </service>
     <service android:name="arcs.sdk.android.service.StorageService" android:exported="false"/>
-    <activity android:name="arcs.android.host.TestActivity" >
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-    </activity>
   </application>
 
 </manifest>

javatests/arcs/android/host/BUILD

@@ -9,16 +9,6 @@ licenses(["notice"])
 
 package(default_visibility = ["//visibility:public"])
 
-kt_android_library(
-    name = "test_app",
-    testonly = 1,
-    srcs = ["TestActivity.kt"],
-    manifest = ":AndroidManifest.xml",
-    deps = [
-        "//third_party/java/androidx/appcompat",
-    ],
-)
-
 arcs_kt_android_test_suite(
     name = "host",
     srcs = glob(["*Test.kt"]),
@@ -27,7 +17,6 @@ arcs_kt_android_test_suite(
     deps = [
         ":schemas",
         ":services",
-        ":test_app",
         "//java/arcs/android/crdt",
         "//java/arcs/android/host",
         "//java/arcs/android/sdk/host",

javatests/arcs/android/host/TestActivity.kt

@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
-import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.work.testing.WorkManagerTestInitHelper

javatests/arcs/android/storage/handle/AndroidHandleManagerTest.kt

@@ -26,6 +26,7 @@ import arcs.core.testutil.assertSuspendingThrows
 import arcs.core.type.Type
 import arcs.jvm.host.ExplicitHostRegistry
 import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.test.TestCoroutineScope
@@ -73,8 +74,8 @@ open class AllocatorTestBase {
     open val storageCapability = Capabilities.TiedToRuntime
     open fun runAllocatorTest(
         coroutineContext: CoroutineContext = EmptyCoroutineContext,
-        testBody: suspend TestCoroutineScope.() -> Unit
-    ) = runBlockingTest(coroutineContext, testBody)
+        testBody: suspend CoroutineScope.() -> Unit
+    ) = runBlocking(coroutineContext) { testBody() }
 
     open suspend fun hostRegistry(): HostRegistry {
         val registry = ExplicitHostRegistry()