mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-06-17 20:29:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

[app] kill old IndexUpdaters and related code as this is now in libraries via RepoUpdater

Browse Source
This commit is contained in:
Torsten Grote
2022-06-15 10:19:32 -03:00
committed by Hans-Christoph Steiner
parent 3c25144331
commit a783d3cb94
20 changed files with 119 additions and 1858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
app/src/androidTest/java/org/fdroid/fdroid/updater/SwapRepoEmulatorTest.java
View File

@@ -1,6 +1,5 @@
package org.fdroid.fdroid.updater;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
@@ -10,19 +9,11 @@ import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.filters.LargeTest;
import android.text.TextUtils;
import android.util.Log;
import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.FDroidApp;
import org.fdroid.fdroid.Hasher;
import org.fdroid.fdroid.IndexUpdater;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.Utils;
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.fdroid.fdroid.nearby.LocalHTTPD;
import org.fdroid.fdroid.nearby.LocalRepoKeyStore;
import org.fdroid.fdroid.nearby.LocalRepoManager;
@@ -34,16 +25,12 @@ import java.io.File;
import java.io.IOException;
import java.net.Socket;
import java.security.cert.Certificate;
import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -58,7 +45,7 @@ public class SwapRepoEmulatorTest {
@Ignore
@Test
public void testSwap()
throws IOException, LocalRepoKeyStore.InitException, IndexUpdater.UpdateException, InterruptedException {
throws IOException, LocalRepoKeyStore.InitException, InterruptedException {
Looper.prepare();
LocalHTTPD localHttpd = null;
try {
@@ -108,50 +95,50 @@ public class SwapRepoEmulatorTest {
assertFalse(TextUtils.isEmpty(signingCert));
assertFalse(TextUtils.isEmpty(Utils.calcFingerprint(localCert)));
// Repo repoToDelete = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
// while (repoToDelete != null) {
// Log.d(TAG, "Removing old test swap repo matching this one: " + repoToDelete.address);
// RepoProvider.Helper.remove(context, repoToDelete.getId());
// repoToDelete = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
// }
//
// ContentValues values = new ContentValues(4);
// values.put(Schema.RepoTable.Cols.SIGNING_CERT, signingCert);
// values.put(Schema.RepoTable.Cols.ADDRESS, FDroidApp.repo.getAddress());
// values.put(Schema.RepoTable.Cols.NAME, "");
// values.put(Schema.RepoTable.Cols.IS_SWAP, true);
// final String lastEtag = UUID.randomUUID().toString();
// values.put(Schema.RepoTable.Cols.LAST_ETAG, lastEtag);
// RepoProvider.Helper.insert(context, values);
// Repo repo = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
// assertTrue(repo.isSwap);
// assertNotEquals(-1, repo.getId());
// assertEquals(lastEtag, repo.lastetag);
// assertNull(repo.lastUpdated);
//
// assertTrue(isPortInUse(FDroidApp.ipAddressString, FDroidApp.port));
// Thread.sleep(100);
// IndexUpdater updater = new IndexUpdater(context, repo);
// updater.update();
// assertTrue(updater.hasChanged());
//
// repo = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
// final Date lastUpdated = repo.lastUpdated;
// assertTrue("repo lastUpdated should be updated", new Date(2019, 5, 13).compareTo(repo.lastUpdated) > 0);
// App app = AppProvider.Helper.findSpecificApp(context.getContentResolver(),
// context.getPackageName(), repo.getId());
// assertEquals(context.getPackageName(), app.packageName);
// List<Apk> apks = ApkProvider.Helper.findByRepo(context, repo, Schema.ApkTable.Cols.ALL);
// assertEquals(1, apks.size());
// for (Apk apk : apks) {
// Log.i(TAG, "Apk: " + apk);
// assertEquals(context.getPackageName(), apk.packageName);
// assertEquals(BuildConfig.VERSION_NAME, apk.versionName);
// assertEquals(BuildConfig.VERSION_CODE, apk.versionCode);
// assertEquals(app.repoId, apk.repoId);
// }
//Repo repoToDelete = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
//while (repoToDelete != null) {
// Log.d(TAG, "Removing old test swap repo matching this one: " + repoToDelete.address);
// RepoProvider.Helper.remove(context, repoToDelete.getId());
// repoToDelete = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
//}
//
//ContentValues values = new ContentValues(4);
//values.put(Schema.RepoTable.Cols.SIGNING_CERT, signingCert);
//values.put(Schema.RepoTable.Cols.ADDRESS, FDroidApp.repo.getAddress());
//values.put(Schema.RepoTable.Cols.NAME, "");
//values.put(Schema.RepoTable.Cols.IS_SWAP, true);
//final String lastEtag = UUID.randomUUID().toString();
//values.put(Schema.RepoTable.Cols.LAST_ETAG, lastEtag);
//RepoProvider.Helper.insert(context, values);
//Repo repo = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
//assertTrue(repo.isSwap);
//assertNotEquals(-1, repo.getId());
//assertEquals(lastEtag, repo.lastetag);
//assertNull(repo.lastUpdated);
//
assertTrue(isPortInUse(FDroidApp.ipAddressString, FDroidApp.port));
//Thread.sleep(100);
//IndexUpdater updater = new IndexUpdater(context, repo);
//updater.update();
//assertTrue(updater.hasChanged());
//
//repo = RepoProvider.Helper.findByAddress(context, FDroidApp.repo.getAddress());
//final Date lastUpdated = repo.lastUpdated;
//assertTrue("repo lastUpdated should be updated", new Date(2019, 5, 13).compareTo(repo.lastUpdated) > 0);
//
//App app = AppProvider.Helper.findSpecificApp(context.getContentResolver(),
// context.getPackageName(), repo.getId());
//assertEquals(context.getPackageName(), app.packageName);
//
//List<Apk> apks = ApkProvider.Helper.findByRepo(context, repo, Schema.ApkTable.Cols.ALL);
//assertEquals(1, apks.size());
//for (Apk apk : apks) {
// Log.i(TAG, "Apk: " + apk);
// assertEquals(context.getPackageName(), apk.packageName);
// assertEquals(BuildConfig.VERSION_NAME, apk.versionName);
// assertEquals(BuildConfig.VERSION_CODE, apk.versionCode);
// assertEquals(app.repoId, apk.repoId);
//}
Intent mainIntent = new Intent(Intent.ACTION_MAIN, null);
mainIntent.addCategory(Intent.CATEGORY_LAUNCHER);
@@ -165,14 +152,14 @@ public class SwapRepoEmulatorTest {
}
LocalRepoService.runProcess(context, packageNames.toArray(new String[0]));
// updater = new IndexUpdater(context, repo);
// updater.update();
// assertTrue(updater.hasChanged());
// assertTrue("repo lastUpdated should be updated", lastUpdated.compareTo(repo.lastUpdated) < 0);
//
// for (String packageName : packageNames) {
// assertNotNull(ApkProvider.Helper.findByPackageName(context, packageName));
// }
//updater = new IndexUpdater(context, repo);
//updater.update();
//assertTrue(updater.hasChanged());
//assertTrue("repo lastUpdated should be updated", lastUpdated.compareTo(repo.lastUpdated) < 0);
//
//for (String packageName : packageNames) {
// assertNotNull(ApkProvider.Helper.findByPackageName(context, packageName));
//}
} finally {
if (localHttpd != null) {
localHttpd.stop();