commit a8db0a4ff6689f9f00dea6af44e65aa32a8546e1
author Jack Wang <jackwang@google.com> Mon Aug 17 14:19:52 2009 -0700
committer Jack Wang <jackwang@google.com> Mon Aug 17 14:19:52 2009 -0700
tree 92e643ab6dd74bd2cd771407d99c2429e09948f3
parent 0ef135d5c79ff5b443b43f8743250044700a8bb5

Fix bug 2056252: android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing
- Verify mInstrumentation is not null before calling getContext()

test-runner/android/test/AndroidTestRunner.java

diff --git a/test-runner/android/test/AndroidTestRunner.java b/test-runner/android/test/AndroidTestRunner.java
index 00440b43..0d4e1e9 100644
--- a/test-runner/android/test/AndroidTestRunner.java
+++ b/test-runner/android/test/AndroidTestRunner.java
@@ -158,7 +158,7 @@
             mTestResult.addListener(testListener);
         }
 
-        Context testContext = mInstrumentation.getContext();
+        Context testContext = mInstrumentation == null ? mContext : mInstrumentation.getContext();
         for (TestCase testCase : mTestCases) {
             setContextIfAndroidTestCase(testCase, mContext, testContext);
             setInstrumentationIfInstrumentationTestCase(testCase, mInstrumentation);