Move Android test as jvm test: TabDataRepository, and fix flaky test #5316
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /* | ||
| * Copyright (c) 2024 DuckDuckGo | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
|
|
@@ -14,15 +14,13 @@ | |
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.duckduckgo.tabs.model | ||
|
|
||
| import androidx.arch.core.executor.testing.InstantTaskExecutorRule | ||
| import androidx.lifecycle.MutableLiveData | ||
| import androidx.room.Room | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4 | ||
| import androidx.test.platform.app.InstrumentationRegistry | ||
| import com.duckduckgo.app.browser.DuckDuckGoUrlDetector | ||
| import com.duckduckgo.app.browser.certificates.BypassedSSLCertificatesRepository | ||
| import com.duckduckgo.app.browser.favicon.FaviconManager | ||
|
|
@@ -31,24 +29,42 @@ import com.duckduckgo.app.global.db.AppDatabase | |
| import com.duckduckgo.app.global.model.SiteFactoryImpl | ||
| import com.duckduckgo.app.privacy.db.UserAllowListRepository | ||
| import com.duckduckgo.app.tabs.db.TabsDao | ||
| import com.duckduckgo.app.tabs.model.TabDataRepository | ||
| import com.duckduckgo.app.tabs.model.TabEntity | ||
| import com.duckduckgo.app.tabs.model.TabSelectionEntity | ||
| import com.duckduckgo.app.tabs.store.TabSwitcherDataStore | ||
| import com.duckduckgo.app.trackerdetection.EntityLookup | ||
| import com.duckduckgo.common.test.CoroutineTestRule | ||
| import com.duckduckgo.common.test.InstantSchedulersRule | ||
| import com.duckduckgo.common.test.blockingObserve | ||
| import com.duckduckgo.common.utils.CurrentTimeProvider | ||
| import com.duckduckgo.duckplayer.api.DuckPlayer | ||
| import com.duckduckgo.privacy.config.api.ContentBlocking | ||
| import java.time.Instant | ||
| import java.time.LocalDateTime | ||
| import java.time.ZoneOffset | ||
| import kotlinx.coroutines.channels.Channel | ||
| import kotlinx.coroutines.flow.consumeAsFlow | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.test.runTest | ||
| import org.junit.After | ||
| import org.junit.Assert.assertEquals | ||
| import org.junit.Assert.assertFalse | ||
| import org.junit.Assert.assertNotNull | ||
| import org.junit.Assert.assertNotSame | ||
| import org.junit.Assert.assertTrue | ||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.mockito.kotlin.any | ||
| import org.mockito.kotlin.anyOrNull | ||
| import org.mockito.kotlin.argumentCaptor | ||
| import org.mockito.kotlin.eq | ||
| import org.mockito.kotlin.mock | ||
| import org.mockito.kotlin.verify | ||
| import org.mockito.kotlin.whenever | ||
|
|
||
| @RunWith(AndroidJUnit4::class) | ||
| class TabDataRepositoryTest { | ||
|
|
||
| @get:Rule | ||
|
|
@@ -206,6 +222,7 @@ class TabDataRepositoryTest { | |
| val existingTabs = listOf(tab0) | ||
|
|
||
| whenever(mockDao.tabs()).thenReturn(existingTabs) | ||
| whenever(mockDao.lastTab()).thenReturn(existingTabs.last()) | ||
|
|
||
| testee.add("http://www.example.com") | ||
|
|
||
|
|
@@ -468,7 +485,7 @@ class TabDataRepositoryTest { | |
| @Test | ||
| fun getActiveTabCountReturnsCorrectCountWhenTabsYoungerThanSpecifiedDay() = runTest { | ||
|
There was a problem hiding this comment. @0nko after fixing the flaky test, this one is now failing. Can you evaluate the expected result? There was a problem hiding this comment. The fake DateTime provider revealed the timing issue, which made it pass even though it shouldn’t, nice! 👍 It’s not this test that’s failing, it’s |
||
| // Arrange: No tabs in the repository | ||
| val now = now() | ||
| val tab1 = TabEntity(tabId = "tab1", lastAccessTime = now.minusDays(6)) | ||
| val tab2 = TabEntity(tabId = "tab2", lastAccessTime = now.minusDays(8)) | ||
| val tab3 = TabEntity(tabId = "tab3", lastAccessTime = now.minusDays(10)) | ||
|
|
@@ -497,10 +514,10 @@ class TabDataRepositoryTest { | |
| @Test | ||
| fun getInactiveTabCountReturnsCorrectCountWhenAllTabsOlderThanSpecifiedDay() = runTest { | ||
| // Arrange: Add some tabs with different last access times | ||
| val now = now() | ||
| val tab1 = TabEntity(tabId = "tab1", lastAccessTime = now.minusDays(8)) | ||
| val tab2 = TabEntity(tabId = "tab2", lastAccessTime = now.minusDays(10)) | ||
| val tab3 = TabEntity(tabId = "tab3", lastAccessTime = now.minusDays(9).minusSeconds(1)) | ||
| val tab4 = TabEntity(tabId = "tab4") | ||
| whenever(mockDao.tabs()).thenReturn(listOf(tab1, tab2, tab3, tab4)) | ||
| val testee = tabDataRepository() | ||
|
|
@@ -514,7 +531,7 @@ class TabDataRepositoryTest { | |
| @Test | ||
| fun getInactiveTabCountReturnsCorrectCountWhenAllTabsInactiveWithinRange() = runTest { | ||
| // Arrange: Add some tabs with different last access times | ||
| val now = now() | ||
| val tab1 = TabEntity(tabId = "tab1", lastAccessTime = now.minusDays(8)) | ||
| val tab2 = TabEntity(tabId = "tab2", lastAccessTime = now.minusDays(10)) | ||
| val tab3 = TabEntity(tabId = "tab3", lastAccessTime = now.minusDays(9)) | ||
|
|
@@ -531,7 +548,7 @@ class TabDataRepositoryTest { | |
| @Test | ||
| fun getInactiveTabCountReturnsZeroWhenNoTabsInactiveWithinRange() = runTest { | ||
| // Arrange: Add some tabs with different last access times | ||
| val now = now() | ||
| val tab1 = TabEntity(tabId = "tab1", lastAccessTime = now.minusDays(5)) | ||
| val tab2 = TabEntity(tabId = "tab2", lastAccessTime = now.minusDays(6)) | ||
| val tab3 = TabEntity(tabId = "tab3", lastAccessTime = now.minusDays(13)) | ||
|
|
@@ -548,7 +565,7 @@ class TabDataRepositoryTest { | |
| @Test | ||
| fun getInactiveTabCountReturnsCorrectCountWhenSomeTabsInactiveWithinRange() = runTest { | ||
| // Arrange: Add some tabs with different last access times | ||
| val now = now() | ||
| val tab1 = TabEntity(tabId = "tab1", lastAccessTime = now.minusDays(5)) | ||
| val tab2 = TabEntity(tabId = "tab2", lastAccessTime = now.minusDays(10)) | ||
| val tab3 = TabEntity(tabId = "tab3", lastAccessTime = now.minusDays(15)) | ||
|
|
@@ -572,6 +589,7 @@ class TabDataRepositoryTest { | |
| faviconManager: FaviconManager = mock(), | ||
| tabSwitcherDataStore: TabSwitcherDataStore = mock(), | ||
| duckDuckGoUrlDetector: DuckDuckGoUrlDetector = mock(), | ||
| timeProvider: CurrentTimeProvider = FakeTimeProvider(), | ||
| ): TabDataRepository { | ||
| return TabDataRepository( | ||
| dao, | ||
|
|
@@ -588,6 +606,7 @@ class TabDataRepositoryTest { | |
| webViewPreviewPersister, | ||
| faviconManager, | ||
| tabSwitcherDataStore, | ||
| timeProvider, | ||
| coroutinesTestRule.testScope, | ||
| coroutinesTestRule.testDispatcherProvider, | ||
| ) | ||
|
|
@@ -608,7 +627,19 @@ class TabDataRepositoryTest { | |
| return mockDao | ||
| } | ||
|
|
||
| private fun now(): LocalDateTime { | ||
| return FakeTimeProvider().localDateTimeNow() | ||
| } | ||
|
|
||
| companion object { | ||
| const val TAB_ID = "abcd" | ||
| } | ||
|
|
||
| private class FakeTimeProvider : CurrentTimeProvider { | ||
| var currentTime: Instant = Instant.parse("2024-10-16T00:00:00.00Z") | ||
|
|
||
| override fun currentTimeMillis(): Long = currentTime.toEpochMilli() | ||
| override fun elapsedRealtime(): Long = throw UnsupportedOperationException() | ||
| override fun localDateTimeNow(): LocalDateTime = currentTime.atZone(ZoneOffset.UTC).toLocalDateTime() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright (c) 2024 DuckDuckGo | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.duckduckgo.common.test | ||
|
|
||
| import androidx.lifecycle.LiveData | ||
| import androidx.lifecycle.Observer | ||
| import java.util.concurrent.CountDownLatch | ||
| import java.util.concurrent.TimeUnit | ||
|
|
||
| // https://stackoverflow.com/a/44991770/73479 | ||
| fun <T> LiveData<T>.blockingObserve(): T? { | ||
| var value: T? = null | ||
| val latch = CountDownLatch(1) | ||
| val innerObserver = Observer<T> { | ||
| value = it | ||
| latch.countDown() | ||
| } | ||
| observeForever(innerObserver) | ||
| latch.await(2, TimeUnit.SECONDS) | ||
| return value | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.