Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve HistoryRecordManager tests #7700

Merged
merged 2 commits into from
Jan 27, 2022
Merged

Improve HistoryRecordManager tests #7700

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fab43a
Improve HistoryRecordManager tests
Stypox Jan 24, 2022
f5c6f23
Improve shuffle as requested
Stypox Jan 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 36 additions & 10 deletions app/src/androidTest/java/org/schabi/newpipe/local/history/HistoryRecordManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.schabi.newpipe.testUtil.TrampolineSchedulerRule
import java.time.LocalDateTime
import java.time.OffsetDateTime
import java.time.ZoneOffset
import kotlin.collections.ArrayList

class HistoryRecordManagerTest {

Expand Down Expand Up @@ -97,14 +98,24 @@ class HistoryRecordManagerTest {
assertThat(database.searchHistoryDAO().all.blockingFirst()).isEmpty()
}

@Test
fun getRelatedSearches_emptyQuery() {
private fun insertShuffledRelatedSearches(relatedSearches: Collection<SearchHistoryEntry>) {

// shuffle to make sure the order of items returned by queries depends only on
// SearchHistoryEntry.creationDate, not on the actual insertion time
val copiedRelatedSearchesEntries = ArrayList(relatedSearches)
copiedRelatedSearchesEntries.shuffle()
Stypox marked this conversation as resolved.
Show resolved Hide resolved
database.searchHistoryDAO().insertAll(copiedRelatedSearchesEntries)

// make sure all entries were inserted
database.searchHistoryDAO().insertAll(RELATED_SEARCHES_ENTRIES)
assertEquals(
RELATED_SEARCHES_ENTRIES.size,
relatedSearches.size,
database.searchHistoryDAO().all.blockingFirst().size
)
}

@Test
fun getRelatedSearches_emptyQuery() {
insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)

// make sure correct number of searches is returned and in correct order
val searches = manager.getRelatedSearches("", 6, 4).blockingFirst()
Expand All @@ -117,14 +128,29 @@ class HistoryRecordManagerTest {
}

@Test
fun getRelatedSearched_nonEmptyQuery() {
// make sure all entries were inserted
database.searchHistoryDAO().insertAll(RELATED_SEARCHES_ENTRIES)
assertEquals(
RELATED_SEARCHES_ENTRIES.size,
database.searchHistoryDAO().all.blockingFirst().size
fun getRelatedSearches_emptyQuery_manyDuplicates() {
insertShuffledRelatedSearches(
listOf(
SearchHistoryEntry(time.minusSeconds(9), 3, "A"),
SearchHistoryEntry(time.minusSeconds(8), 3, "AB"),
SearchHistoryEntry(time.minusSeconds(7), 3, "A"),
SearchHistoryEntry(time.minusSeconds(6), 3, "A"),
SearchHistoryEntry(time.minusSeconds(5), 3, "BA"),
SearchHistoryEntry(time.minusSeconds(4), 3, "A"),
SearchHistoryEntry(time.minusSeconds(3), 3, "A"),
SearchHistoryEntry(time.minusSeconds(2), 0, "A"),
SearchHistoryEntry(time.minusSeconds(1), 2, "AA"),
)
)

val searches = manager.getRelatedSearches("", 9, 3).blockingFirst()
assertThat(searches).containsExactly("AA", "A", "BA")
}

@Test
fun getRelatedSearched_nonEmptyQuery() {
insertShuffledRelatedSearches(RELATED_SEARCHES_ENTRIES)

// make sure correct number of searches is returned and in correct order
val searches = manager.getRelatedSearches("A", 3, 5).blockingFirst()
assertThat(searches).containsExactly(
Expand Down