From aca94bcb68dff22157cff89e8efd13e7b26e7a4c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 27 May 2016 12:25:28 +0200 Subject: [PATCH] move Provider tests into same java package the Providers This allows the tests to call more methods directly without having to use `public` visibility. --- app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java | 1 + .../fdroid/fdroid/{ => data}/ApkProviderHelperTest.java | 6 +++--- .../org/fdroid/fdroid/{ => data}/ApkProviderTest.java | 7 ++----- .../org/fdroid/fdroid/{ => data}/AppProviderTest.java | 8 +++----- .../org/fdroid/fdroid/{ => data}/BaseApkProviderTest.java | 5 ++--- .../org/fdroid/fdroid/{ => data}/FDroidProviderTest.java | 8 +------- .../fdroid/fdroid/{ => data}/InstalledAppCacheTest.java | 6 ++---- .../fdroid/{ => data}/InstalledAppProviderTest.java | 7 ++----- 8 files changed, 16 insertions(+), 32 deletions(-) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/ApkProviderHelperTest.java (98%) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/ApkProviderTest.java (98%) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/AppProviderTest.java (98%) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/BaseApkProviderTest.java (95%) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/FDroidProviderTest.java (96%) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/InstalledAppCacheTest.java (97%) rename app/src/androidTest/java/org/fdroid/fdroid/{ => data}/InstalledAppProviderTest.java (96%) diff --git a/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java index 62e90189b..21a49518c 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java @@ -14,6 +14,7 @@ import junit.framework.AssertionFailedError; import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.AppProvider; +import org.fdroid.fdroid.data.FDroidProviderTest; import org.fdroid.fdroid.receiver.PackageAddedReceiver; import org.fdroid.fdroid.receiver.PackageRemovedReceiver; import org.fdroid.fdroid.receiver.PackageUpgradedReceiver; diff --git a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderHelperTest.java similarity index 98% rename from app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderHelperTest.java index 846f7194f..307655a72 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderHelperTest.java @@ -1,11 +1,11 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.data; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; -import org.fdroid.fdroid.data.Apk; -import org.fdroid.fdroid.data.ApkProvider; +import org.fdroid.fdroid.TestUtils; +import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.mock.MockApk; import java.util.ArrayList; diff --git a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderTest.java similarity index 98% rename from app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderTest.java index 814d90f57..4dced204f 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -1,12 +1,10 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.data; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; -import org.fdroid.fdroid.data.Apk; -import org.fdroid.fdroid.data.ApkProvider; -import org.fdroid.fdroid.data.RepoProvider; +import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.mock.MockApk; import org.fdroid.fdroid.mock.MockApp; import org.fdroid.fdroid.mock.MockRepo; @@ -333,5 +331,4 @@ public class ApkProviderTest extends BaseApkProviderTest { assertEquals(1, apk.versionCode); assertEquals(10, apk.repo); } - } diff --git a/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/AppProviderTest.java similarity index 98% rename from app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/AppProviderTest.java index 81f0e5a22..b19c1d819 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/AppProviderTest.java @@ -1,14 +1,12 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.data; import android.content.ContentResolver; import android.content.ContentValues; import android.content.res.Resources; import android.database.Cursor; -import org.fdroid.fdroid.data.ApkProvider; -import org.fdroid.fdroid.data.App; -import org.fdroid.fdroid.data.AppProvider; -import org.fdroid.fdroid.data.InstalledAppCacheUpdater; +import org.fdroid.fdroid.R; +import org.fdroid.fdroid.TestUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/BaseApkProviderTest.java similarity index 95% rename from app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/BaseApkProviderTest.java index acaf3e12d..f5a73197c 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/BaseApkProviderTest.java @@ -1,11 +1,10 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.data; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; -import org.fdroid.fdroid.data.Apk; -import org.fdroid.fdroid.data.ApkProvider; +import org.fdroid.fdroid.TestUtils; import java.util.List; diff --git a/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/FDroidProviderTest.java similarity index 96% rename from app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/FDroidProviderTest.java index e9f9e9517..d424ecbee 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/FDroidProviderTest.java @@ -1,4 +1,4 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.data; import android.annotation.TargetApi; import android.content.ContentValues; @@ -10,12 +10,6 @@ import android.os.Build; import android.provider.ContactsContract; import android.test.ProviderTestCase2MockContext; -import org.fdroid.fdroid.data.ApkProvider; -import org.fdroid.fdroid.data.AppProvider; -import org.fdroid.fdroid.data.FDroidProvider; -import org.fdroid.fdroid.data.InstalledAppProvider; -import org.fdroid.fdroid.data.RepoProvider; - import java.util.List; import mock.MockContextEmptyComponents; diff --git a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppCacheTest.java similarity index 97% rename from app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppCacheTest.java index 0af7acde9..cb63f631a 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppCacheTest.java @@ -1,11 +1,9 @@ -package org.fdroid.fdroid; - -import org.fdroid.fdroid.data.InstalledAppProvider; +package org.fdroid.fdroid.data; import mock.MockInstallablePackageManager; /** - * Tests the ability of the {@link org.fdroid.fdroid.data.InstalledAppCacheUpdater} to stay in sync with + * Tests the ability of the {@link InstalledAppCacheUpdater} to stay in sync with * the {@link android.content.pm.PackageManager}. * For practical reasons, it extends FDroidProviderTest, although there is also a * separate test for the InstalledAppProvider which tests the CRUD operations in more detail. diff --git a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java b/app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java similarity index 96% rename from app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java rename to app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java index 1613eecb5..f36fcfed3 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java @@ -1,11 +1,8 @@ -package org.fdroid.fdroid; +package org.fdroid.fdroid.data; import android.content.ContentValues; -import org.fdroid.fdroid.data.ApkProvider; -import org.fdroid.fdroid.data.AppProvider; -import org.fdroid.fdroid.data.InstalledAppProvider; -import org.fdroid.fdroid.data.RepoProvider; +import org.fdroid.fdroid.TestUtils; import mock.MockInstallablePackageManager;