From fd50a2c730490292a49d96aaa31ebc14b3a9e5a6 Mon Sep 17 00:00:00 2001 From: Peter Serwylo Date: Thu, 11 Aug 2016 23:02:59 +1000 Subject: [PATCH] Remove unused code. The code only existed so that it could be used in a test. Subsequently, a further test was written to test this code (used by the first test). Since none of the code is actually used in the app, it has been removed. --- .../org/fdroid/fdroid/data/ApkProvider.java | 24 -------- .../fdroid/fdroid/data/ApkProviderTest.java | 61 ------------------- .../java/org/fdroid/fdroid/mock/MockApp.java | 16 ----- 3 files changed, 101 deletions(-) delete mode 100644 app/src/test/java/org/fdroid/fdroid/mock/MockApp.java diff --git a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java index d3ebecc6f..176bb03cc 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java +++ b/app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java @@ -62,30 +62,6 @@ public class ApkProvider extends FDroidProvider { return resolver.delete(uri, null, null); } - public static void deleteApksByApp(Context context, App app) { - ContentResolver resolver = context.getContentResolver(); - final Uri uri = getAppUri(app.packageName); - resolver.delete(uri, null, null); - } - - public static void deleteApks(final Context context, final List apks) { - if (apks.size() > ApkProvider.MAX_APKS_TO_QUERY) { - int middle = apks.size() / 2; - List apks1 = apks.subList(0, middle); - List apks2 = apks.subList(middle, apks.size()); - deleteApks(context, apks1); - deleteApks(context, apks2); - } else { - deleteApksSafely(context, apks); - } - } - - private static void deleteApksSafely(final Context context, final List apks) { - ContentResolver resolver = context.getContentResolver(); - final Uri uri = getContentUri(apks); - resolver.delete(uri, null, null); - } - public static Apk find(Context context, String packageName, int versionCode) { return find(context, packageName, versionCode, Cols.ALL); } diff --git a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java index b0aac5a04..65b738045 100644 --- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java +++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java @@ -10,7 +10,6 @@ import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.data.Schema.ApkTable.Cols; import org.fdroid.fdroid.data.Schema.RepoTable; import org.fdroid.fdroid.mock.MockApk; -import org.fdroid.fdroid.mock.MockApp; import org.fdroid.fdroid.mock.MockRepo; import org.junit.Test; import org.junit.runner.RunWith; @@ -23,7 +22,6 @@ import java.util.Date; import java.util.List; import static org.fdroid.fdroid.Assert.assertCantDelete; -import static org.fdroid.fdroid.Assert.assertContainsOnly; import static org.fdroid.fdroid.Assert.assertResultCount; import static org.fdroid.fdroid.Assert.insertApp; import static org.junit.Assert.assertEquals; @@ -64,65 +62,6 @@ public class ApkProviderTest extends FDroidProviderTest { assertResultCount(10, exampleApks); assertBelongsToApp(exampleApks, "com.example"); exampleApks.close(); - - ApkProvider.Helper.deleteApksByApp(context, new MockApp("com.example")); - - Cursor all = queryAllApks(); - assertResultCount(10, all); - assertBelongsToApp(all, "org.fdroid.fdroid"); - all.close(); - } - - @Test - public void testDeleteArbitraryApks() { - Apk one = insertApkForRepo("com.example.one", 1, 10); - Apk two = insertApkForRepo("com.example.two", 1, 10); - Apk three = insertApkForRepo("com.example.three", 1, 10); - Apk four = insertApkForRepo("com.example.four", 1, 10); - Apk five = insertApkForRepo("com.example.five", 1, 10); - - assertTotalApkCount(5); - - assertEquals("com.example.one", one.packageName); - assertEquals("com.example.two", two.packageName); - assertEquals("com.example.five", five.packageName); - - String[] expectedIds = { - "com.example.one", - "com.example.two", - "com.example.three", - "com.example.four", - "com.example.five", - }; - - List all = ApkProvider.Helper.findByRepo(context, new MockRepo(10), Cols.ALL); - List actualIds = new ArrayList<>(); - for (Apk apk : all) { - actualIds.add(apk.packageName); - } - - assertContainsOnly(actualIds, expectedIds); - - List toDelete = new ArrayList<>(3); - toDelete.add(two); - toDelete.add(three); - toDelete.add(four); - ApkProvider.Helper.deleteApks(context, toDelete); - - assertTotalApkCount(2); - - List allRemaining = ApkProvider.Helper.findByRepo(context, new MockRepo(10), Cols.ALL); - List actualRemainingIds = new ArrayList<>(); - for (Apk apk : allRemaining) { - actualRemainingIds.add(apk.packageName); - } - - String[] expectedRemainingIds = { - "com.example.one", - "com.example.five", - }; - - assertContainsOnly(actualRemainingIds, expectedRemainingIds); } @Test diff --git a/app/src/test/java/org/fdroid/fdroid/mock/MockApp.java b/app/src/test/java/org/fdroid/fdroid/mock/MockApp.java deleted file mode 100644 index 39e649981..000000000 --- a/app/src/test/java/org/fdroid/fdroid/mock/MockApp.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.fdroid.fdroid.mock; - -import org.fdroid.fdroid.data.App; - -public class MockApp extends App { - - public MockApp(String id) { - this(id, "App " + id); - } - - public MockApp(String id, String name) { - this.packageName = id; - this.name = name; - } - -}