Fix CI issues

duckduckgo · Apr 10, 2024 · c64c6c8 · c64c6c8
1 parent d7a3e68
commit c64c6c8
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt
@@ -148,6 +148,7 @@ import com.duckduckgo.downloads.api.FileDownloader
 import com.duckduckgo.downloads.api.FileDownloader.PendingFileDownload
 import com.duckduckgo.feature.toggles.api.FeatureToggle
 import com.duckduckgo.feature.toggles.api.Toggle
+import com.duckduckgo.history.api.HistoryApi
 import com.duckduckgo.privacy.config.api.*
 import com.duckduckgo.privacy.config.impl.features.gpc.RealGpc
 import com.duckduckgo.privacy.config.impl.features.gpc.RealGpc.Companion.GPC_HEADER
@@ -244,6 +245,9 @@ class BrowserTabViewModelTest {
     @Mock
     private lateinit var mockSavedSitesRepository: SavedSitesRepository
 
+    @Mock
+    private lateinit var mockHistoryApi: HistoryApi
+
     @Mock
     private lateinit var mockLongPressHandler: LongPressHandler
 
@@ -447,7 +451,7 @@ class BrowserTabViewModelTest {
         fireproofWebsiteDao = db.fireproofWebsiteDao()
         locationPermissionsDao = db.locationPermissionsDao()
 
-        mockAutoCompleteApi = AutoCompleteApi(mockAutoCompleteService, mockSavedSitesRepository)
+        mockAutoCompleteApi = AutoCompleteApi(mockAutoCompleteService, mockSavedSitesRepository, mockHistoryApi)
         val fireproofWebsiteRepositoryImpl = FireproofWebsiteRepositoryImpl(
             fireproofWebsiteDao,
             coroutineRule.testDispatcherProvider,

diff --git a/app/src/androidTest/java/com/duckduckgo/app/history/HistoryDaoTest.kt b/app/src/androidTest/java/com/duckduckgo/app/history/HistoryDaoTest.kt
@@ -22,6 +22,7 @@ import androidx.test.platform.app.InstrumentationRegistry
 import com.duckduckgo.history.impl.store.HistoryDao
 import com.duckduckgo.history.impl.store.HistoryDatabase
 import com.duckduckgo.history.impl.store.HistoryEntryEntity
+import java.time.LocalDateTime
 import org.junit.After
 import org.junit.Assert
 import org.junit.Before
@@ -58,8 +59,8 @@ class HistoryDaoTest {
 
     @Test
     fun whenInsertSameUrlWithSameDateTwiceThenOnlyOneEntryAndOneVisitAreStored() {
-        historyDao.updateOrInsertVisit("url", "title", "query", false, 1L)
-        historyDao.updateOrInsertVisit("url", "title", "query", false, 1L)
+        historyDao.updateOrInsertVisit("url", "title", "query", false, LocalDateTime.now())
+        historyDao.updateOrInsertVisit("url", "title", "query", false, LocalDateTime.now())
 
         val historyEntriesWithVisits = historyDao.getHistoryEntriesWithVisits()
         Assert.assertEquals(1, historyEntriesWithVisits.count())
@@ -68,8 +69,8 @@ class HistoryDaoTest {
 
     @Test
     fun whenInsertSameUrlWithDifferentDateTwiceThenOneEntryAndTwoVisitsAreStored() {
-        historyDao.updateOrInsertVisit("url", "title", "query", false, 1L)
-        historyDao.updateOrInsertVisit("url", "title", "query", false, 2L)
+        historyDao.updateOrInsertVisit("url", "title", "query", false, LocalDateTime.now())
+        historyDao.updateOrInsertVisit("url", "title", "query", false, LocalDateTime.now())
 
         val historyEntriesWithVisits = historyDao.getHistoryEntriesWithVisits()
         Assert.assertEquals(1, historyEntriesWithVisits.count())

diff --git a/app/src/test/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt b/app/src/test/java/com/duckduckgo/app/autocomplete/api/AutoCompleteApiTest.kt
@@ -23,7 +23,7 @@ import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteBookmarkSuggestion
 import com.duckduckgo.app.autocomplete.api.AutoComplete.AutoCompleteSuggestion.AutoCompleteSearchSuggestion
 import com.duckduckgo.common.utils.formatters.time.DatabaseDateFormatter
-import com.duckduckgo.history.impl.HistoryRepository
+import com.duckduckgo.history.api.HistoryApi
 import com.duckduckgo.savedsites.api.SavedSitesRepository
 import com.duckduckgo.savedsites.api.models.SavedSite.Bookmark
 import com.duckduckgo.savedsites.api.models.SavedSite.Favorite
@@ -49,15 +49,15 @@ class AutoCompleteApiTest {
     private lateinit var mockSavedSitesRepository: SavedSitesRepository
 
     @Mock
-    private lateinit var mockHistoryRepository: HistoryRepository
+    private lateinit var mockHistoryApi: HistoryApi
 
     private lateinit var testee: AutoCompleteApi
 
     @Before
     fun before() {
         MockitoAnnotations.openMocks(this)
-        whenever(mockHistoryRepository.getHistoryObservable()).thenReturn(Single.just(listOf()))
-        testee = AutoCompleteApi(mockAutoCompleteService, mockSavedSitesRepository, mockHistoryRepository)
+        whenever(mockHistoryApi.getHistorySingle()).thenReturn(Single.just(listOf()))
+        testee = AutoCompleteApi(mockAutoCompleteService, mockSavedSitesRepository, mockHistoryApi)
     }
 
     @Test

diff --git a/history/history-api/src/main/java/com/duckduckgo/history/api/HistoryEntry.kt b/history/history-api/src/main/java/com/duckduckgo/history/api/HistoryEntry.kt
@@ -39,7 +39,7 @@ sealed class HistoryEntry {
     data class VisitedPage(
         override val url: Uri,
         override val title: String,
-        override val visits: List<LocalDateTime>
+        override val visits: List<LocalDateTime>,
     ) : HistoryEntry()
 
     /**
@@ -55,6 +55,6 @@ sealed class HistoryEntry {
         override val title: String,
         val query: String,
         val queryTokens: List<String>? = null,
-        override val visits: List<LocalDateTime>
+        override val visits: List<LocalDateTime>,
     ) : HistoryEntry()
 }
diff --git a/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryEntry.kt b/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryEntry.kt
@@ -31,13 +31,11 @@ package com.duckduckgo.history.impl/*
  */
 
 import androidx.core.net.toUri
-import com.duckduckgo.common.utils.formatters.time.DatabaseDateFormatter
 import com.duckduckgo.history.api.HistoryEntry
 import com.duckduckgo.history.api.HistoryEntry.VisitedPage
 import com.duckduckgo.history.api.HistoryEntry.VisitedSERP
 import com.duckduckgo.history.impl.store.HistoryEntryWithVisits
 import java.time.LocalDateTime
-import java.util.Date
 
 fun HistoryEntryWithVisits.toHistoryEntry(): HistoryEntry? {
     if (historyEntry.url.isBlank()) return null

diff --git a/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryModule.kt b/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryModule.kt
@@ -32,7 +32,6 @@ package com.duckduckgo.history.impl/*
 
 import android.content.Context
 import androidx.room.Room
-import com.duckduckgo.common.utils.CurrentTimeProvider
 import com.duckduckgo.di.scopes.AppScope
 import com.duckduckgo.history.impl.store.ALL_MIGRATIONS
 import com.duckduckgo.history.impl.store.HistoryDatabase

diff --git a/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryRepository.kt b/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryRepository.kt
@@ -16,8 +16,6 @@
 
 package com.duckduckgo.history.impl
 
-import com.duckduckgo.common.utils.CurrentTimeProvider
-import com.duckduckgo.common.utils.formatters.time.DatabaseDateFormatter
 import com.duckduckgo.history.api.HistoryEntry
 import com.duckduckgo.history.impl.store.HistoryDao
 import io.reactivex.Single

diff --git a/history/history-impl/src/main/java/com/duckduckgo/history/impl/store/HistoryEntryEntity.kt b/history/history-impl/src/main/java/com/duckduckgo/history/impl/store/HistoryEntryEntity.kt
@@ -42,7 +42,7 @@ data class HistoryEntryEntity(
 @Entity(tableName = "visits_list", primaryKeys = ["timestamp", "historyEntryId"])
 data class VisitEntity(
     val historyEntryId: Long,
-    val timestamp: String
+    val timestamp: String,
 )
 
 data class HistoryEntryWithVisits(