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

code formatting to please checkstyle

Browse Source
This commit is contained in:
Hans-Christoph Steiner 2019-06-11 23:48:05 +02:00
parent bac0ae8f25
commit d406a5d66c
6 changed files with 18 additions and 16 deletions

1
app/src/test/java/org/fdroid/fdroid/updater/AcceptableMultiIndexUpdaterTest.java

@ -1,4 +1,3 @@
package org.fdroid.fdroid.updater; package org.fdroid.fdroid.updater;
import android.content.ContentValues; import android.content.ContentValues;

2
app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java

@ -66,7 +66,7 @@ public class AppIconsTest extends MultiIndexUpdaterTest {
private void assertIconUrl(String expectedUrl) { private void assertIconUrl(String expectedUrl) {
App app = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(), App app = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(),
"org.adaway", new String[] {Schema.AppMetadataTable.Cols.ICON_URL}); "org.adaway", new String[]{Schema.AppMetadataTable.Cols.ICON_URL});
assertEquals(app.iconUrl, expectedUrl); assertEquals(app.iconUrl, expectedUrl);
} }

1
app/src/test/java/org/fdroid/fdroid/updater/FDroidRepoUpdateTest.java

@ -1,4 +1,3 @@
package org.fdroid.fdroid.updater; package org.fdroid.fdroid.updater;
import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.BuildConfig;

9
app/src/test/java/org/fdroid/fdroid/updater/Issue763MultiRepo.java

@ -1,6 +1,5 @@
package org.fdroid.fdroid.updater; package org.fdroid.fdroid.updater;
import android.content.ContentValues;
import org.fdroid.fdroid.BuildConfig; import org.fdroid.fdroid.BuildConfig;
import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.IndexUpdater;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
@ -105,7 +104,7 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
private void assertAntoxExists() { private void assertAntoxExists() {
String packageName = "chat.tox.antox"; String packageName = "chat.tox.antox";
List<Apk> actualApksAfterUpdate = ApkProvider.Helper.findByRepo(context, antoxRepo, Schema.ApkTable.Cols.ALL); List<Apk> actualApksAfterUpdate = ApkProvider.Helper.findByRepo(context, antoxRepo, Schema.ApkTable.Cols.ALL);
int[] expectedVersions = new int[] {15421}; int[] expectedVersions = new int[]{15421};
assertApp(packageName, expectedVersions); assertApp(packageName, expectedVersions);
assertApksExist(actualApksAfterUpdate, packageName, expectedVersions); assertApksExist(actualApksAfterUpdate, packageName, expectedVersions);
@ -115,17 +114,17 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
List<Apk> actualApksAfterUpdate = ApkProvider.Helper.findByRepo(context, microGRepo, Schema.ApkTable.Cols.ALL); List<Apk> actualApksAfterUpdate = ApkProvider.Helper.findByRepo(context, microGRepo, Schema.ApkTable.Cols.ALL);
String vendingPackage = "com.android.vending"; String vendingPackage = "com.android.vending";
int[] expectedVendingVersions = new int[] {1}; int[] expectedVendingVersions = new int[]{1};
assertApp(vendingPackage, expectedVendingVersions); assertApp(vendingPackage, expectedVendingVersions);
assertApksExist(actualApksAfterUpdate, vendingPackage, expectedVendingVersions); assertApksExist(actualApksAfterUpdate, vendingPackage, expectedVendingVersions);
String gmsPackage = "com.google.android.gms"; String gmsPackage = "com.google.android.gms";
int[] expectedGmsVersions = new int[] {11059462, 10545451, 10545440, 10087438, 10087435, 9258259, 8492252, }; int[] expectedGmsVersions = new int[]{11059462, 10545451, 10545440, 10087438, 10087435, 9258259, 8492252};
assertApp(gmsPackage, expectedGmsVersions); assertApp(gmsPackage, expectedGmsVersions);
assertApksExist(actualApksAfterUpdate, gmsPackage, expectedGmsVersions); assertApksExist(actualApksAfterUpdate, gmsPackage, expectedGmsVersions);
String gsfPackage = "com.google.android.gsf"; String gsfPackage = "com.google.android.gsf";
int[] expectedGsfVersions = new int[] {8}; int[] expectedGsfVersions = new int[]{8};
assertApp(gsfPackage, expectedGsfVersions); assertApp(gsfPackage, expectedGsfVersions);
assertApksExist(actualApksAfterUpdate, gsfPackage, expectedGsfVersions); assertApksExist(actualApksAfterUpdate, gsfPackage, expectedGsfVersions);
} }

