wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 938821 - Part 9: Remove reflection from ContentProviderTest.authority. r=mcomella

Browse Source
This commit is contained in:
Nick Alexander 2014-02-11 18:10:07 -08:00
parent 49fefa6e4f
commit 0989610d5f
5 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/android/base/tests/ContentProviderTest.java
View File

@ -51,7 +51,6 @@ abstract class ContentProviderTest extends BaseTest {
protected ArrayList<Runnable> mTests;
protected String mDatabaseName;
protected Class mProviderClass;
protected Class mProviderContract;
protected String mProviderAuthority;
protected IsolatedContext mProviderContext;
@ -172,13 +171,6 @@ abstract class ContentProviderTest extends BaseTest {
}
}
private void setUpProviderClassAndAuthority(String providerClassName,
String authorityField) throws Exception {
mProviderContract = mClassLoader.loadClass("org.mozilla.gecko.db.BrowserContract");
mProviderAuthority = (String) mProviderContract.getField(authorityField).get(null);
mProviderClass = mClassLoader.loadClass(providerClassName);
}
private void setUpContentProvider() throws Exception {
mResolver = new ChangeRecordingMockContentResolver();
@ -214,14 +206,16 @@ abstract class ContentProviderTest extends BaseTest {
}
// TODO: Take the actual class as an arg.
public void setUp(String providerClassName, String authorityUriField, String databaseName) throws Exception {
public void setUp(String providerClassName, String authority, String databaseName) throws Exception {
super.setUp();
mClassLoader = getInstrumentation().getContext().getClassLoader();
mTests = new ArrayList<Runnable>();
mDatabaseName = databaseName;
setUpProviderClassAndAuthority(providerClassName, authorityUriField);
mProviderAuthority = authority;
mProviderClass = mClassLoader.loadClass(providerClassName);
setUpContentProvider();
}

2
mobile/android/base/tests/testBrowserProvider.java
View File

@ -202,7 +202,7 @@ public class testBrowserProvider extends ContentProviderTest {
@Override
public void setUp() throws Exception {
super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY", "browser.db");
super.setUp("org.mozilla.gecko.db.BrowserProvider", BrowserContract.AUTHORITY, "browser.db");
mTests.add(new TestSpecialFolders());

2
mobile/android/base/tests/testBrowserProviderPerf.java
View File

@ -182,7 +182,7 @@ public class testBrowserProviderPerf extends ContentProviderTest {
@Override
public void setUp() throws Exception {
super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY", "browser.db");
super.setUp("org.mozilla.gecko.db.BrowserProvider", BrowserContract.AUTHORITY, "browser.db");
mGenerator = new Random(19580427);
}

5
mobile/android/base/tests/testDistribution.java
View File

@ -1,11 +1,12 @@
package org.mozilla.gecko.tests;
import org.mozilla.gecko.*;
import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.util.ThreadUtils;
import android.app.Activity;
import android.content.Context;
import android.content.SharedPreferences;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
@ -303,7 +304,7 @@ public class testDistribution extends ContentProviderTest {
@Override
public void setUp() throws Exception {
// TODO: Set up the content provider after setting the distribution.
super.setUp("org.mozilla.gecko.db.BrowserProvider", "AUTHORITY", "browser.db");
super.setUp("org.mozilla.gecko.db.BrowserProvider", BrowserContract.AUTHORITY, "browser.db");
}
private void delete(File file) throws Exception {

3
mobile/android/base/tests/testHomeListsProvider.java
View File

@ -36,7 +36,8 @@ public class testHomeListsProvider extends ContentProviderTest {
@Override
public void setUp() throws Exception {
super.setUp("org.mozilla.gecko.db.HomeListsProvider", "AUTHORITY", "homelists.db");
// This test is disabled, so this just needs to compile.
super.setUp(null, null, "homelists.db");
mTests.add(new TestFakeItems());