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

Improved tests to catch incorrect suggested versions with multi repos.

Browse Source 
This is the bug outlined in #974. This commit just adds a test which
catches the problem, but does not fix it yet.
This commit is contained in:
Peter Serwylo 2017-04-28 09:39:24 +10:00
parent f8c9d7ec8e
commit b1a1c68ad7
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java
View File

@ -11,6 +11,7 @@ import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.ApkProvider;
import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.App;
import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.InstalledAppTestUtils;
import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider; import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema; import org.fdroid.fdroid.data.Schema;
@ -68,6 +69,9 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
assertEmpty(); assertEmpty();
updateMain(); updateMain();
assertMainRepo(); assertMainRepo();
// Even though there is a version 54 in the repo, version 53 is marked as the current version.
assertCanUpdate("org.adaway", 49, 53);
} }
@Test @Test
@ -75,6 +79,8 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
assertEmpty(); assertEmpty();
updateArchive(); updateArchive();
assertMainArchiveRepoMetadata(); assertMainArchiveRepoMetadata();
assertCanUpdate("org.adaway", 49, 51);
} }
@Test @Test
@ -82,6 +88,8 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
assertEmpty(); assertEmpty();
updateConflicting(); updateConflicting();
assertConflictingRepo(); assertConflictingRepo();
assertCanUpdate("org.adaway", 49, 53);
} }
private Map<String, App> allApps() { private Map<String, App> allApps() {
@ -228,6 +236,17 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
assertMainRepo(repos); assertMainRepo(repos);
assertMainArchiveRepoMetadata(repos); assertMainArchiveRepoMetadata(repos);
assertConflictingRepo(repos); assertConflictingRepo(repos);
// Even though there is a version 54 in the repo, version 53 is marked as the current version.
assertCanUpdate("org.adaway", 49, 53);
}
private void assertCanUpdate(String packageName, int installedVersion, int expectedUpdateVersion) {
InstalledAppTestUtils.install(context, packageName, installedVersion, "v" + installedVersion);
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);
} }
private void assertMainRepo() { private void assertMainRepo() {