mirror/fdroidclient
1
0 Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-10-04 10:06:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename Fetching.repo to Fetching.receivedRepo

Browse Source 
To make it clear that this is the repo as we received it,
not the repo as we may have already stored it in the database.
This commit is contained in:
Thore Goebel committed 2024-05-27 15:24:45 +02:00
1 parent d3ac70276d
commit 199f9b6c52
5 files changed
+23 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/database/src/test/java/org/fdroid/repo/RepoAdderIntegrationTest.kt
+4 -4
View File
@@ -66,12 +66,12 @@ internal class RepoAdderIntegrationTest {
assertEquals(None, awaitItem())
val firstFetching = awaitItem()
assertTrue(firstFetching is Fetching)
assertNull(firstFetching.repo)
assertNull(firstFetching.receivedRepo)
assertTrue(firstFetching.apps.isEmpty())
val secondFetching = awaitItem()
assertTrue(secondFetching is Fetching, "$secondFetching")
val repo = secondFetching.repo
val repo = secondFetching.receivedRepo
assertNotNull(repo)
assertEquals("https://fdroid.fedilab.app/repo", repo.address)
println(repo.getName(LocaleListCompat.getDefault()) ?: "null")
@@ -115,8 +115,8 @@ internal class RepoAdderIntegrationTest {
assertTrue(state is Fetching, state.toString())
assertTrue(state.apps.isNotEmpty())
println(state.repo?.getName(LocaleListCompat.getDefault()) ?: "null")
println(state.repo?.certificate)
println(state.receivedRepo?.getName(LocaleListCompat.getDefault()) ?: "null")
println(state.receivedRepo?.certificate)
state.apps.forEach { app ->
println(" ${app.packageName} ${app.summary}")
}
libs/database/src/test/java/org/fdroid/repo/RepoAdderTest.kt
+10 -10
View File
@@ -394,7 +394,7 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
@@ -447,7 +447,7 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
@@ -483,7 +483,7 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
@@ -564,7 +564,7 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
@@ -627,13 +627,13 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
val state2 = awaitItem()
assertIs<Fetching>(state2)
assertEquals(repoAddress, state2.repo?.address)
assertEquals(repoAddress, state2.receivedRepo?.address)
assertTrue(state2.canAdd)
assertFalse(state2.done)
@@ -689,7 +689,7 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
@@ -734,7 +734,7 @@ internal class RepoAdderTest {
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertTrue(state1.apps.isEmpty())
assertFalse(state1.canAdd)
@@ -879,7 +879,7 @@ internal class RepoAdderTest {
// early empty state
val state1 = awaitItem()
assertIs<Fetching>(state1)
assertNull(state1.repo)
assertNull(state1.receivedRepo)
assertEquals(emptyList(), state1.apps)
assertFalse(state1.canAdd)
assertFalse(state1.done)
@@ -887,7 +887,7 @@ internal class RepoAdderTest {
// onRepoReceived
val state2 = awaitItem()
assertIs<Fetching>(state2)
val repo = state2.repo ?: fail()
val repo = state2.receivedRepo ?: fail()
assertEquals(TestDataMinV2.repo.address, repo.address)
assertEquals(repoName, repo.getName(localeList))
val result = state2.fetchResult ?: fail()