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

move Provider tests into same java package the Providers

Browse Source 
This allows the tests to call more methods directly without having to use
`public` visibility.
This commit is contained in:
Hans-Christoph Steiner 2016-05-27 12:25:28 +02:00
parent c947f24495
commit aca94bcb68
8 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/androidTest/java/org/fdroid/fdroid/TestUtils.java
View File

@ -14,6 +14,7 @@ import junit.framework.AssertionFailedError;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.ApkProvider;
import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.FDroidProviderTest;
import org.fdroid.fdroid.receiver.PackageAddedReceiver; import org.fdroid.fdroid.receiver.PackageAddedReceiver;
import org.fdroid.fdroid.receiver.PackageRemovedReceiver; import org.fdroid.fdroid.receiver.PackageRemovedReceiver;
import org.fdroid.fdroid.receiver.PackageUpgradedReceiver; import org.fdroid.fdroid.receiver.PackageUpgradedReceiver;

6
app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderHelperTest.java
View File

@ -1,11 +1,11 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.TestUtils;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.mock.MockApk; import org.fdroid.fdroid.mock.MockApk;
import java.util.ArrayList; import java.util.ArrayList;

7
app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/ApkProviderTest.java
View File

@ -1,12 +1,10 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.TestUtils;
import org.fdroid.fdroid.data.ApkProvider;
import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.mock.MockApk; import org.fdroid.fdroid.mock.MockApk;
import org.fdroid.fdroid.mock.MockApp; import org.fdroid.fdroid.mock.MockApp;
import org.fdroid.fdroid.mock.MockRepo; import org.fdroid.fdroid.mock.MockRepo;
@ -333,5 +331,4 @@ public class ApkProviderTest extends BaseApkProviderTest {
assertEquals(1, apk.versionCode); assertEquals(1, apk.versionCode);
assertEquals(10, apk.repo); assertEquals(10, apk.repo);
} }
} }

8
app/src/androidTest/java/org/fdroid/fdroid/AppProviderTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/AppProviderTest.java
View File

@ -1,14 +1,12 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.res.Resources; import android.content.res.Resources;
import android.database.Cursor; import android.database.Cursor;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.data.App; import org.fdroid.fdroid.TestUtils;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.InstalledAppCacheUpdater;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

5
app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/BaseApkProviderTest.java
View File

@ -1,11 +1,10 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import android.content.ContentValues; import android.content.ContentValues;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.TestUtils;
import org.fdroid.fdroid.data.ApkProvider;
import java.util.List; import java.util.List;

8
app/src/androidTest/java/org/fdroid/fdroid/FDroidProviderTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/FDroidProviderTest.java
View File

@ -1,4 +1,4 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.content.ContentValues; import android.content.ContentValues;
@ -10,12 +10,6 @@ import android.os.Build;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.test.ProviderTestCase2MockContext; 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 java.util.List;
import mock.MockContextEmptyComponents; import mock.MockContextEmptyComponents;

6
app/src/androidTest/java/org/fdroid/fdroid/InstalledAppCacheTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppCacheTest.java
View File

@ -1,11 +1,9 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import org.fdroid.fdroid.data.InstalledAppProvider;
import mock.MockInstallablePackageManager; 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}. * the {@link android.content.pm.PackageManager}.
* For practical reasons, it extends FDroidProviderTest<InstalledAppProvider>, although there is also a * For practical reasons, it extends FDroidProviderTest<InstalledAppProvider>, although there is also a
* separate test for the InstalledAppProvider which tests the CRUD operations in more detail. * separate test for the InstalledAppProvider which tests the CRUD operations in more detail.

7
app/src/androidTest/java/org/fdroid/fdroid/InstalledAppProviderTest.java → app/src/androidTest/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
View File

@ -1,11 +1,8 @@
package org.fdroid.fdroid; package org.fdroid.fdroid.data;
import android.content.ContentValues; import android.content.ContentValues;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.TestUtils;
import org.fdroid.fdroid.data.AppProvider;
import org.fdroid.fdroid.data.InstalledAppProvider;
import org.fdroid.fdroid.data.RepoProvider;
import mock.MockInstallablePackageManager; import mock.MockInstallablePackageManager;