diff options
| author | Jack Wang <jackwang@google.com> | 2009-08-17 14:19:52 -0700 |
|---|---|---|
| committer | Jack Wang <jackwang@google.com> | 2009-08-17 14:19:52 -0700 |
| commit | a8db0a4ff6689f9f00dea6af44e65aa32a8546e1 (patch) | |
| tree | 92e643ab6dd74bd2cd771407d99c2429e09948f3 /test-runner | |
| parent | 0ef135d5c79ff5b443b43f8743250044700a8bb5 (diff) | |
| download | frameworks_base-a8db0a4ff6689f9f00dea6af44e65aa32a8546e1.zip frameworks_base-a8db0a4ff6689f9f00dea6af44e65aa32a8546e1.tar.gz frameworks_base-a8db0a4ff6689f9f00dea6af44e65aa32a8546e1.tar.bz2 | |
Fix bug 2056252: android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing
- Verify mInstrumentation is not null before calling getContext()
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/android/test/AndroidTestRunner.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test-runner/android/test/AndroidTestRunner.java b/test-runner/android/test/AndroidTestRunner.java index 00440b4..0d4e1e9 100644 --- a/test-runner/android/test/AndroidTestRunner.java +++ b/test-runner/android/test/AndroidTestRunner.java @@ -158,7 +158,7 @@ public class AndroidTestRunner extends BaseTestRunner { 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); |