From 2edfaf79332c9933f04b6bad73ea1fd0c0caa689 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Fri, 18 Nov 2022 13:37:52 -0300 Subject: [PATCH] Make index file name constants public and replace their string usages --- .../fdroid/fdroid/net/HttpDownloaderTest.java | 11 ++++---- .../fdroid/nearby/LocalRepoManager.java | 6 +++-- .../org/fdroid/fdroid/nearby/SwapService.java | 8 ++++-- .../fdroid/fdroid/nearby/TreeUriUtils.java | 7 +++-- .../fdroid/views/ManageReposActivity.java | 3 ++- .../java/org/fdroid/fdroid/RepoUrlsTest.java | 5 ++-- .../java/org/fdroid/index/IndexUpdaterTest.kt | 5 ++-- .../org/fdroid/index/v1/IndexV1UpdaterTest.kt | 4 +-- .../org/fdroid/index/v2/IndexV2UpdaterTest.kt | 26 +++++++++---------- .../org/fdroid/index/v1/IndexV1Updater.kt | 2 +- .../org/fdroid/index/v2/IndexV2Updater.kt | 2 +- .../org/fdroid/index/v1/IndexV1Verifier.kt | 2 +- .../org/fdroid/index/v2/EntryVerifier.kt | 2 +- .../fdroid/index/v1/IndexV1VerifierTest.kt | 2 +- .../org/fdroid/index/v2/EntryVerifierTest.kt | 2 +- .../kotlin/org/fdroid/index/v2/EntryTest.kt | 6 ++--- 16 files changed, 53 insertions(+), 40 deletions(-) diff --git a/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java index 25d47892b..62f9b70d2 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/net/HttpDownloaderTest.java @@ -13,6 +13,7 @@ import org.fdroid.download.Mirror; import org.fdroid.fdroid.FDroidApp; import org.fdroid.fdroid.ProgressListener; import org.fdroid.fdroid.Utils; +import org.fdroid.index.v1.IndexV1UpdaterKt; import org.junit.Test; import java.io.File; @@ -38,20 +39,20 @@ public class HttpDownloaderTest { // https://developer.android.com/reference/javax/net/ssl/SSLContext static { ArrayList> tempUrls = new ArrayList<>(Arrays.asList( - new Pair<>("https://f-droid.org/repo", "index-v1.jar"), + new Pair<>("https://f-droid.org/repo", IndexV1UpdaterKt.SIGNED_FILE_NAME), // sites that use SNI for HTTPS new Pair<>("https://mirrors.edge.kernel.org/", "debian/dists/stable/Release"), - new Pair<>("https://fdroid.tetaneutral.net/fdroid/repo/", "index-v1.jar"), - new Pair<>("https://ftp.fau.de/fdroid/repo/", "index-v1.jar"), + new Pair<>("https://fdroid.tetaneutral.net/fdroid/repo/", IndexV1UpdaterKt.SIGNED_FILE_NAME), + new Pair<>("https://ftp.fau.de/fdroid/repo/", IndexV1UpdaterKt.SIGNED_FILE_NAME), new Pair<>("https://ftp.fau.de/fdroid/repo", "dev.lonami.klooni/en-US/phoneScreenshots/1-game.jpg"), //new Pair<>("https://microg.org/fdroid/repo/index-v1.jar"), //new Pair<>("https://grobox.de/fdroid/repo/index.jar"), - new Pair<>("https://guardianproject.info/fdroid/repo", "index-v1.jar") + new Pair<>("https://guardianproject.info/fdroid/repo", IndexV1UpdaterKt.SIGNED_FILE_NAME) )); if (Build.VERSION.SDK_INT >= 22) { tempUrls.addAll(Arrays.asList( new Pair<>("https://en.wikipedia.org", "/wiki/Index.html"), // no SNI but weird ipv6 lookup issues - new Pair<>("https://mirror.cyberbits.eu/fdroid/repo/", "index-v1.jar") // TLSv1.2 only and SNI + new Pair<>("https://mirror.cyberbits.eu/fdroid/repo/", IndexV1UpdaterKt.SIGNED_FILE_NAME) // TLSv1.2 only and SNI )); } URLS = tempUrls; diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java index 61aae7960..a1aaea602 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoManager.java @@ -16,6 +16,8 @@ import org.fdroid.fdroid.data.SanitizedFile; import org.fdroid.index.v1.AppV1; import org.fdroid.index.v1.IndexV1; import org.fdroid.index.v1.IndexV1Creator; +import org.fdroid.index.v1.IndexV1UpdaterKt; +import org.fdroid.index.v1.IndexV1VerifierKt; import org.fdroid.index.v1.PackageV1; import org.fdroid.index.v1.RepoV1; @@ -94,7 +96,7 @@ public final class LocalRepoManager { fdroidDirCaps = new SanitizedFile(webRoot, "FDROID"); repoDir = new SanitizedFile(fdroidDir, "repo"); repoDirCaps = new SanitizedFile(fdroidDirCaps, "REPO"); - indexJar = new SanitizedFile(repoDir, "index-v1.jar"); + indexJar = new SanitizedFile(repoDir, IndexV1UpdaterKt.SIGNED_FILE_NAME); indexJarUnsigned = new SanitizedFile(repoDir, "index-v1.unsigned.jar"); if (!fdroidDir.exists() && !fdroidDir.mkdir()) { @@ -257,7 +259,7 @@ public final class LocalRepoManager { IndexV1 indexV1 = creator.createRepo(); cacheApps(indexV1); writeIndexPage(address); - SanitizedFile indexJson = new SanitizedFile(repoDir, "index-v1.json"); + SanitizedFile indexJson = new SanitizedFile(repoDir, IndexV1VerifierKt.JSON_FILE_NAME); writeIndexJar(indexJson); } diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java index 88a8ffa00..aabcfda44 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java @@ -33,6 +33,7 @@ import org.fdroid.index.IndexParser; import org.fdroid.index.IndexParserKt; import org.fdroid.index.SigningException; import org.fdroid.index.v1.IndexV1; +import org.fdroid.index.v1.IndexV1UpdaterKt; import org.fdroid.index.v1.IndexV1Verifier; import org.fdroid.index.v2.FileV2; @@ -131,8 +132,11 @@ public class SwapService extends Service { private void updateRepo(@NonNull Peer peer, Repository repo) throws IOException, InterruptedException, SigningException, NotFoundException { - Uri uri = Uri.parse(repo.getAddress()).buildUpon().appendPath("index-v1.jar").build(); - FileV2 indexFile = FileV2.fromPath("/index-v1.jar"); + Uri uri = Uri.parse(repo.getAddress()) + .buildUpon() + .appendPath(IndexV1UpdaterKt.SIGNED_FILE_NAME) + .build(); + FileV2 indexFile = FileV2.fromPath("/" + IndexV1UpdaterKt.SIGNED_FILE_NAME); File swapJarFile = File.createTempFile("swap", "", getApplicationContext().getCacheDir()); try { diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java index 47bc4cb9b..4c0989dee 100644 --- a/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java +++ b/app/src/full/java/org/fdroid/fdroid/nearby/TreeUriUtils.java @@ -1,12 +1,15 @@ package org.fdroid.fdroid.nearby; +import org.fdroid.index.v1.IndexV1UpdaterKt; +import org.fdroid.index.v1.IndexV1VerifierKt; + /** * @see Android 5.0 DocumentFile from tree URI */ public final class TreeUriUtils { public static final String TAG = "TreeUriUtils"; - static final String SIGNED_FILE_NAME = "index-v1.jar"; - static final String DATA_FILE_NAME = "index-v1.json"; + static final String SIGNED_FILE_NAME = IndexV1UpdaterKt.SIGNED_FILE_NAME; + static final String DATA_FILE_NAME = IndexV1VerifierKt.JSON_FILE_NAME; } \ No newline at end of file diff --git a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java index f98b5a3e9..7be133089 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java @@ -63,6 +63,7 @@ import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.DBHelper; import org.fdroid.fdroid.data.NewRepoConfig; +import org.fdroid.index.v1.IndexV1UpdaterKt; import java.io.File; import java.io.IOException; @@ -621,7 +622,7 @@ public class ManageReposActivity extends AppCompatActivity implements RepoAdapte } // check for v1 index as this is the last one we can still handle - final Uri uri = builder.appendPath("index-v1.jar").build(); + final Uri uri = builder.appendPath(IndexV1UpdaterKt.SIGNED_FILE_NAME).build(); try { final URL url = new URL(uri.toString()); diff --git a/app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java b/app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java index b0c7c02dd..e27297221 100644 --- a/app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java +++ b/app/src/test/java/org/fdroid/fdroid/RepoUrlsTest.java @@ -20,6 +20,7 @@ package org.fdroid.fdroid; import org.fdroid.fdroid.data.Apk; +import org.fdroid.index.v1.IndexV1UpdaterKt; import org.fdroid.index.v2.FileV1; import org.junit.Before; import org.junit.Test; @@ -125,8 +126,8 @@ public class RepoUrlsTest { @Test public void testIndexV1Urls() { - testReposWithFile("index-v1.jar", tr -> - Utils.getUri(tr.repoUrl, "index-v1.jar").toString() + testReposWithFile(IndexV1UpdaterKt.SIGNED_FILE_NAME, tr -> + Utils.getUri(tr.repoUrl, IndexV1UpdaterKt.SIGNED_FILE_NAME).toString() ); } diff --git a/libs/database/src/dbTest/java/org/fdroid/index/IndexUpdaterTest.kt b/libs/database/src/dbTest/java/org/fdroid/index/IndexUpdaterTest.kt index 3929946e9..a20d3b6e2 100644 --- a/libs/database/src/dbTest/java/org/fdroid/index/IndexUpdaterTest.kt +++ b/libs/database/src/dbTest/java/org/fdroid/index/IndexUpdaterTest.kt @@ -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()) } } diff --git a/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt b/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt index 17a1cd93b..cd8079bfb 100644 --- a/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt +++ b/libs/database/src/dbTest/java/org/fdroid/index/v1/IndexV1UpdaterTest.kt @@ -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 -> diff --git a/libs/database/src/dbTest/java/org/fdroid/index/v2/IndexV2UpdaterTest.kt b/libs/database/src/dbTest/java/org/fdroid/index/v2/IndexV2UpdaterTest.kt index 312f3982d..337208df0 100644 --- a/libs/database/src/dbTest/java/org/fdroid/index/v2/IndexV2UpdaterTest.kt +++ b/libs/database/src/dbTest/java/org/fdroid/index/v2/IndexV2UpdaterTest.kt @@ -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 -> diff --git a/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt b/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt index 43a7b9771..535342588 100644 --- a/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt +++ b/libs/database/src/main/java/org/fdroid/index/v1/IndexV1Updater.kt @@ -20,7 +20,7 @@ import org.fdroid.index.defaultRepoUriBuilder import org.fdroid.index.setIndexUpdateListener import org.fdroid.index.v2.FileV2 -internal const val SIGNED_FILE_NAME = "index-v1.jar" +public const val SIGNED_FILE_NAME: String = "index-v1.jar" public class IndexV1Updater( database: FDroidDatabase, diff --git a/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt b/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt index bafa71d4f..7a0c80097 100644 --- a/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt +++ b/libs/database/src/main/java/org/fdroid/index/v2/IndexV2Updater.kt @@ -20,7 +20,7 @@ import org.fdroid.index.defaultRepoUriBuilder import org.fdroid.index.parseEntry import org.fdroid.index.setIndexUpdateListener -internal const val SIGNED_FILE_NAME = "entry.jar" +public const val SIGNED_FILE_NAME: String = "entry.jar" public class IndexV2Updater( database: FDroidDatabase, diff --git a/libs/index/src/androidMain/kotlin/org/fdroid/index/v1/IndexV1Verifier.kt b/libs/index/src/androidMain/kotlin/org/fdroid/index/v1/IndexV1Verifier.kt index 14deca174..9a8244291 100644 --- a/libs/index/src/androidMain/kotlin/org/fdroid/index/v1/IndexV1Verifier.kt +++ b/libs/index/src/androidMain/kotlin/org/fdroid/index/v1/IndexV1Verifier.kt @@ -5,7 +5,7 @@ import org.fdroid.index.SigningException import java.io.File import java.util.jar.Attributes -internal const val JSON_FILE_NAME = "index-v1.json" +public const val JSON_FILE_NAME: String = "index-v1.json" private const val SUPPORTED_DIGEST = "SHA1-Digest" /** diff --git a/libs/index/src/androidMain/kotlin/org/fdroid/index/v2/EntryVerifier.kt b/libs/index/src/androidMain/kotlin/org/fdroid/index/v2/EntryVerifier.kt index 3feae6818..316bc2875 100644 --- a/libs/index/src/androidMain/kotlin/org/fdroid/index/v2/EntryVerifier.kt +++ b/libs/index/src/androidMain/kotlin/org/fdroid/index/v2/EntryVerifier.kt @@ -5,7 +5,7 @@ import org.fdroid.index.SigningException import java.io.File import java.util.jar.Attributes -private const val JSON_FILE_NAME = "entry.json" +public const val JSON_FILE_NAME: String = "entry.json" private val FORBIDDEN_DIGESTS = listOf( "MD5-Digest", "SHA1-Digest", diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt b/libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt index 8cc8d9bd6..20b9b2a29 100644 --- a/libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt +++ b/libs/index/src/androidTest/kotlin/org/fdroid/index/v1/IndexV1VerifierTest.kt @@ -113,7 +113,7 @@ internal class IndexV1VerifierTest { assertEquals("foo\n", inputStream.readBytes().decodeToString()) } } - assertTrue(e.message!!.contains("index-v1.json")) + assertTrue(e.message!!.contains(JSON_FILE_NAME)) } @Test diff --git a/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt b/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt index 535a0e532..2437c3f33 100644 --- a/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt +++ b/libs/index/src/androidTest/kotlin/org/fdroid/index/v2/EntryVerifierTest.kt @@ -120,7 +120,7 @@ internal class EntryVerifierTest { val e = assertFailsWith { verifier.getStreamAndVerify { } } - assertTrue(e.message!!.contains("entry.json")) + assertTrue(e.message!!.contains(JSON_FILE_NAME)) } @Test diff --git a/libs/index/src/commonTest/kotlin/org/fdroid/index/v2/EntryTest.kt b/libs/index/src/commonTest/kotlin/org/fdroid/index/v2/EntryTest.kt index 9b391fc19..cbaf59899 100644 --- a/libs/index/src/commonTest/kotlin/org/fdroid/index/v2/EntryTest.kt +++ b/libs/index/src/commonTest/kotlin/org/fdroid/index/v2/EntryTest.kt @@ -19,17 +19,17 @@ internal class EntryTest { @Test fun testEmptyToMin() { - testEntryEquality("$assetPath/diff-empty-min/entry.json", TestDataEntry.emptyToMin) + testEntryEquality("$assetPath/diff-empty-min/$JSON_FILE_NAME", TestDataEntry.emptyToMin) } @Test fun testEmptyToMid() { - testEntryEquality("$assetPath/diff-empty-mid/entry.json", TestDataEntry.emptyToMid) + testEntryEquality("$assetPath/diff-empty-mid/$JSON_FILE_NAME", TestDataEntry.emptyToMid) } @Test fun testEmptyToMax() { - testEntryEquality("$assetPath/diff-empty-max/entry.json", TestDataEntry.emptyToMax) + testEntryEquality("$assetPath/diff-empty-max/$JSON_FILE_NAME", TestDataEntry.emptyToMax) } @Test