Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 21589 into eclair

Browse Source 
* changes:
  Fix bug 2056252: android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing - Verify mInstrumentation is not null before calling getContext()
This commit is contained in:
Android (Google) Code Review
2009-08-18 20:16:46 -07:00
parent 068c5db5c3 a8db0a4ff6
commit f16dcab559
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test-runner/android/test/AndroidTestRunner.java
View File

@@ -158,7 +158,7 @@ public class AndroidTestRunner extends BaseTestRunner {
mTestResult.addListener(testListener); mTestResult.addListener(testListener);
} }
Context testContext = mInstrumentation.getContext(); Context testContext = mInstrumentation == null ? mContext : mInstrumentation.getContext();
for (TestCase testCase : mTestCases) { for (TestCase testCase : mTestCases) {
setContextIfAndroidTestCase(testCase, mContext, testContext); setContextIfAndroidTestCase(testCase, mContext, testContext);
setInstrumentationIfInstrumentationTestCase(testCase, mInstrumentation); setInstrumentationIfInstrumentationTestCase(testCase, mInstrumentation);