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

Make index file name constants public and replace their string usages

Browse Source
This commit is contained in:
Torsten Grote
2022-11-18 13:37:52 -03:00
committed by Hans-Christoph Steiner
parent 70593cf58c
commit cae10f11d9
21 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/database/src/dbTest/java/org/fdroid/index/IndexUpdaterTest.kt
View File

@@ -2,6 +2,7 @@ package org.fdroid.index
import androidx.test.ext.junit.runners.AndroidJUnit4
import org.fdroid.database.Repository
import org.fdroid.index.v2.SIGNED_FILE_NAME
import org.junit.Test
import org.junit.runner.RunWith
import kotlin.test.assertEquals
@@ -21,8 +22,8 @@ internal class IndexUpdaterTest {
weight = 0,
lastUpdated = 23L,
)
val uri = defaultRepoUriBuilder.getUri(repo, "entry.jar")
assertEquals("http://example.org/entry.jar", uri.toString())
val uri = defaultRepoUriBuilder.getUri(repo, SIGNED_FILE_NAME)
assertEquals("http://example.org/$SIGNED_FILE_NAME", uri.toString())
}
}

4
libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt
View File

@@ -191,8 +191,8 @@ internal class IndexV1UpdaterTest : DbTest() {
@Suppress("DEPRECATION")
private fun downloadIndex(repo: Repository, jar: String) {
val uri = Uri.parse("${repo.address}/index-v1.jar")
val indexFile = FileV2.fromPath("/index-v1.jar")
val uri = Uri.parse("${repo.address}/$SIGNED_FILE_NAME")
val indexFile = FileV2.fromPath("/$SIGNED_FILE_NAME")
val jarFile = tmpFolder.newFile()
assets.open(jar).use { inputStream ->

26
libs/database/src/dbTest/java/org/fdroid/index/v2/IndexV2UpdaterTest.kt
View File

@@ -60,7 +60,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = repoDao.insertEmptyRepo("http://example.org")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "index-min-v2.json",
indexFileV2 = TestDataEntry.emptyToMin.index
)
@@ -80,7 +80,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = repoDao.insertEmptyRepo("http://example.org")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-mid/entry.jar",
entryPath = "diff-empty-mid/$SIGNED_FILE_NAME",
jsonPath = "index-mid-v2.json",
indexFileV2 = TestDataEntry.emptyToMid.index
)
@@ -95,7 +95,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = repoDao.insertEmptyRepo("http://example.org")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-max/entry.jar",
entryPath = "diff-empty-max/$SIGNED_FILE_NAME",
jsonPath = "index-max-v2.json",
indexFileV2 = TestDataEntry.emptyToMax.index
)
@@ -110,7 +110,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = streamIndexV2IntoDb("index-min-v2.json")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-mid/entry.jar",
entryPath = "diff-empty-mid/$SIGNED_FILE_NAME",
jsonPath = "diff-empty-mid/42.json",
indexFileV2 = TestDataEntry.emptyToMid.diffs["42"] ?: fail()
)
@@ -126,7 +126,7 @@ internal class IndexV2UpdaterTest : DbTest() {
repoDao.updateRepository(repoId, CERTIFICATE)
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "diff-empty-min/23.json",
indexFileV2 = TestDataEntry.emptyToMin.diffs["23"] ?: fail()
)
@@ -142,7 +142,7 @@ internal class IndexV2UpdaterTest : DbTest() {
repoDao.updateRepository(repoId, CERTIFICATE)
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-max/entry.jar",
entryPath = "diff-empty-max/$SIGNED_FILE_NAME",
jsonPath = "diff-empty-max/1337.json",
indexFileV2 = TestDataEntry.emptyToMax.diffs["1337"] ?: fail()
)
@@ -158,7 +158,7 @@ internal class IndexV2UpdaterTest : DbTest() {
repoDao.updateRepository(repoId, CERTIFICATE)
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "diff-empty-min/23.json",
indexFileV2 = TestDataEntry.emptyToMin.diffs["23"] ?: fail()
)
@@ -174,7 +174,7 @@ internal class IndexV2UpdaterTest : DbTest() {
repoDao.updateRepository(repoId, CERTIFICATE)
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "diff-empty-min/23.json",
indexFileV2 = TestDataEntry.emptyToMin.diffs["23"] ?: fail()
)
@@ -192,7 +192,7 @@ internal class IndexV2UpdaterTest : DbTest() {
repoDao.updateRepository(newRepo)
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "index-min-v2.json",
indexFileV2 = TestDataEntry.emptyToMin.index
)
@@ -206,7 +206,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = repoDao.insertEmptyRepo("http://example.org")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "index-min-v2.json",
indexFileV2 = TestDataEntry.emptyToMin.index
)
@@ -220,7 +220,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = repoDao.insertEmptyRepo("http://example.org")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-min/entry.jar",
entryPath = "diff-empty-min/$SIGNED_FILE_NAME",
jsonPath = "index-min-v2.json",
indexFileV2 = TestDataEntry.emptyToMin.index
)
@@ -238,7 +238,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val repoId = streamIndexV1IntoDb("index-min-v1.json")
val repo = prepareUpdate(
repoId = repoId,
entryPath = "diff-empty-mid/entry.jar",
entryPath = "diff-empty-mid/$SIGNED_FILE_NAME",
jsonPath = "index-mid-v2.json",
indexFileV2 = TestDataEntry.emptyToMid.index,
)
@@ -261,7 +261,7 @@ internal class IndexV2UpdaterTest : DbTest() {
val entryFile = tmpFolder.newFile()
val indexFile = tmpFolder.newFile()
val repo = repoDao.getRepository(repoId) ?: fail()
val entryUri = Uri.parse("${repo.address}/entry.jar")
val entryUri = Uri.parse("${repo.address}/$SIGNED_FILE_NAME")
val indexUri = Uri.parse("${repo.address}/${indexFileV2.name.trimStart('/')}")
assets.open(entryPath).use { inputStream ->