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

Enable multirepo tests, make them pass.

Browse Source 
Tests were failing because the repository of existing and new apks were not
considered when deciding whether to update or insert them.
This commit is contained in:
Peter Serwylo 2016-08-01 22:25:21 +10:00
parent 8ed884887a
commit 6d2fdb2843
8 changed files with 193 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/data/AppProvider.java
View File

@ -649,8 +649,9 @@ public class AppProvider extends FDroidProvider {
}
protected AppQuerySelection querySingle(String packageName, long repoId) {
final String selection = PackageTable.NAME + "." + PackageTable.Cols.PACKAGE_NAME + " = ?";
final String[] args = {packageName};
final String selection = PackageTable.NAME + "." + PackageTable.Cols.PACKAGE_NAME + " = ? " +
" AND " + getTableName() + "." + Cols.REPO_ID + " = ? ";
final String[] args = {packageName, Long.toString(repoId)};
return new AppQuerySelection(selection, args);
}

3
app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java
View File

@ -177,13 +177,14 @@ public class RepoPersister {
String[] projection = new String[]{
Schema.ApkTable.Cols.Package.PACKAGE_NAME,
Schema.ApkTable.Cols.VERSION_CODE,
Schema.ApkTable.Cols.REPO_ID,
};
List<Apk> existingApks = ApkProvider.Helper.knownApks(context, packages, projection);
ArrayList<ContentProviderOperation> operations = new ArrayList<>(packages.size());
for (Apk apk : packages) {
boolean exists = false;
for (Apk existing : existingApks) {
if (existing.packageName.equals(apk.packageName) && existing.versionCode == apk.versionCode) {
if (existing.repo == apk.repo && existing.packageName.equals(apk.packageName) && existing.versionCode == apk.versionCode) {
exists = true;
break;
}

54
app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
View File

@ -39,49 +39,67 @@ public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
@Test
public void testAcceptableConflictingThenMainThenArchive() throws UpdateException {
assertEmpty();
if (updateConflicting() && updateMain() && updateArchive()) {
assertSomewhatAcceptable();
}
updateConflicting();
updateMain();
updateArchive();
assertSomewhatAcceptable();
}
@Test
public void testAcceptableConflictingThenArchiveThenMain() throws UpdateException {
assertEmpty();
if (updateConflicting() && updateArchive() && updateMain()) {
assertSomewhatAcceptable();
}
updateConflicting();
updateArchive();
updateMain();
assertSomewhatAcceptable();
}
@Test
public void testAcceptableArchiveThenMainThenConflicting() throws UpdateException {
assertEmpty();
if (updateArchive() && updateMain() && updateConflicting()) {
assertSomewhatAcceptable();
}
updateArchive();
updateMain();
updateConflicting();
assertSomewhatAcceptable();
}
@Test
public void testAcceptableArchiveThenConflictingThenMain() throws UpdateException {
assertEmpty();
if (updateArchive() && updateConflicting() && updateMain()) {
assertSomewhatAcceptable();
}
updateArchive();
updateConflicting();
updateMain();
assertSomewhatAcceptable();
}
@Test
public void testAcceptableMainThenArchiveThenConflicting() throws UpdateException {
assertEmpty();
if (updateMain() && updateArchive() && updateConflicting()) {
assertSomewhatAcceptable();
}
updateMain();
updateArchive();
updateConflicting();
assertSomewhatAcceptable();
}
@Test
public void testAcceptableMainThenConflictingThenArchive() throws UpdateException {
assertEmpty();
if (updateMain() && updateConflicting() && updateArchive()) {
assertSomewhatAcceptable();
}
updateMain();
updateConflicting();
updateArchive();
assertSomewhatAcceptable();
}
@NonNull

15
app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
View File

@ -178,19 +178,19 @@ public abstract class MultiRepoUpdaterTest extends FDroidProviderTest {
return new RepoUpdater(context, createRepo(name, uri, context));
}
protected boolean updateConflicting() throws UpdateException {
return updateRepo(createUpdater(REPO_CONFLICTING, REPO_CONFLICTING_URI, context), "multiRepo.conflicting.jar");
protected void updateConflicting() throws UpdateException {
updateRepo(createUpdater(REPO_CONFLICTING, REPO_CONFLICTING_URI, context), "multiRepo.conflicting.jar");
}
protected boolean updateMain() throws UpdateException {
return updateRepo(createUpdater(REPO_MAIN, REPO_MAIN_URI, context), "multiRepo.normal.jar");
protected void updateMain() throws UpdateException {
updateRepo(createUpdater(REPO_MAIN, REPO_MAIN_URI, context), "multiRepo.normal.jar");
}
protected boolean updateArchive() throws UpdateException {
return updateRepo(createUpdater(REPO_ARCHIVE, REPO_ARCHIVE_URI, context), "multiRepo.archive.jar");
protected void updateArchive() throws UpdateException {
updateRepo(createUpdater(REPO_ARCHIVE, REPO_ARCHIVE_URI, context), "multiRepo.archive.jar");
}
protected boolean updateRepo(RepoUpdater updater, String indexJarPath) throws UpdateException {
protected void updateRepo(RepoUpdater updater, String indexJarPath) throws UpdateException {
File indexJar = TestUtils.copyResourceToTempFile(indexJarPath);
try {
updater.processDownloadedFile(indexJar);
@ -199,7 +199,6 @@ public abstract class MultiRepoUpdaterTest extends FDroidProviderTest {
indexJar.delete();
}
}
return true;
}
}

180
app/src/test/java/org/fdroid/fdroid/ProperMultiRepoUpdaterTest.java
View File

@ -1,77 +1,123 @@
package org.fdroid.fdroid;
import android.support.annotation.StringDef;
import android.util.Log;
import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.data.ApkProvider;
import org.fdroid.fdroid.data.App;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricGradleTestRunner;
import org.robolectric.annotation.Config;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
/*
At time fo writing, the following tests did not pass. This is because the multi-repo support
in F-Droid was not sufficient. When working on proper multi repo support than this should be
uncommented and all these tests will be required to pass:
@Config(constants = BuildConfig.class)
@Config(constants = BuildConfig.class, sdk = 23)
@RunWith(RobolectricGradleTestRunner.class)
*/
@SuppressWarnings("unused")
public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
private static final String TAG = "ProperMultiRepoSupport";
/*@Test
public void testCorrectConflictingThenMainThenArchive() throws UpdateException {
@Retention(RetentionPolicy.SOURCE)
@StringDef({"Conflicting", "Normal"})
public @interface RepoIdentifier {}
@Test
public void mainRepo() throws RepoUpdater.UpdateException {
assertEmpty();
if (updateConflicting() && updateMain() && updateArchive()) {
assertExpected();
}
updateMain();
assertMainRepo(RepoProvider.Helper.all(context));
}
@Test
public void testCorrectConflictingThenArchiveThenMain() throws UpdateException {
public void archiveRepo() throws RepoUpdater.UpdateException {
assertEmpty();
if (updateConflicting() && updateArchive() && updateMain()) {
assertExpected();
}
updateArchive();
assertMainArchiveRepo(RepoProvider.Helper.all(context));
}
@Test
public void testCorrectArchiveThenMainThenConflicting() throws UpdateException {
public void conflictingRepo() throws RepoUpdater.UpdateException {
assertEmpty();
if (updateArchive() && updateMain() && updateConflicting()) {
assertExpected();
}
updateConflicting();
assertConflictingRepo(RepoProvider.Helper.all(context));
}
@Test
public void testCorrectArchiveThenConflictingThenMain() throws UpdateException {
public void testCorrectConflictingThenMainThenArchive() throws RepoUpdater.UpdateException {
assertEmpty();
if (updateArchive() && updateConflicting() && updateMain()) {
assertExpected();
}
updateConflicting();
updateMain();
updateArchive();
assertExpected();
}
@Test
public void testCorrectMainThenArchiveThenConflicting() throws UpdateException {
public void testCorrectConflictingThenArchiveThenMain() throws RepoUpdater.UpdateException {
assertEmpty();
if (updateMain() && updateArchive() && updateConflicting()) {
assertExpected();
}
updateConflicting();
updateArchive();
updateMain();
assertExpected();
}
@Test
public void testCorrectMainThenConflictingThenArchive() throws UpdateException {
public void testCorrectArchiveThenMainThenConflicting() throws RepoUpdater.UpdateException {
assertEmpty();
if (updateMain() && updateConflicting() && updateArchive()) {
assertExpected();
}
}*/
updateArchive();
updateMain();
updateConflicting();
assertExpected();
}
@Test
public void testCorrectArchiveThenConflictingThenMain() throws RepoUpdater.UpdateException {
assertEmpty();
updateArchive();
updateConflicting();
updateMain();
assertExpected();
}
@Test
public void testCorrectMainThenArchiveThenConflicting() throws RepoUpdater.UpdateException {
assertEmpty();
updateMain();
updateArchive();
updateConflicting();
assertExpected();
}
@Test
public void testCorrectMainThenConflictingThenArchive() throws RepoUpdater.UpdateException {
assertEmpty();
updateMain();
updateConflicting();
updateArchive();
assertExpected();
}
/**
* Check that all of the expected apps and apk versions are available in the database. This
@ -107,6 +153,65 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
assertApksExist(apks, "com.uberspot.a2048", new int[]{18, 19});
assertApksExist(apks, "org.adaway", new int[]{52, 53, 54});
assertApksExist(apks, "siir.es.adbWireless", new int[]{12});
assert2048(repo, "Normal");
assertAdAway(repo, "Normal");
assertAdb(repo, "Normal");
}
/**
* @param id An identifier that we've put in the metadata for each repo to ensure that
* we can identify the metadata is coming from the correct repo.
*/
private void assert2048(Repo repo, @RepoIdentifier String id) {
App a2048 = AppProvider.Helper.findByPackageName(context.getContentResolver(), "com.uberspot.a2048", repo.getId());
assertNotNull(a2048);
assertEquals("2048", a2048.name);
assertEquals(String.format("<p>2048 from %s repo.</p>", id), a2048.description);
assertEquals(String.format("Puzzle game (%s)", id), a2048.summary);
assertEquals(String.format("https://github.com/uberspot/2048-android?%s", id), a2048.webURL);
assertEquals(String.format("https://github.com/uberspot/2048-android?code&%s", id), a2048.sourceURL);
assertEquals(String.format("https://github.com/uberspot/2048-android/issues?%s", id), a2048.trackerURL);
}
/** @see ProperMultiRepoUpdaterTest#assert2048(Repo, String) */
private void assertAdAway(Repo repo, @RepoIdentifier String id) {
App adaway = AppProvider.Helper.findByPackageName(context.getContentResolver(), "org.adaway", repo.getId());
assertNotNull(adaway);
assertEquals(String.format("AdAway", id), adaway.name);
assertEquals(String.format("<p>AdAway from %s repo.</p>", id), adaway.description);
assertEquals(String.format("Block advertisements (%s)", id), adaway.summary);
assertEquals(String.format("http://sufficientlysecure.org/index.php/adaway?%s", id), adaway.webURL);
assertEquals(String.format("https://github.com/dschuermann/ad-away?%s", id), adaway.sourceURL);
assertEquals(String.format("https://github.com/dschuermann/ad-away/issues?%s", id), adaway.trackerURL);
assertEquals(String.format("https://github.com/dschuermann/ad-away/raw/HEAD/CHANGELOG?%s", id), adaway.changelogURL);
assertEquals(String.format("http://sufficientlysecure.org/index.php/adaway?%s", id), adaway.donateURL);
assertEquals(String.format("369138", id), adaway.flattrID);
}
/** @see ProperMultiRepoUpdaterTest#assert2048(Repo, String) */
private void assertAdb(Repo repo, @RepoIdentifier String id) {
App adb = AppProvider.Helper.findByPackageName(context.getContentResolver(), "siir.es.adbWireless", repo.getId());
assertNotNull(adb);
assertEquals("adbWireless", adb.name);
assertEquals(String.format("<p>adbWireless from %s repo.</p>", id), adb.description);
assertEquals(String.format("Wireless adb (%s)", id), adb.summary);
assertEquals(String.format("https://adbwireless.example.com?%s", id), adb.webURL);
assertEquals(String.format("https://adbwireless.example.com/source?%s", id), adb.sourceURL);
assertEquals(String.format("https://adbwireless.example.com/issues?%s", id), adb.trackerURL);
}
/** @see ProperMultiRepoUpdaterTest#assert2048(Repo, String) */
private void assertCalendar(Repo repo, @RepoIdentifier String id) {
App calendar = AppProvider.Helper.findByPackageName(context.getContentResolver(), "org.dgtale.icsimport", repo.getId());
assertNotNull(calendar);
assertEquals("Add to calendar", calendar.name);
assertEquals(String.format("<p>Add to calendar from %s repo.</p>", id), calendar.description);
assertEquals(String.format("Import .ics files into calendar (%s)", id), calendar.summary);
assertEquals(String.format("https://github.com/danielegobbetti/ICSImport/blob/HEAD/README.md?%s", id), calendar.webURL);
assertEquals(String.format("https://github.com/danielegobbetti/ICSImport?%s", id), calendar.sourceURL);
assertEquals(String.format("https://github.com/danielegobbetti/ICSImport/issues?%s", id), calendar.trackerURL);
assertEquals("2225390", calendar.flattrID);
}
/**
@ -131,6 +236,8 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
List<Apk> apks = ApkProvider.Helper.findByRepo(context, repo, Schema.ApkTable.Cols.ALL);
assertEquals("Apks for main archive repo", 13, apks.size());
assertApksExist(apks, "org.adaway", new int[]{35, 36, 37, 38, 40, 42, 45, 46, 47, 48, 49, 50, 51});
assertAdAway(repo, "Normal");
}
/**
@ -147,9 +254,12 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
Repo repo = findRepo(REPO_CONFLICTING, allRepos);
List<Apk> apks = ApkProvider.Helper.findByRepo(context, repo, Schema.ApkTable.Cols.ALL);
assertEquals("Apks for main repo", 6, apks.size());
assertEquals("Apks for conflicting repo", 6, apks.size());
assertApksExist(apks, "org.adaway", new int[]{50, 51, 52, 53});
assertApksExist(apks, "org.dgtale.icsimport", new int[]{2, 3});
assertAdAway(repo, "Conflicting");
assertCalendar(repo, "Conflicting");
}
}

BIN
app/src/test/resources/multiRepo.archive.jar
View File

Binary file not shown.

BIN
app/src/test/resources/multiRepo.conflicting.jar
View File

Binary file not shown.

BIN
app/src/test/resources/multiRepo.normal.jar
View File

Binary file not shown.