Backed out changeset 02bceb824051 (bug 975838)

This commit is contained in:
Richard Newman 2014-03-17 22:42:24 -07:00
parent 31ffe7703d
commit f21e892762
2 changed files with 0 additions and 69 deletions

View File

@ -39,7 +39,6 @@ skip-if = android_version == "10"
# disabled on x86 only; bug 927476
skip-if = processor == "x86"
[testFormHistory]
[testGeckoMenu]
[testGetUserMedia]
# disabled on 2.3; bug 979620
skip-if = android_version == "10"

View File

@ -1,68 +0,0 @@
package org.mozilla.gecko.tests;
import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.menu.GeckoMenu;
import org.mozilla.gecko.util.ThreadUtils;
public class testGeckoMenu extends BaseTest {
private volatile Exception exception;
private void setException(Exception e) {
this.exception = e;
}
@Override
protected int getTestType() {
return TEST_MOCHITEST;
}
public void testMenuThreading() throws InterruptedException {
final GeckoMenu menu = new GeckoMenu(mSolo.getCurrentActivity());
final Object semaphore = new Object();
ThreadUtils.postToUiThread(new Runnable() {
@Override
public void run() {
try {
menu.add("test1");
} catch (Exception e) {
setException(e);
}
synchronized (semaphore) {
semaphore.notify();
}
}
});
synchronized (semaphore) {
semaphore.wait();
}
mAsserter.is(exception, null, "No exception thrown if called on UI thread.");
new Thread(new Runnable() {
@Override
public void run() {
try {
menu.add("test2");
} catch (Exception e) {
setException(e);
}
synchronized (semaphore) {
semaphore.notify();
}
}
}).start();
synchronized (semaphore) {
semaphore.wait();
}
if (AppConstants.RELEASE_BUILD) {
mAsserter.is(exception, null, "No exception was thrown: release build.");
return;
}
mAsserter.is(exception != null, true, "An exception was thrown.");
mAsserter.is(exception.getClass(), IllegalThreadStateException.class, "An IllegalThreadStateException was thrown.");
}
}