code formatting to please checkstyle
This commit is contained in:
parent
bac0ae8f25
commit
d406a5d66c
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
package org.fdroid.fdroid.updater;
|
package org.fdroid.fdroid.updater;
|
||||||
|
|
||||||
import android.content.ContentValues;
|
import android.content.ContentValues;
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
package org.fdroid.fdroid.updater;
|
package org.fdroid.fdroid.updater;
|
||||||
|
|
||||||
import org.fdroid.fdroid.BuildConfig;
|
import org.fdroid.fdroid.BuildConfig;
|
||||||
|
@ -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;
|
||||||
@ -120,7 +119,7 @@ public class Issue763MultiRepo extends MultiIndexUpdaterTest {
|
|||||||
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);
|
||||||
|
|
||||||
|
@ -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;
|
||||||
|
@ -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",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user