@ -24,16 +24,13 @@ import mozilla.components.support.test.middleware.CaptureActionsMiddleware
import mozilla.components.support.test.rule.MainCoroutineRule import mozilla.components.support.test.rule.MainCoroutineRule
import mozilla.components.support.test.rule.runTestOnMain import mozilla.components.support.test.rule.runTestOnMain
import org.junit.Assert.assertEquals import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.mozilla.fenix.components.AppStore import org.mozilla.fenix.components.AppStore
import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.appstate.AppAction
import org.mozilla.fenix.components.appstate.AppState import org.mozilla.fenix.components.appstate.AppState
import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryGroup
import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryHighlight import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItem.RecentHistoryHighlight
import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItemInternal.HistoryGroupInternal
import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItemInternal.HistoryHighlightInternal import org.mozilla.fenix.home.recentvisits.RecentlyVisitedItemInternal.HistoryHighlightInternal
import kotlin.random.Random import kotlin.random.Random
@ -69,10 +66,6 @@ class RecentVisitsFeatureTest {
documentType = DocumentType . Regular ,
documentType = DocumentType . Regular ,
previewImageUrl = null
previewImageUrl = null
)
)
val recentHistoryGroup = RecentHistoryGroup (
title = " mozilla " ,
historyMetadata = listOf ( historyEntry )
)
val highlightEntry = HistoryHighlight ( 1.0 , 1 , " https://firefox.com " , " firefox " , null )
val highlightEntry = HistoryHighlight ( 1.0 , 1 , " https://firefox.com " , " firefox " , null )
val recentHistoryHighlight = RecentHistoryHighlight ( " firefox " , " https://firefox.com " )
val recentHistoryHighlight = RecentHistoryHighlight ( " firefox " , " https://firefox.com " )
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers {
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers {
@ -87,7 +80,7 @@ class RecentVisitsFeatureTest {
startRecentVisitsFeature ( )
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals ( listOf ( recentHistory Group, recentHistory Highlight) , it . recentHistory )
assertEquals ( listOf ( recentHistory Highlight) , it . recentHistory )
}
}
}
}
@ -113,200 +106,7 @@ class RecentVisitsFeatureTest {
}
}
@Test
@Test
fun `GIVEN groups containing history metadata items with the same url WHEN they are added to store THEN entries are deduped` ( ) =
fun `GIVEN multiple highlights exist WHEN they are added to store THEN only MAX_RESULTS_TOTAL are sent` ( ) =
runTestOnMain {
val historyEntry1 = HistoryMetadata (
key = HistoryMetadataKey ( " http://www.mozilla.com " , " mozilla " , null ) ,
title = " mozilla " ,
createdAt = System . currentTimeMillis ( ) ,
updatedAt = 1 ,
totalViewTime = 10 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val historyEntry2 = HistoryMetadata (
key = HistoryMetadataKey ( " http://firefox.com " , " mozilla " , null ) ,
title = " firefox " ,
createdAt = System . currentTimeMillis ( ) ,
updatedAt = 2 ,
totalViewTime = 20 ,
documentType = DocumentType . Regular ,
previewImageUrl = " http://firefox.com/image1 "
)
val historyEntry3 = HistoryMetadata (
key = HistoryMetadataKey ( " http://www.mozilla.com " , " mozilla " , null ) ,
title = " mozilla " ,
createdAt = System . currentTimeMillis ( ) ,
updatedAt = 3 ,
totalViewTime = 30 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val expectedHistoryGroup = RecentHistoryGroup (
title = " mozilla " ,
historyMetadata = listOf (
// Expected total view time to be summed up for deduped entries
historyEntry1 . copy (
totalViewTime = historyEntry1 . totalViewTime + historyEntry3 . totalViewTime ,
updatedAt = historyEntry3 . updatedAt
) ,
historyEntry2
)
)
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers {
listOf (
historyEntry1 , historyEntry2 , historyEntry3
)
}
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals ( listOf ( expectedHistoryGroup ) , it . recentHistory )
}
}
@Test
fun `GIVEN different groups containing history metadata items with the same url WHEN they are added to store THEN entries are not deduped` ( ) =
runTestOnMain {
val now = System . currentTimeMillis ( )
val historyEntry1 = HistoryMetadata (
key = HistoryMetadataKey ( " http://www.mozilla.com " , " mozilla " , null ) ,
title = " mozilla " ,
createdAt = now ,
updatedAt = now + 3 ,
totalViewTime = 10 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val historyEntry2 = HistoryMetadata (
key = HistoryMetadataKey ( " http://firefox.com " , " mozilla " , null ) ,
title = " firefox " ,
createdAt = now ,
updatedAt = now + 2 ,
totalViewTime = 20 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val historyEntry3 = HistoryMetadata (
key = HistoryMetadataKey ( " http://www.mozilla.com " , " firefox " , null ) ,
title = " mozilla " ,
createdAt = now ,
updatedAt = now + 1 ,
totalViewTime = 30 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val expectedHistoryGroup1 = RecentHistoryGroup (
title = " mozilla " ,
historyMetadata = listOf ( historyEntry1 , historyEntry2 )
)
val expectedHistoryGroup2 = RecentHistoryGroup (
title = " firefox " ,
historyMetadata = listOf ( historyEntry3 )
)
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers {
listOf (
historyEntry1 , historyEntry2 , historyEntry3
)
}
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals ( listOf ( expectedHistoryGroup1 , expectedHistoryGroup2 ) , it . recentHistory )
}
}
@Test
fun `GIVEN history groups WHEN they are added to store THEN they are sorted descending by last updated timestamp` ( ) =
runTestOnMain {
val now = System . currentTimeMillis ( )
val historyEntry1 = HistoryMetadata (
key = HistoryMetadataKey ( " http://www.mozilla.com " , " mozilla " , null ) ,
title = " mozilla " ,
createdAt = now ,
updatedAt = now + 1 ,
totalViewTime = 10 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val historyEntry2 = HistoryMetadata (
key = HistoryMetadataKey ( " http://firefox.com " , " mozilla " , null ) ,
title = " firefox " ,
createdAt = now ,
updatedAt = now + 2 ,
totalViewTime = 20 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val historyEntry3 = HistoryMetadata (
key = HistoryMetadataKey ( " http://www.mozilla.com " , " firefox " , null ) ,
title = " mozilla " ,
createdAt = now ,
updatedAt = now + 3 ,
totalViewTime = 30 ,
documentType = DocumentType . Regular ,
previewImageUrl = null
)
val expectedHistoryGroup1 = RecentHistoryGroup (
title = " mozilla " ,
historyMetadata = listOf ( historyEntry1 , historyEntry2 )
)
val expectedHistoryGroup2 = RecentHistoryGroup (
title = " firefox " ,
historyMetadata = listOf ( historyEntry3 )
)
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers {
listOf (
historyEntry1 , historyEntry2 , historyEntry3
)
}
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals ( listOf ( expectedHistoryGroup2 , expectedHistoryGroup1 ) , it . recentHistory )
}
}
@Test
fun `GIVEN multiple groups exist but no highlights WHEN they are added to store THEN only MAX_RESULTS_TOTAL are sent` ( ) =
runTestOnMain {
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val expectedRecentHistoryGroups = visitsFromSearch
// Expect to only have the last accessed 9 groups.
. subList ( 1 , 10 )
. toIndividualRecentHistoryGroups ( )
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers { visitsFromSearch }
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals (
// The 9 most recent groups.
expectedRecentHistoryGroups ,
it . recentHistory
)
}
}
@Test
fun `GIVEN multiple highlights exist but no history groups WHEN they are added to store THEN only MAX_RESULTS_TOTAL are sent` ( ) =
runTestOnMain {
runTestOnMain {
val highlights = getHistoryHighlightsItems ( 10 )
val highlights = getHistoryHighlightsItems ( 10 )
val expectedRecentHighlights = highlights
val expectedRecentHighlights = highlights
@ -326,70 +126,12 @@ class RecentVisitsFeatureTest {
}
}
@Test
@Test
fun `GIVEN multiple history highlights and history groups WHEN they are added to store THEN only last accessed are added` ( ) =
fun `GIVEN a list of history highlights WHEN updateState is called THEN emit RecentHistoryChange` ( ) {
runTestOnMain {
val feature = spyk ( RecentVisitsFeature ( appStore , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) ) )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val expectedRecentHistoryGroups = visitsFromSearch
// Expect only 4 groups. Take 5 here for using in the below zip() and be dropped after.
. subList ( 5 , 10 )
. toIndividualRecentHistoryGroups ( )
val expectedRecentHistoryHighlights = directVisits . reversed ( ) . toRecentHistoryHighlights ( )
val expectedItems = expectedRecentHistoryHighlights . zip ( expectedRecentHistoryGroups ) . flatMap {
listOf ( it . first , it . second )
} . take ( 9 )
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers { visitsFromSearch + directVisits }
coEvery { historyHightlightsStorage . getHistoryHighlights ( any ( ) , any ( ) ) } . coAnswers {
directVisits . toHistoryHighlights ( )
}
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals ( expectedItems , it . recentHistory )
}
}
@Test
fun `GIVEN history highlights exist as history metadata WHEN they are added to store THEN don't add highlight dupes` ( ) {
// To know if a highlight appears in a search group each visit's url should be checked.
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directDistinctVisits = getDirectVisitsHistoryMetadataItems ( 10 ) . takeLast ( 2 )
val directDupeVisits = visitsFromSearch . takeLast ( 2 ) . map {
// Erase the search term for this to not be mapped to a search group.
// The url remains the same as the item from a group so it should be skipped.
it . copy ( key = it . key . copy ( searchTerm = null ) )
}
val expectedRecentHistoryGroups = visitsFromSearch
. subList ( 3 , 10 )
. toIndividualRecentHistoryGroups ( )
val expectedRecentHistoryHighlights = directDistinctVisits . reversed ( ) . toRecentHistoryHighlights ( )
val expectedItems = listOf (
expectedRecentHistoryHighlights . first ( ) ,
expectedRecentHistoryGroups . first ( ) ,
expectedRecentHistoryHighlights [ 1 ]
) + expectedRecentHistoryGroups . subList ( 1 , expectedRecentHistoryGroups . size )
coEvery { historyMetadataStorage . getHistoryMetadataSince ( any ( ) ) } . coAnswers {
visitsFromSearch + directDistinctVisits + directDupeVisits
}
coEvery { historyHightlightsStorage . getHistoryHighlights ( any ( ) , any ( ) ) } . coAnswers {
directDistinctVisits . toHistoryHighlights ( ) + directDupeVisits . toHistoryHighlights ( )
}
startRecentVisitsFeature ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
assertEquals ( expectedItems , it . recentHistory )
}
}
@Test
fun `GIVEN a list of history highlights and groups WHEN updateState is called THEN emit RecentHistoryChange` ( ) {
val feature = spyk ( RecentVisitsFeature ( appStore , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false ) )
val expected = List < RecentHistoryHighlight > ( 1 ) { mockk ( ) }
val expected = List < RecentHistoryHighlight > ( 1 ) { mockk ( ) }
every { feature . getCombinedHistory ( any ( ) , any ( ) ) } returns expected
every { feature . getCombinedHistory ( any ( ) ) } returns expected
feature . updateState ( emptyList ( ) , emptyList ( ) )
feature . updateState ( emptyList ( ) )
appStore . waitUntilIdle ( )
appStore . waitUntilIdle ( )
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
middleware . assertLastAction ( AppAction . RecentHistoryChange :: class ) {
@ -397,84 +139,9 @@ class RecentVisitsFeatureTest {
}
}
}
}
@Test
fun `GIVEN highlights visits exist in search groups WHEN getCombined is called THEN remove the highlights already in groups` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 4 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 4 )
val directDupeVisits = getSearchFromHistoryMetadataItems ( 2 ) . map {
// Erase the search term for this to not be mapped to a search group.
// The url remains the same as the item from a group so it should be skipped.
it . copy ( key = it . key . copy ( searchTerm = null ) )
}
val expected = directVisits . reversed ( ) . toRecentHistoryHighlights ( )
. zip ( visitsFromSearch . toIndividualRecentHistoryGroups ( ) )
. flatMap {
listOf ( it . first , it . second )
}
val result = feature . getCombinedHistory (
( directVisits + directDupeVisits ) . toHistoryHighlightsInternal ( ) ,
visitsFromSearch . toHistoryGroupsInternal ( )
)
assertEquals ( expected , result )
}
@Test
fun `GIVEN fewer than needed highlights and search groups WHEN getCombined is called THEN the result is sorted by date` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 4 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 4 )
val expected = directVisits . reversed ( ) . toRecentHistoryHighlights ( )
. zip ( visitsFromSearch . toIndividualRecentHistoryGroups ( ) )
. flatMap {
listOf ( it . first , it . second )
}
val result = feature . getCombinedHistory (
directVisits . toHistoryHighlightsInternal ( ) ,
visitsFromSearch . toHistoryGroupsInternal ( )
)
assertEquals ( expected , result )
}
@Test
fun `GIVEN more highlights are newer than search groups WHEN getCombined is called THEN then return an even split then sorted by date` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 5 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 14 )
val expected = directVisits . takeLast ( 5 ) . reversed ( ) . toRecentHistoryHighlights ( ) +
visitsFromSearch . takeLast ( 4 ) . toIndividualRecentHistoryGroups ( )
val result = feature . getCombinedHistory (
directVisits . toHistoryHighlightsInternal ( ) ,
visitsFromSearch . toHistoryGroupsInternal ( )
)
assertEquals ( expected , result )
}
@Test
fun `GIVEN more search groups are newer than highlights WHEN getCombined is called THEN then return an even split then sorted by date` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 14 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 5 )
val expected = visitsFromSearch . takeLast ( 4 ) . toIndividualRecentHistoryGroups ( ) +
directVisits . takeLast ( 5 ) . reversed ( ) . toRecentHistoryHighlights ( )
val result = feature . getCombinedHistory (
directVisits . toHistoryHighlightsInternal ( ) ,
visitsFromSearch . toHistoryGroupsInternal ( )
)
assertEquals ( expected , result )
}
@Test
@Test
fun `GIVEN all highlights have metadata WHEN getHistoryHighlights is called THEN return a list of highlights with an inferred last access time` ( ) {
fun `GIVEN all highlights have metadata WHEN getHistoryHighlights is called THEN return a list of highlights with an inferred last access time` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
@ -491,7 +158,7 @@ class RecentVisitsFeatureTest {
@Test
@Test
fun `GIVEN not all highlights have metadata WHEN getHistoryHighlights is called THEN set 0 for the highlights with not found last access time` ( ) {
fun `GIVEN not all highlights have metadata WHEN getHistoryHighlights is called THEN set 0 for the highlights with not found last access time` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val highlightsWithUnknownAccessTime = directVisits . toHistoryHighlightsInternal ( ) . take ( 5 ) . map {
val highlightsWithUnknownAccessTime = directVisits . toHistoryHighlightsInternal ( ) . take ( 5 ) . map {
@ -512,7 +179,7 @@ class RecentVisitsFeatureTest {
@Test
@Test
fun `GIVEN multiple metadata records for the same highlight WHEN getHistoryHighlights is called THEN set the latest access time from multiple available` ( ) {
fun `GIVEN multiple metadata records for the same highlight WHEN getHistoryHighlights is called THEN set the latest access time from multiple available` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val newerDirectVisits = directVisits . mapIndexed { index , item ->
val newerDirectVisits = directVisits . mapIndexed { index , item ->
@ -533,70 +200,8 @@ class RecentVisitsFeatureTest {
}
}
@Test
@Test
fun `GIVEN multiple metadata entries only for direct accessed pages WHEN getHistorySearchGroups is called THEN return an empty list` ( ) {
fun `GIVEN highlights don't have a valid title WHEN getCombinedHistory is called THEN the url is set as title` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val result = feature . getHistorySearchGroups ( directVisits )
assertTrue ( result . isEmpty ( ) )
}
@Test
fun `GIVEN multiple metadata entries WHEN getHistorySearchGroups is called THEN group all entries by their search term` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val result = feature . getHistorySearchGroups ( visitsFromSearch + directVisits )
assertEquals ( 10 , result . size )
assertEquals ( visitsFromSearch . map { it . key . searchTerm } , result . map { it . groupName } )
assertEquals ( visitsFromSearch . map { listOf ( it ) } , result . map { it . groupItems } )
}
@Test
fun `GIVEN multiple metadata entries for the same url WHEN getHistorySearchGroups is called THEN entries are deduped` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val newerVisitsFromSearch = visitsFromSearch . map { it . copy ( updatedAt = it . updatedAt * 2 ) }
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val result = feature . getHistorySearchGroups ( visitsFromSearch + directVisits + newerVisitsFromSearch )
assertEquals ( 10 , result . size )
assertEquals ( newerVisitsFromSearch . map { it . key . searchTerm } , result . map { it . groupName } )
assertEquals (
newerVisitsFromSearch . map {
listOf ( it . copy ( totalViewTime = it . totalViewTime * 2 , ) )
} ,
result . map { it . groupItems }
)
}
@Test
fun `GIVEN highlights and search groups WHEN getSortedHistory is called THEN sort descending all items based on the last access time` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 )
val expected = directVisits . reversed ( ) . toRecentHistoryHighlights ( )
. zip ( visitsFromSearch . toIndividualRecentHistoryGroups ( ) )
. flatMap {
listOf ( it . first , it . second )
}
val result = feature . getSortedHistory (
directVisits . toHistoryHighlightsInternal ( ) ,
visitsFromSearch . toHistoryGroupsInternal ( )
)
assertEquals ( expected , result )
}
@Test
fun `GIVEN highlights don't have a valid title WHEN getSortedHistory is called THEN the url is set as title` ( ) {
val feature = RecentVisitsFeature ( mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , mockk ( ) , false )
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 ) . mapIndexed { index , item ->
val directVisits = getDirectVisitsHistoryMetadataItems ( 10 ) . mapIndexed { index , item ->
when ( index % 3 ) {
when ( index % 3 ) {
0 -> item
0 -> item
@ -606,12 +211,11 @@ class RecentVisitsFeatureTest {
}
}
val sortedByDateHighlights = directVisits . reversed ( )
val sortedByDateHighlights = directVisits . reversed ( )
val result = feature . get Sort edHistory(
val result = feature . get Combin edHistory(
directVisits . toHistoryHighlightsInternal ( ) ,
directVisits . toHistoryHighlightsInternal ( ) ,
visitsFromSearch . toHistoryGroupsInternal ( )
) . filterIsInstance < RecentHistoryHighlight > ( )
) . filterIsInstance < RecentHistoryHighlight > ( )
assertEquals ( 10 , result . size )
assertEquals ( 9 , result . size )
result . forEachIndexed { index , item ->
result . forEachIndexed { index , item ->
when ( index % 3 ) {
when ( index % 3 ) {
0 -> assertEquals ( sortedByDateHighlights [ index ] . title , item . title )
0 -> assertEquals ( sortedByDateHighlights [ index ] . title , item . title )
@ -621,25 +225,6 @@ class RecentVisitsFeatureTest {
}
}
}
}
@Test
fun `GIVEN highlight visits also exist in search groups WHEN removeHighlightsAlreadyInGroups is called THEN filter out such highlights` ( ) {
val visitsFromSearch = getSearchFromHistoryMetadataItems ( 10 )
// To know if a highlight appears in a search group each visit's url should be checked.
// Ensure we have the identical urls with the ones from a search group and also some random others.
val directDupeVisits = visitsFromSearch . mapIndexed { index , item ->
when ( index % 2 ) {
0 -> item
else -> item . copy ( key = item . key . copy ( url = " https://mozilla.org " ) )
}
}
val highlights = directDupeVisits . toHistoryHighlightsInternal ( )
val result = highlights . removeHighlightsAlreadyInGroups ( visitsFromSearch . toHistoryGroupsInternal ( ) )
assertEquals ( 5 , result . size )
result . forEach { assertEquals ( " https://mozilla.org " , it . historyHighlight . url ) }
}
private fun startRecentVisitsFeature ( ) {
private fun startRecentVisitsFeature ( ) {
val feature = RecentVisitsFeature (
val feature = RecentVisitsFeature (
appStore ,
appStore ,
@ -647,11 +232,8 @@ class RecentVisitsFeatureTest {
lazy { historyHightlightsStorage } ,
lazy { historyHightlightsStorage } ,
scope ,
scope ,
testDispatcher ,
testDispatcher ,
false
)
)
assertEquals ( emptyList < RecentHistoryGroup > ( ) , appStore . state . recentHistory )
feature . start ( )
feature . start ( )
scope . advanceUntilIdle ( )
scope . advanceUntilIdle ( )
@ -746,15 +328,6 @@ private fun HistoryMetadata.toHistoryHighlight(): HistoryHighlight = HistoryHigh
previewImageUrl = null
previewImageUrl = null
) )
private fun HistoryMetadata . toRecentHistoryGroup ( ) : RecentHistoryGroup = RecentHistoryGroup (
title = key . searchTerm !! ,
historyMetadata = listOf ( this )
)
private fun List < HistoryMetadata > . toIndividualRecentHistoryGroups ( ) : List < RecentHistoryGroup > =
map { it . toRecentHistoryGroup ( ) }
. sortedByDescending { it . lastUpdated ( ) }
private fun HistoryMetadata . toRecentHistoryHighlight ( ) : RecentHistoryHighlight = private fun HistoryMetadata . toRecentHistoryHighlight ( ) : RecentHistoryHighlight =
RecentHistoryHighlight (
RecentHistoryHighlight (
title = if ( title . isNullOrBlank ( ) ) key . url else title !! ,
title = if ( title . isNullOrBlank ( ) ) key . url else title !! ,
@ -784,10 +357,3 @@ private fun HistoryMetadata.toHistoryHighlightInternal(lastAccessTime: Long) =
private fun List < HistoryMetadata > . toHistoryHighlightsInternal ( ) = mapIndexed { index , item -> private fun List < HistoryMetadata > . toHistoryHighlightsInternal ( ) = mapIndexed { index , item ->
item . toHistoryHighlightInternal ( index + 1L )
item . toHistoryHighlightInternal ( index + 1L )
} }
private fun HistoryMetadata . toHistoryGroupInternal ( ) = HistoryGroupInternal (
groupName = key . searchTerm !! ,
groupItems = listOf ( this )
)
private fun List < HistoryMetadata > . toHistoryGroupsInternal ( ) = map { it . toHistoryGroupInternal ( ) }
Noah Bond
2 years ago
committed by
mergify[bot]