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 - Part 4: Make UITest inherit from BaseRobocopTest. r=mcomella

Browse Source
This commit is contained in:
Nick Alexander 2014-04-01 22:00:47 -07:00
parent 096790f097
commit 1e50195da2
3 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/mobile/robocop/FennecNativeDriver.java
View File

@ -283,9 +283,9 @@ public class FennecNativeDriver implements Driver {
/**
* Takes a string of "key=value" pairs split by \n and creates a hash table.
*/
public static HashMap convertTextToTable(String data)
public static Map<String, String> convertTextToTable(String data)
{
HashMap retVal = new HashMap();
HashMap<String, String> retVal = new HashMap<String, String>();
String[] lines = data.split("\n");
for (int i = 0; i < lines.length; i++) {

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

@ -25,7 +25,7 @@ public abstract class BaseRobocopTest extends ActivityInstrumentationTestCase2<A
protected Assert mAsserter;
protected String mLogFile;
protected Map<?, ?> mConfig;
protected Map<String, String> mConfig;
protected String mRootPath;
/**

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

@ -25,6 +25,7 @@ import android.test.ActivityInstrumentationTestCase2;
import android.text.TextUtils;
import java.util.HashMap;
import java.util.Map;
/**
* A base test class for Robocop (UI-centric) tests. This and the related classes attempt to
@ -35,7 +36,7 @@ import java.util.HashMap;
* For documentation on writing tests and extending the framework, see
* https://wiki.mozilla.org/Mobile/Fennec/Android/UITest
*/
abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
abstract class UITest extends BaseRobocopTest
implements UITestContext {
private static final String JUNIT_FAILURE_MSG = "A JUnit method was called. Make sure " +
@ -44,7 +45,6 @@ abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
private Solo mSolo;
private Driver mDriver;
private Actions mActions;
private Assert mAsserter;
// Base to build hostname URLs
private String mBaseHostnameUrl;
@ -56,39 +56,21 @@ abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
protected GeckoViewComponent mGeckoView;
protected ToolbarComponent mToolbar;
@SuppressWarnings("unchecked")
public UITest() {
super((Class<Activity>) AppConstants.BROWSER_INTENT_CLASS);
}
@Override
protected void setUp() throws Exception {
super.setUp();
final String rootPath = FennecInstrumentationTestRunner.getFennecArguments().getString("deviceroot");
final HashMap config = loadConfigTable(rootPath);
// Start the activity.
final Intent intent = createActivityIntent(config);
final Intent intent = createActivityIntent(mConfig);
setActivityIntent(intent);
final Activity activity = getActivity();
if (getTestType() == Type.TALOS) {
mAsserter = new FennecTalosAssert();
} else {
mAsserter = new FennecMochitestAssert();
}
final String logFile = (String) config.get("logfile");
mAsserter.setLogFile(logFile);
mAsserter.setTestName(this.getClass().getName());
mSolo = new Solo(getInstrumentation(), activity);
mDriver = new FennecNativeDriver(activity, mSolo, rootPath);
mDriver = new FennecNativeDriver(activity, mSolo, mRootPath);
mActions = new FennecNativeActions(activity, mSolo, getInstrumentation(), mAsserter);
mBaseHostnameUrl = ((String) config.get("host")).replaceAll("(/$)", "");
mBaseIpUrl = ((String) config.get("rawhost")).replaceAll("(/$)", "");
mBaseHostnameUrl = ((String) mConfig.get("host")).replaceAll("(/$)", "");
mBaseIpUrl = ((String) mConfig.get("rawhost")).replaceAll("(/$)", "");
// Helpers depend on components so initialize them first.
initComponents();
@ -191,12 +173,7 @@ abstract class UITest extends ActivityInstrumentationTestCase2<Activity>
return baseUrl + "/" + url.replaceAll("(^/)", "");
}
private static HashMap loadConfigTable(final String rootPath) {
final String configFile = FennecNativeDriver.getFile(rootPath + "/robotium.config");
return FennecNativeDriver.convertTextToTable(configFile);
}
private static Intent createActivityIntent(final HashMap config) {
private static Intent createActivityIntent(final Map<String, String> config) {
final Intent intent = new Intent(Intent.ACTION_MAIN);
final String profile = (String) config.get("profile");