Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-24 00:24:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 842897 - Initalize distribution in testDistribution() instead of setUp(). r=gbrown

Browse Source
This commit is contained in:
Margaret Leibovic 2013-02-21 09:47:43 -08:00
parent 3eb2fde4f2
commit 7f074e2d63
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mobile/android/base/tests/testDistribution.java.in
View File

@ -43,6 +43,25 @@ public class testDistribution extends ContentProviderTest {
}
public void testDistribution() {
mActivity = getActivity();
// Clear the distribution pref in case Distribution.init has already run
clearDistributionPref();
try {
// Call Distribution.init with the mock package.
ClassLoader classLoader = mActivity.getClassLoader();
Class distributionClass = classLoader.loadClass("org.mozilla.gecko.Distribution");
Class contextClass = classLoader.loadClass("android.content.Context");
Method init = distributionClass.getMethod("init", contextClass, String.class);
Actions.EventExpecter distributionSetExpecter = mActions.expectGeckoEvent("Distribution:Set:OK");
init.invoke(null, mActivity, getMockPackagePath());
distributionSetExpecter.blockForEvent();
} catch (Exception e) {
mAsserter.ok(false, "exception initializing distribution", e.toString());
}
try {
JSONArray getPrefData = new JSONArray();
getPrefData.put("distribution.id");
@ -113,21 +132,6 @@ public class testDistribution extends ContentProviderTest {
public void setUp() throws Exception {
// TODO: Set up the content provider after setting the distribution.
super.setUp("@ANDROID_PACKAGE_NAME@.db.BrowserProvider", "AUTHORITY");
mActivity = getActivity();
// Clear the distribution pref in case Distribution.init has already run
clearDistributionPref();
// Call Distribution.init with the mock package.
ClassLoader classLoader = mActivity.getClassLoader();
Class distributionClass = classLoader.loadClass("org.mozilla.gecko.Distribution");
Class contextClass = classLoader.loadClass("android.content.Context");
Method init = distributionClass.getMethod("init", contextClass, String.class);
Actions.EventExpecter eventExpecter = mActions.expectGeckoEvent("Distribution:Set:OK");
init.invoke(null, mActivity, getMockPackagePath());
eventExpecter.blockForEvent();
}
public void tearDown() throws Exception {