A fully functional Android app built entirely with Kotlin and Jetpack Compose
Fix sync tests
Adetunji Dahunsib5d7832549e7
diff --git a/sync/build.gradle b/sync/build.gradleindex f29346e6d..413dd449c 100644--- a/sync/build.gradle+++ b/sync/build.gradle@@ -21,7 +21,14 @@ plugins {id 'nowinandroid.spotless'}+android {+ defaultConfig {+ testInstrumentationRunner "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"+ }+}+dependencies {+ implementation project(':core-common')implementation project(':core-model')implementation project(':core-domain')implementation project(':core-datastore')@@ -41,6 +48,9 @@ dependencies {androidTestImplementation libs.androidx.work.testing+ kaptAndroidTest libs.hilt.compiler+ kaptAndroidTest libs.hilt.ext.compiler+configurations.configureEach {resolutionStrategy {// Temporary workaround for https://issuetracker.google.com/174733673diff --git a/sync/src/androidTest/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt b/sync/src/androidTest/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.ktindex e3ecc6944..3f3fa9d8e 100644--- a/sync/src/androidTest/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt+++ b/sync/src/androidTest/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorkerTest.kt@@ -19,19 +19,23 @@ package com.google.samples.apps.nowinandroid.sync.workersimport android.util.Logimport androidx.test.platform.app.InstrumentationRegistryimport androidx.work.Configuration-import androidx.work.PeriodicWorkRequestBuilderimport androidx.work.WorkInfoimport androidx.work.WorkManagerimport androidx.work.testing.SynchronousExecutorimport androidx.work.testing.WorkManagerTestInitHelper-import androidx.work.workDataOf-import java.util.concurrent.TimeUnit+import dagger.hilt.android.testing.HiltAndroidRule+import dagger.hilt.android.testing.HiltAndroidTestimport org.junit.Assert.assertEqualsimport org.junit.Before+import org.junit.Ruleimport org.junit.Test+@HiltAndroidTestclass SyncWorkerTest {+ @get:Rule(order = 0)+ val hiltRule = HiltAndroidRule(this)+private val context get() = InstrumentationRegistry.getInstrumentation().context@Before@@ -46,26 +50,26 @@ class SyncWorkerTest {}@Test- fun testSyncPeriodicWork() {- // Define input data- val input = workDataOf()-+ fun testSyncWork() {// Create request- val request = PeriodicWorkRequestBuilder<SyncWorker>(15, TimeUnit.MINUTES)- .setInputData(input)- .build()+ val request = SyncWorker.startUpSyncWork()val workManager = WorkManager.getInstance(context)val testDriver = WorkManagerTestInitHelper.getTestDriver(context)!!// Enqueue and wait for result.workManager.enqueue(request).result.get()- // Tells the testing framework the period delay is met- testDriver.setPeriodDelayMet(request.id)+// Get WorkInfo and outputData- val workInfo = workManager.getWorkInfoById(request.id).get()+ val preRunWorkInfo = workManager.getWorkInfoById(request.id).get()// Assert- assertEquals(workInfo.state, WorkInfo.State.ENQUEUED)+ assertEquals(WorkInfo.State.ENQUEUED, preRunWorkInfo.state)++ // Tells the testing framework that the constraints have been met+ testDriver.setAllConstraintsMet(request.id)++ val postRequirementWorkInfo = workManager.getWorkInfoById(request.id).get()+ assertEquals(WorkInfo.State.RUNNING, postRequirementWorkInfo.state)}}diff --git a/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt b/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.ktindex 87e451b05..b76b73b09 100644--- a/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt+++ b/sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt@@ -29,13 +29,16 @@ import com.google.samples.apps.nowinandroid.core.domain.Synchronizerimport com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepositoryimport com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepositoryimport com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository+import com.google.samples.apps.nowinandroid.core.network.Dispatcher+import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IOimport com.google.samples.apps.nowinandroid.sync.initializers.SyncConstraintsimport com.google.samples.apps.nowinandroid.sync.initializers.syncForegroundInfoimport dagger.assisted.Assistedimport dagger.assisted.AssistedInject+import kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.asyncimport kotlinx.coroutines.awaitAll-import kotlinx.coroutines.coroutineScope+import kotlinx.coroutines.withContext/*** Syncs the data layer by delegating to the appropriate repository instances with@@ -49,12 +52,13 @@ class SyncWorker @AssistedInject constructor(private val topicRepository: TopicsRepository,private val newsRepository: NewsRepository,private val authorsRepository: AuthorsRepository,+ @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher,) : CoroutineWorker(appContext, workerParams), Synchronizer {override suspend fun getForegroundInfo(): ForegroundInfo =appContext.syncForegroundInfo()- override suspend fun doWork(): Result = coroutineScope {+ override suspend fun doWork(): Result = withContext(ioDispatcher) {// First sync the repositories in parallelval syncedSuccessfully = awaitAll(async { topicRepository.sync() },