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 996313 - Add boolean for ending test on assertion failure in JavascriptMessageParser. r=nalexander

Browse Source
This commit is contained in:
Michael Comella 2014-04-24 12:23:20 -07:00
parent 50b43e0775
commit 57b767ca70
3 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,8 @@ public class JavascriptTest extends BaseTest {
mAsserter.dumpLog("Loading JavaScript test from " + url);
loadUrl(url);
final JavascriptMessageParser testMessageParser = new JavascriptMessageParser(mAsserter);
final JavascriptMessageParser testMessageParser =
new JavascriptMessageParser(mAsserter, false);
try {
while (!testMessageParser.isTestFinished()) {
if (Log.isLoggable(LOGTAG, Log.VERBOSE)) {

4
mobile/android/base/tests/helpers/JavascriptBridge.java
View File

@ -110,8 +110,10 @@ public final class JavascriptBridge {
public JavascriptBridge(final Object target) {
mTarget = target;
mMethods = target.getClass().getMethods();
mLogParser = new JavascriptMessageParser(sAsserter);
mExpecter = sActions.expectGeckoEvent(EVENT_TYPE);
// The JS here is unrelated to a test harness, so we
// have our message parser end on assertion failure.
mLogParser = new JavascriptMessageParser(sAsserter, true);
}
/**

26
mobile/android/base/tests/helpers/JavascriptMessageParser.java
View File

@ -34,9 +34,22 @@ public final class JavascriptMessageParser {
private String lastTestName = "";
// Have we seen a message saying the test is finished?
private boolean testFinishedMessageSeen = false;
private final boolean endOnAssertionFailure;
public JavascriptMessageParser(final Assert asserter) {
/**
* Constructs a message parser for test result messages sent from JavaScript. When seeing an
* assertion failure, the message parser can use the given {@link org.mozilla.gecko.Assert}
* instance to immediately end the test (typically if the underlying JS framework is not able
* to end the test itself) or to swallow the Errors - this functionality is determined by the
* <code>endOnAssertionFailure</code> parameter.
*
* @param asserter The Assert instance to which test results should be passed.
* @param endOnAssertionFailure
* true if the test should end if we see a JS assertion failure, false otherwise.
*/
public JavascriptMessageParser(final Assert asserter, final boolean endOnAssertionFailure) {
this.asserter = asserter;
this.endOnAssertionFailure = endOnAssertionFailure;
}
public boolean isTestFinished() {
@ -61,8 +74,15 @@ public final class JavascriptMessageParser {
try {
asserter.ok(false, name, message);
} catch (AssertionFailedError e) {
// Swallow this exception. We want to see all the
// Javascript failures, not die on the very first one!
// Above, we call the assert, allowing it to log.
// Now we can end the test, if applicable.
if (this.endOnAssertionFailure) {
throw e;
}
// Otherwise, swallow the Error. The JS framework we're
// logging messages from is likely capable of ending tests
// when it needs to, and we want to see all of its failures,
// not just the first one!
}
} else if ("KNOWN-FAIL".equals(type)) {
asserter.todo(false, name, message);