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

rename App.suggestedVersionCode to autoInstallVersionCode #1063

Browse Source
This commit is contained in:
Hans-Christoph Steiner
2020-01-10 16:46:07 +01:00
parent 0d84836153
commit cc3d874dc4
14 changed files with 39 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java
View File

@@ -273,7 +273,7 @@ public class PreferredSignatureTest extends FDroidProviderTest {
private void assertSuggested(Context context, int suggestedVersion, String suggestedSig) {
App suggestedApp = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(), PACKAGE_NAME);
assertEquals("Suggested version on App", suggestedVersion, suggestedApp.suggestedVersionCode);
assertEquals("Suggested version on App", suggestedVersion, suggestedApp.autoInstallVersionCode);
Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(context, suggestedApp);
assertEquals("Version on suggested Apk", suggestedVersion, suggestedApk.versionCode);

4
app/src/test/java/org/fdroid/fdroid/data/SuggestedVersionTest.java
View File

@@ -195,7 +195,7 @@ public class SuggestedVersionTest extends FDroidProviderTest {
*/
public void assertSuggested(String packageName, int suggestedVersion, String installedSig, int installedVersion) {
App suggestedApp = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(), packageName);
assertEquals("Suggested version on App", suggestedVersion, suggestedApp.suggestedVersionCode);
assertEquals("Suggested version on App", suggestedVersion, suggestedApp.autoInstallVersionCode);
assertEquals("Installed signature on App", installedSig, suggestedApp.installedSig);
Apk suggestedApk = ApkProvider.Helper.findSuggestedApk(context, suggestedApp);
@@ -212,7 +212,7 @@ public class SuggestedVersionTest extends FDroidProviderTest {
App canUpdateApp = appsToUpdate.get(0);
assertEquals("Package name of updatable app", packageName, canUpdateApp.packageName);
assertEquals("Installed version of updatable app", installedVersion, canUpdateApp.installedVersionCode);
assertEquals("Suggested version to update to", suggestedVersion, canUpdateApp.suggestedVersionCode);
assertEquals("Suggested version to update to", suggestedVersion, canUpdateApp.autoInstallVersionCode);
assertEquals("Installed signature of updatable app", installedSig, canUpdateApp.installedSig);
}
}

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

@@ -303,6 +303,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
"antiFeatures",
"authorEmail",
"authorName",
"autoInstallVersionCode",
"bitcoin",
"categories",
"changelog",
@@ -333,11 +334,10 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
"tvBanner",
"tvScreenshots",
"upstreamVersionCode",
"upstreamVersionName",
"video",
"whatsNew",
"wearScreenshots",
"webSite",
"whatsNew",
};
String[] ignoredInApp = new String[]{
"compatible",

2
app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java
View File

@@ -252,7 +252,7 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
List<App> appsToUpdate = AppProvider.Helper.findCanUpdate(context, AppMetadataTable.Cols.ALL);
assertEquals(1, appsToUpdate.size());
assertEquals(installedVersion, appsToUpdate.get(0).installedVersionCode);
assertEquals(expectedUpdateVersion, appsToUpdate.get(0).suggestedVersionCode);
assertEquals(expectedUpdateVersion, appsToUpdate.get(0).autoInstallVersionCode);
}
private void assertMainRepo() {