Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f16dcab5 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21589 into eclair 

* changes:
  Fix bug 2056252: android.test.AndroidTestRunnerTest:testRunTestWithNullListener is failing - Verify mInstrumentation is not null before calling getContext()
parents 068c5db5 a8db0a4f

test-runner/android/test/AndroidTestRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -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);