Remove unused imports, fix line lengths

2026-06-18 12:49:59 -04:00 · 2020-07-02 08:27:22 +02:00
parent 8a0b7eca12
commit 319b615da0
23 changed files with 29 additions and 46 deletions
--- a/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/PreferencesTest.java
@@ -28,7 +28,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowLog;

 import java.util.Map;
--- a/app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/ProvisionerTest.java
@@ -6,7 +6,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;

 import java.io.File;
 import java.io.IOException;
--- a/app/src/test/java/org/fdroid/fdroid/TestUtils.java
+++ b/app/src/test/java/org/fdroid/fdroid/TestUtils.java
@@ -20,7 +20,6 @@ import org.fdroid.fdroid.data.RepoProviderTest;
 import org.fdroid.fdroid.data.Schema;
 import org.mockito.AdditionalAnswers;
 import org.robolectric.Robolectric;
-import org.robolectric.RuntimeEnvironment;

 import java.io.File;
 import java.io.FileOutputStream;
--- a/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/UtilsTest.java
@@ -9,8 +9,6 @@ import org.fdroid.fdroid.views.AppDetailsRecyclerViewAdapter;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;

 import java.io.File;
 import java.util.Date;
--- a/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/ApkProviderTest.java
@@ -5,7 +5,6 @@ import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import org.fdroid.fdroid.Assert;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
--- a/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/AppPrefsProviderTest.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid.data;

 import android.app.Application;
 import org.fdroid.fdroid.Assert;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.TestUtils;
 import org.junit.Before;
 import org.junit.Test;
--- a/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/AppProviderTest.java
@@ -6,7 +6,6 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
--- a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
@@ -5,7 +5,6 @@ import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable.Cols;
 import org.fdroid.fdroid.mock.MockRepo;
--- a/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/DatabaseMigration.java
@@ -10,7 +10,6 @@ import android.database.sqlite.SQLiteOpenHelper;

 import androidx.test.core.app.ApplicationProvider;

-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.TestUtils;
 import org.fdroid.fdroid.Utils;
@@ -18,10 +17,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowContentResolver;

@Config(application = Application.class)
@RunWith(RobolectricTestRunner.class)
--- a/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/InstalledAppProviderTest.java
@@ -37,7 +37,8 @@ public class InstalledAppProviderTest extends FDroidProviderTest {

    @Test
    public void insertSingleApp() {
-        Map<String, Long> foundBefore = InstalledAppProvider.Helper.lastUpdateTimes(ApplicationProvider.getApplicationContext());
+        Map<String, Long> foundBefore = InstalledAppProvider.Helper.lastUpdateTimes(
+                ApplicationProvider.getApplicationContext());
        assertEquals(foundBefore.size(), 0);

        ContentValues values = new ContentValues();
@@ -51,7 +52,8 @@ public class InstalledAppProviderTest extends FDroidProviderTest {
        values.put(Cols.SIGNATURE, "000111222333444555666777888999aaabbbcccdddeeefff");
        contentResolver.insert(InstalledAppProvider.getContentUri(), values);

-        Map<String, Long> foundAfter = InstalledAppProvider.Helper.lastUpdateTimes(ApplicationProvider.getApplicationContext());
+        Map<String, Long> foundAfter = InstalledAppProvider.Helper.lastUpdateTimes(
+                ApplicationProvider.getApplicationContext());
        assertEquals(1, foundAfter.size());
        assertEquals(100000000L, foundAfter.get("org.example.test-app").longValue());

--- a/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/PreferredSignatureTest.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid.data;

 import android.app.Application;
 import android.content.Context;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.TestUtils;
 import org.junit.Before;
--- a/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/RepoXMLHandlerTest.java
@@ -22,23 +22,21 @@

 package org.fdroid.fdroid.data;

-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
+
+import androidx.annotation.NonNull;
+
 import org.apache.commons.io.FileUtils;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.mock.MockRepo;
 import org.fdroid.fdroid.mock.RepoDetails;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
 import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;

-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.IOException;
@@ -51,6 +49,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;

+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
--- a/app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/net/HttpDownloaderTest.java
@@ -1,19 +1,18 @@
 package org.fdroid.fdroid.net;

 import android.net.Uri;
+
 import org.apache.commons.net.util.SubnetUtils;
-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.FDroidApp;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;

 import java.net.MalformedURLException;
 import java.net.URL;

-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;

@RunWith(RobolectricTestRunner.class)
@SuppressWarnings("LineLength")
--- a/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java
@@ -1,9 +1,10 @@
 package org.fdroid.fdroid.updater;

 import android.content.ContentValues;
-import androidx.annotation.NonNull;
 import android.util.Log;
-import org.fdroid.fdroid.BuildConfig;
+
+import androidx.annotation.NonNull;
+
 import org.fdroid.fdroid.IndexUpdater.UpdateException;
 import org.fdroid.fdroid.data.Repo;
 import org.fdroid.fdroid.data.RepoProvider;
@@ -11,7 +12,6 @@ import org.fdroid.fdroid.data.Schema.RepoTable.Cols;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;

 import java.util.List;

--- a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
@@ -1,7 +1,7 @@
 package org.fdroid.fdroid.updater;

 import android.content.ContentValues;
-import org.fdroid.fdroid.BuildConfig;
+
 import org.fdroid.fdroid.IndexUpdater;
 import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.AppProvider;
@@ -13,7 +13,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;

 import static org.junit.Assert.assertThat;

--- a/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java
@@ -1,12 +1,10 @@
 package org.fdroid.fdroid.updater;

-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.IndexUpdater;
 import org.fdroid.fdroid.Utils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;

 /**
 * Tests two versions of the official main F-Droid metadata, from 10 days apart. This is here
--- a/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java
@@ -1,6 +1,5 @@
 package org.fdroid.fdroid.updater;

-import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.IndexUpdater;
 import org.fdroid.fdroid.data.Apk;
 import org.fdroid.fdroid.data.ApkProvider;
@@ -11,7 +10,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;

 import java.util.List;