Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix a couple missed renames for IndexUpdater

Browse Source 
* 0e6b4acabf72050e47dc80a273f5a5d1ec4ce222
* fdroid/fdroidclient!767
This commit is contained in:
Hans-Christoph Steiner 2018-12-18 23:06:59 +01:00
parent 90c3baf5af
commit 0e5dd45859
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
View File

@ -34,13 +34,13 @@ public class FDroidRepoUpdateTest extends MultiIndexUpdaterTest {
protected void updateEarlier() throws IndexUpdater.UpdateException { protected void updateEarlier() throws IndexUpdater.UpdateException {
Utils.debugLog(TAG, "Updating earlier version of F-Droid repo"); 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"); "index.fdroid.2016-10-30.jar");
} }
protected void updateLater() throws IndexUpdater.UpdateException { protected void updateLater() throws IndexUpdater.UpdateException {
Utils.debugLog(TAG, "Updating later version of F-Droid repo"); 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"); "index.fdroid.2016-11-10.jar");
} }

10
app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java
View File

@ -171,11 +171,11 @@ public abstract class MultiIndexUpdaterTest extends FDroidProviderTest {
return RepoProvider.Helper.findByAddress(context, uri); 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)); 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)); return new IndexUpdater(context, createRepo(name, uri, context, signingCert));
} }
@ -184,15 +184,15 @@ public abstract class MultiIndexUpdaterTest extends FDroidProviderTest {
} }
protected void updateConflicting() throws UpdateException { 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 { 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 { 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 { protected void updateRepo(IndexUpdater updater, String indexJarPath) throws UpdateException {