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

Cleanup for checkstyle

Browse Source
This commit is contained in:
Peter Serwylo 2016-06-29 07:11:57 +10:00
parent 81910bf749
commit b4e0bde57f
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/fdroid/fdroid/data/ApkProvider.java
View File

@ -8,7 +8,6 @@ import android.database.Cursor;
import android.net.Uri;
import android.util.Log;
import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.Schema.ApkTable;
import org.fdroid.fdroid.data.Schema.ApkTable.Cols;
import org.fdroid.fdroid.data.Schema.AppTable;

8
app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
View File

@ -329,12 +329,10 @@ class DBHelper extends SQLiteOpenHelper {
Utils.debugLog(TAG, alter);
db.execSQL(alter);
final String update =
"UPDATE " + ApkTable.NAME + " SET appId = ( " +
final String update = "UPDATE " + ApkTable.NAME + " SET " + ApkTable.Cols.APP_ID + " = ( " +
"SELECT app." + AppTable.Cols.ROW_ID + " " +
"FROM " + ApkTable.NAME + " AS app " +
"WHERE " + ApkTable.NAME + "." + ApkTable.Cols.PACKAGE_NAME + " = app." + AppTable.Cols.PACKAGE_NAME + " " +
")";
"FROM " + AppTable.NAME + " AS app " +
"WHERE " + ApkTable.NAME + "." + ApkTable.Cols.PACKAGE_NAME + " = app." + AppTable.Cols.PACKAGE_NAME + ")";
Log.i(TAG, "Updating foreign key from " + ApkTable.NAME + " to " + AppTable.NAME + " to use numeric foreign key.");
Utils.debugLog(TAG, update);
db.execSQL(update);

4
app/src/test/java/org/fdroid/fdroid/AcceptableMultiRepoUpdaterTest.java
View File

@ -2,13 +2,13 @@
package org.fdroid.fdroid;
import android.content.ContentValues;
import android.net.Uri;
import android.support.annotation.NonNull;
import android.util.Log;
import org.fdroid.fdroid.RepoUpdater.UpdateException;
import org.fdroid.fdroid.data.Repo;
import org.fdroid.fdroid.data.RepoProvider;
import org.fdroid.fdroid.data.Schema;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricGradleTestRunner;
@ -127,7 +127,7 @@ public class AcceptableMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
private void disableRepo(Repo repo) {
ContentValues values = new ContentValues(1);
values.put(RepoProvider.DataColumns.IN_USE, 0);
values.put(Schema.RepoTable.Cols.IN_USE, 0);
RepoProvider.Helper.update(context, repo, values);
}

1
app/src/test/java/org/fdroid/fdroid/MultiRepoUpdaterTest.java
View File

@ -19,7 +19,6 @@ import org.junit.Before;
import java.io.File;
import java.util.List;
import java.util.UUID;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;

4
app/src/test/java/org/fdroid/fdroid/data/FDroidProviderTest.java
View File

@ -1,18 +1,14 @@
package org.fdroid.fdroid.data;
import android.content.ContentResolver;
import android.content.ContextWrapper;
import org.fdroid.fdroid.TestUtils;
import org.junit.After;
import org.junit.Before;
import org.mockito.AdditionalAnswers;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowContentResolver;
import static org.mockito.Mockito.mock;
public abstract class FDroidProviderTest {
protected ShadowContentResolver contentResolver;