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 990116 - Pre: Remove UITest.mActivity. r=mcomella

Browse Source
This commit is contained in:
Nick Alexander 2014-04-01 22:00:45 -07:00
parent bc9c137228
commit 47d917a823
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mobile/android/base/tests/UITest.java
View File

@ -49,7 +49,6 @@ abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
private final static Class<Activity> sLauncherActivityClass; private final static Class<Activity> sLauncherActivityClass;
private Activity mActivity;
private Solo mSolo; private Solo mSolo;
private Driver mDriver; private Driver mDriver;
private Actions mActions; private Actions mActions;
@ -83,11 +82,11 @@ abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
final String rootPath = FennecInstrumentationTestRunner.getFennecArguments().getString("deviceroot"); final String rootPath = FennecInstrumentationTestRunner.getFennecArguments().getString("deviceroot");
final HashMap config = loadConfigTable(rootPath); final HashMap config = loadConfigTable(rootPath);
final Intent intent = createActivityIntent(config);
setActivityIntent(intent);
// Start the activity. // Start the activity.
mActivity = getActivity(); final Intent intent = createActivityIntent(config);
setActivityIntent(intent);
final Activity activity = getActivity();
if (getTestType() == Type.TALOS) { if (getTestType() == Type.TALOS) {
mAsserter = new FennecTalosAssert(); mAsserter = new FennecTalosAssert();
@ -99,9 +98,9 @@ abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
mAsserter.setLogFile(logFile); mAsserter.setLogFile(logFile);
mAsserter.setTestName(this.getClass().getName()); mAsserter.setTestName(this.getClass().getName());
mSolo = new Solo(getInstrumentation(), mActivity); mSolo = new Solo(getInstrumentation(), activity);
mDriver = new FennecNativeDriver(mActivity, mSolo, rootPath); mDriver = new FennecNativeDriver(activity, mSolo, rootPath);
mActions = new FennecNativeActions(mActivity, mSolo, getInstrumentation(), mAsserter); mActions = new FennecNativeActions(activity, mSolo, getInstrumentation(), mAsserter);
mBaseHostnameUrl = ((String) config.get("host")).replaceAll("(/$)", ""); mBaseHostnameUrl = ((String) config.get("host")).replaceAll("(/$)", "");
mBaseIpUrl = ((String) config.get("rawhost")).replaceAll("(/$)", ""); mBaseIpUrl = ((String) config.get("rawhost")).replaceAll("(/$)", "");