summaryrefslogtreecommitdiffstats
path: root/core/java/android/test
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2009-12-09 15:10:07 -0800
committerAdam Powell <adamp@google.com>2009-12-10 14:49:14 -0800
commit326d808b858359464b2ffeb84f2e0a8e0c79b600 (patch)
tree11974c82f0aa6398a0a7eb122b97c2a4c95a46f1 /core/java/android/test
parentf2f68760eb10b52bd53d6a266f9b5e2b06037d9f (diff)
downloadframeworks_base-326d808b858359464b2ffeb84f2e0a8e0c79b600.zip
frameworks_base-326d808b858359464b2ffeb84f2e0a8e0c79b600.tar.gz
frameworks_base-326d808b858359464b2ffeb84f2e0a8e0c79b600.tar.bz2
Added View#dispatchViewVisibilityChanged and View#onDispatchVisibilityChanged; updated api; tests
Reverted a change to InstrumentationTestCase that would have allowed @UiThreadTest on setUp() methods of tests.
Diffstat (limited to 'core/java/android/test')
-rw-r--r--core/java/android/test/InstrumentationTestCase.java36
1 files changed, 0 insertions, 36 deletions
diff --git a/core/java/android/test/InstrumentationTestCase.java b/core/java/android/test/InstrumentationTestCase.java
index 3290c96..22d95d1 100644
--- a/core/java/android/test/InstrumentationTestCase.java
+++ b/core/java/android/test/InstrumentationTestCase.java
@@ -147,42 +147,6 @@ public class InstrumentationTestCase extends TestCase {
}
}
- @Override
- public void runBare() throws Throwable {
- runMethod("setUp");
-
- try {
- runTest();
- } finally {
- runMethod("tearDown");
- }
- }
-
- private Throwable[] runMethod(String name) throws Throwable {
- final Throwable[] exceptions = new Throwable[1];
- final Method m = getClass().getMethod(name, (Class[]) null);
-
- if (m.isAnnotationPresent(UiThreadTest.class)) {
- getInstrumentation().runOnMainSync(new Runnable() {
- public void run() {
- try {
- m.invoke(InstrumentationTestCase.this);
- } catch (Throwable throwable) {
- exceptions[0] = throwable;
- }
- }
- });
- if (exceptions[0] != null) {
- throw exceptions[0];
- }
- exceptions[0] = null;
- } else {
- m.invoke(this);
- }
-
- return exceptions;
- }
-
/**
* Runs the current unit test. If the unit test is annotated with
* {@link android.test.UiThreadTest}, the test is run on the UI thread.