From e25d26aca0859262409d85299358ee5610162873 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Mon, 1 Aug 2016 22:48:25 +1000 Subject: [PATCH] Moved tests into updater package, updated multiRepo.*.jar repos. The tests are in the .updater packate to make them easier to run as a suite in Android Studio. Now the package can be right clicked and ran to run all the tests to do with updating. The index jar files were updated so as to include info in most metadata fields (e.g. URLs/descriptions/summary/etc) to show that that particular part of metadata came from a specific repo. This will allow more specific tests to show that we can indeed query for an app with metadata provided by the repo with the highest priority. --- app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java | 2 +- .../fdroid/{ => updater}/AcceptableMultiRepoUpdaterTest.java | 3 ++- .../fdroid/fdroid/{ => updater}/MultiRepoUpdaterTest.java | 5 ++++- .../fdroid/{ => updater}/ProperMultiRepoUpdaterTest.java | 5 ++++- .../org/fdroid/fdroid/{ => updater}/RepoXMLHandlerTest.java | 4 +++- 5 files changed, 14 insertions(+), 5 deletions(-) rename app/src/test/java/org/fdroid/fdroid/{ => updater}/AcceptableMultiRepoUpdaterTest.java (98%) rename app/src/test/java/org/fdroid/fdroid/{ => updater}/MultiRepoUpdaterTest.java (98%) rename app/src/test/java/org/fdroid/fdroid/{ => updater}/ProperMultiRepoUpdaterTest.java (98%) rename app/src/test/java/org/fdroid/fdroid/{ => updater}/RepoXMLHandlerTest.java (99%) diff --git a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java index 21fa68d1e..984b99de7 100644 --- a/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java +++ b/app/src/main/java/org/fdroid/fdroid/RepoXMLHandler.java @@ -61,7 +61,7 @@ public class RepoXMLHandler extends DefaultHandler { private final StringBuilder curchars = new StringBuilder(); - interface IndexReceiver { + public interface IndexReceiver { void receiveRepo(String name, String description, String signingCert, int maxage, int version, long timestamp); void receiveApp(App app, List packages); diff --git a/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java similarity index 98% rename from app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java rename to app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java index aa7a09308..0b2363b80 100644 --- a/app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiRepoUpdaterTest.java @@ -1,10 +1,11 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.updater; import android.content.ContentValues; import android.support.annotation.NonNull; import android.util.Log; +import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.RepoUpdater.UpdateException; import org.fdroid.fdroid.data.Repo; import org.fdroid.fdroid.data.RepoProvider; diff --git a/app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/MultiRepoUpdaterTest.java similarity index 98% rename from app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java rename to app/src/test/java/org/fdroid/fdroid/updater/MultiRepoUpdaterTest.java index ec94df85e..a44769e74 100644 --- a/app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/MultiRepoUpdaterTest.java @@ -1,12 +1,15 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.updater; import android.content.ContentValues; import android.content.Context; import android.support.annotation.NonNull; import android.text.TextUtils; +import org.fdroid.fdroid.Preferences; +import org.fdroid.fdroid.RepoUpdater; import org.fdroid.fdroid.RepoUpdater.UpdateException; +import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.AppProvider; diff --git a/app/src/test/java/org/fdroid/fdroid/ProperMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java similarity index 98% rename from app/src/test/java/org/fdroid/fdroid/ProperMultiRepoUpdaterTest.java rename to app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java index 257e9f0f8..5463a7f88 100644 --- a/app/src/test/java/org/fdroid/fdroid/ProperMultiRepoUpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java @@ -1,9 +1,11 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.updater; import android.support.annotation.StringDef; import android.util.Log; +import org.fdroid.fdroid.BuildConfig; +import org.fdroid.fdroid.RepoUpdater; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.App; @@ -23,6 +25,7 @@ import java.util.List; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +// TODO: Use sdk=24 when Robolectric supports this @Config(constants = BuildConfig.class, sdk = 23) @RunWith(RobolectricGradleTestRunner.class) public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest { diff --git a/app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java b/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java similarity index 99% rename from app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java rename to app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java index 2f40767db..12751a40a 100644 --- a/app/src/test/java/org/fdroid/fdroid/RepoXMLHandlerTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/RepoXMLHandlerTest.java @@ -20,12 +20,14 @@ * MA 02110-1301, USA. */ -package org.fdroid.fdroid; +package org.fdroid.fdroid.updater; import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Log; +import org.fdroid.fdroid.BuildConfig; +import org.fdroid.fdroid.RepoXMLHandler; import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.data.Repo;