From 0e5dd45859ac655f8d971628f531fa1d3524c9fa Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 18 Dec 2018 23:06:59 +0100 Subject: [PATCH] fix a couple missed renames for IndexUpdater * 0e6b4acabf72050e47dc80a273f5a5d1ec4ce222 * fdroid/fdroidclient!767 --- .../fdroid/fdroid/updater/FDroidRepoUpdateTest.java | 4 ++-- .../fdroid/fdroid/updater/MultiIndexUpdaterTest.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java index c34c085d3..898f6d7fb 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java @@ -34,13 +34,13 @@ public class FDroidRepoUpdateTest extends MultiIndexUpdaterTest { protected void updateEarlier() throws IndexUpdater.UpdateException { Utils.debugLog(TAG, "Updating earlier version of F-Droid repo"); - updateRepo(createRepoUpdater(REPO_FDROID, REPO_FDROID_URI, context, REPO_FDROID_PUB_KEY), + updateRepo(createIndexUpdater(REPO_FDROID, REPO_FDROID_URI, context, REPO_FDROID_PUB_KEY), "index.fdroid.2016-10-30.jar"); } protected void updateLater() throws IndexUpdater.UpdateException { Utils.debugLog(TAG, "Updating later version of F-Droid repo"); - updateRepo(createRepoUpdater(REPO_FDROID, REPO_FDROID_URI, context, REPO_FDROID_PUB_KEY), + updateRepo(createIndexUpdater(REPO_FDROID, REPO_FDROID_URI, context, REPO_FDROID_PUB_KEY), "index.fdroid.2016-11-10.jar"); } diff --git a/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java index 5a1b9e158..2742dec5e 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java @@ -171,11 +171,11 @@ public abstract class MultiIndexUpdaterTest extends FDroidProviderTest { return RepoProvider.Helper.findByAddress(context, uri); } - protected IndexUpdater createRepoUpdater(String name, String uri, Context context) { + protected IndexUpdater createIndexUpdater(String name, String uri, Context context) { return new IndexUpdater(context, createRepo(name, uri, context)); } - protected IndexUpdater createRepoUpdater(String name, String uri, Context context, String signingCert) { + protected IndexUpdater createIndexUpdater(String name, String uri, Context context, String signingCert) { return new IndexUpdater(context, createRepo(name, uri, context, signingCert)); } @@ -184,15 +184,15 @@ public abstract class MultiIndexUpdaterTest extends FDroidProviderTest { } protected void updateConflicting() throws UpdateException { - updateRepo(createRepoUpdater(REPO_CONFLICTING, REPO_CONFLICTING_URI, context), "multiRepo.conflicting.jar"); + updateRepo(createIndexUpdater(REPO_CONFLICTING, REPO_CONFLICTING_URI, context), "multiRepo.conflicting.jar"); } protected void updateMain() throws UpdateException { - updateRepo(createRepoUpdater(REPO_MAIN, REPO_MAIN_URI, context), "multiRepo.normal.jar"); + updateRepo(createIndexUpdater(REPO_MAIN, REPO_MAIN_URI, context), "multiRepo.normal.jar"); } protected void updateArchive() throws UpdateException { - updateRepo(createRepoUpdater(REPO_ARCHIVE, REPO_ARCHIVE_URI, context), "multiRepo.archive.jar"); + updateRepo(createIndexUpdater(REPO_ARCHIVE, REPO_ARCHIVE_URI, context), "multiRepo.archive.jar"); } protected void updateRepo(IndexUpdater updater, String indexJarPath) throws UpdateException {