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 899421 - Rename getArguments so that FennecInstrumentationTestRunner is compatible with Android API level 18. r=gbrown

Browse Source
This commit is contained in:
Kartikaya Gupta 2013-07-30 11:13:34 -04:00
parent 7dfe172ed7
commit f99024f916
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/mobile/robocop/FennecInstrumentationTestRunner.java.in
View File

@ -23,9 +23,9 @@ public class FennecInstrumentationTestRunner extends InstrumentationTestRunner {
// unfortunately we have to make this static because test classes that don't extend
// from ActivityInstrumentationTestCase2 can't get a reference to this class.
public static Bundle getArguments() {
public static Bundle getFennecArguments() {
if (sArguments == null) {
Log.e("Robocop", "FennecInstrumentationTestCase.getArguments returns null bundle");
Log.e("Robocop", "FennecInstrumentationTestCase.getFennecArguments returns null bundle");
}
return sArguments;
}

2
mobile/android/base/tests/BaseTest.java.in
View File

@ -92,7 +92,7 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
@Override
protected void setUp() throws Exception {
// Load config file from root path (setup by python script)
String rootPath = FennecInstrumentationTestRunner.getArguments().getString("deviceroot");
String rootPath = FennecInstrumentationTestRunner.getFennecArguments().getString("deviceroot");
String configFile = FennecNativeDriver.getFile(rootPath + "/robotium.config");
HashMap config = FennecNativeDriver.convertTextToTable(configFile);
// Create the intent to be used with all the important arguments.