5
app/src/test/java/org/fdroid/fdroid/updater/MultiIndexUpdaterTest.java

@ -1,14 +1,13 @@
package org.fdroid.fdroid.updater; package org.fdroid.fdroid.updater;
import android.content.ContentValues; import android.content.ContentValues;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.text.TextUtils; import android.text.TextUtils;
import org.fdroid.fdroid.IndexV1Updater;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.IndexUpdater; import org.fdroid.fdroid.IndexUpdater;
import org.fdroid.fdroid.IndexUpdater.UpdateException; import org.fdroid.fdroid.IndexUpdater.UpdateException;
import org.fdroid.fdroid.IndexV1Updater;
import org.fdroid.fdroid.Preferences;
import org.fdroid.fdroid.TestUtils; import org.fdroid.fdroid.TestUtils;
import org.fdroid.fdroid.data.Apk; import org.fdroid.fdroid.data.Apk;
import org.fdroid.fdroid.data.ApkProvider; import org.fdroid.fdroid.data.ApkProvider;

16
app/src/test/java/org/fdroid/fdroid/updater/ProperMultiIndexUpdaterTest.java

@ -1,4 +1,3 @@
package org.fdroid.fdroid.updater; package org.fdroid.fdroid.updater;
import android.content.ContentValues; import android.content.ContentValues;
@ -41,7 +40,8 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@StringDef({"Conflicting", "Normal"}) @StringDef({"Conflicting", "Normal"})
public @interface RepoIdentifier { } public @interface RepoIdentifier {
}
@Test @Test
public void appsRemovedFromRepo() throws IndexUpdater.UpdateException { public void appsRemovedFromRepo() throws IndexUpdater.UpdateException {
@ -310,7 +310,9 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
assertAdAwayMetadata(adaway, id); assertAdAwayMetadata(adaway, id);
} }
/** @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String) */ /**
* @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String)
*/
private void assertAdAwayMetadata(App adaway, @RepoIdentifier String id) { private void assertAdAwayMetadata(App adaway, @RepoIdentifier String id) {
assertNotNull(adaway); assertNotNull(adaway);
assertEquals(String.format("AdAway", id), assertEquals(String.format("AdAway", id),
@ -338,7 +340,9 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
assertAdbMetadata(adb, id); assertAdbMetadata(adb, id);
} }
/** @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String) */ /**
* @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String)
*/
private void assertAdbMetadata(App adb, @RepoIdentifier String id) { private void assertAdbMetadata(App adb, @RepoIdentifier String id) {
assertNotNull(adb); assertNotNull(adb);
assertEquals("adbWireless", adb.name); assertEquals("adbWireless", adb.name);
@ -355,7 +359,9 @@ public class ProperMultiIndexUpdaterTest extends MultiIndexUpdaterTest {
assertCalendarMetadata(calendar, id); assertCalendarMetadata(calendar, id);
} }
/** @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String) */ /**
* @see ProperMultiIndexUpdaterTest#assert2048Metadata(Repo, String)
*/
private void assertCalendarMetadata(App calendar, @RepoIdentifier String id) { private void assertCalendarMetadata(App calendar, @RepoIdentifier String id) {
assertNotNull(calendar); assertNotNull(calendar);
assertEquals("Add to calendar", assertEquals("Add to calendar",