mirror/fdroidclient
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidclient.git synced 2026-02-04 20:21:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename Apk.vercode to Apk.versionCode

Browse Source 
Updates #37.
This commit is contained in:
Daniel Martí
2016-04-19 11:49:00 +01:00
parent 887bb171aa
commit 1abbedc4ab
14 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/androidTest/java/org/fdroid/fdroid/ApkProviderHelperTest.java
View File

@@ -121,7 +121,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
cursor.close();
assertEquals("com.example", apk.packageName);
assertEquals(10, apk.vercode);
assertEquals(10, apk.versionCode);
assertNull(apk.features);
assertNull(apk.added);
@@ -147,7 +147,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
updatedCursor.close();
assertEquals("com.example", updatedApk.packageName);
assertEquals(10, updatedApk.vercode);
assertEquals(10, updatedApk.versionCode);
assertNotNull(updatedApk.features);
assertNotNull(updatedApk.added);
@@ -187,7 +187,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
// The find() method populates ALL fields if you don't specify any,
// so we expect to find each of the ones we inserted above...
assertEquals("com.example", apk.packageName);
assertEquals(11, apk.vercode);
assertEquals(11, apk.versionCode);
assertEquals("v1.1", apk.version);
assertEquals("xxxxyyyy", apk.hash);
assertEquals("a hash type", apk.hashType);
@@ -207,7 +207,7 @@ public class ApkProviderHelperTest extends BaseApkProviderTest {
// Didn't ask for these fields, so should be their default values...
assertNull(apkLessFields.hashType);
assertNull(apkLessFields.version);
assertEquals(0, apkLessFields.vercode);
assertEquals(0, apkLessFields.versionCode);
Apk notFound = ApkProvider.Helper.find(getMockContext(), "com.doesnt.exist", 1000);
assertNull(notFound);

6
app/src/androidTest/java/org/fdroid/fdroid/ApkProviderTest.java
View File

@@ -233,7 +233,7 @@ public class ApkProviderTest extends BaseApkProviderTest {
Apk apk = new MockApk("org.fdroid.fdroid", 13);
// Insert a new record...
Uri newUri = TestUtils.insertApk(this, apk.packageName, apk.vercode);
Uri newUri = TestUtils.insertApk(this, apk.packageName, apk.versionCode);
assertEquals(ApkProvider.getContentUri(apk).toString(), newUri.toString());
cursor = queryAllApks();
assertNotNull(cursor);
@@ -257,7 +257,7 @@ public class ApkProviderTest extends BaseApkProviderTest {
Apk toCheck = new Apk(cursor);
cursor.close();
assertEquals("org.fdroid.fdroid", toCheck.packageName);
assertEquals(13, toCheck.vercode);
assertEquals(13, toCheck.versionCode);
}
public void testCount() {
@@ -330,7 +330,7 @@ public class ApkProviderTest extends BaseApkProviderTest {
// But this should have saved correctly...
assertEquals("Some features", apk.features.toString());
assertEquals("com.example.com", apk.packageName);
assertEquals(1, apk.vercode);
assertEquals(1, apk.versionCode);
assertEquals(10, apk.repo);
}

2
app/src/androidTest/java/org/fdroid/fdroid/BaseApkProviderTest.java
View File

@@ -40,7 +40,7 @@ abstract class BaseApkProviderTest extends FDroidProviderTest<ApkProvider> {
protected void assertContains(List<Apk> apks, Apk apk) {
boolean found = false;
for (Apk a : apks) {
if (a.vercode == apk.vercode && a.packageName.equals(apk.packageName)) {
if (a.versionCode == apk.versionCode && a.packageName.equals(apk.packageName)) {
found = true;
break;
}

2
app/src/androidTest/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
View File

@@ -289,7 +289,7 @@ public class MultiRepoUpdaterTest extends InstrumentationTestCase {
for (int versionCode : versionCodes) {
boolean found = false;
for (Apk apk : apksToCheck) {
if (apk.vercode == versionCode && apk.packageName.equals(appId)) {
if (apk.versionCode == versionCode && apk.packageName.equals(appId)) {
found = true;
break;
}

2
app/src/androidTest/java/org/fdroid/fdroid/mock/MockApk.java
View File

@@ -6,7 +6,7 @@ public class MockApk extends Apk {
public MockApk(String id, int versionCode) {
this.packageName = id;
this.vercode = versionCode;
this.versionCode = versionCode;
}
}