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

Commit 393fd7f9 authored by John Wu's avatar John Wu
Browse files

Throw TestableContentResolver init failure exception with proper stacktrace 

This allows us to know where was the getContentResolver() method called

Flag: TEST_ONLY
Test: TH
Change-Id: I3c106cd5ea8aa13991cb3a6844805a731a657b7d
parent 96b89561

tests/testables/src/android/testing/TestableContext.java

+6 −5
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class TestableContext extends ContextWrapper implements TestRule { 


    private TestableContentResolver mTestableContentResolver;

    private TestableSettingsProvider mSettingsProvider;

    private RuntimeException mSettingsProviderFailure;

    private Throwable mSettingsProviderFailure;



    private ArrayList<MockServiceResolver> mMockServiceResolvers;

    private ArrayMap<String, Object> mMockSystemServices;
@@ -100,8 +100,7 @@ public class TestableContext extends ContextWrapper implements TestRule { 
        } catch (Throwable t) {

            mTestableContentResolver = null;

            mSettingsProvider = null;

            mSettingsProviderFailure = new RuntimeException(

                    "Failed to initialize TestableSettingsProvider", t);

            mSettingsProviderFailure = t;

        }

        mReceiver = check != null ? check.getTracker("receiver") : null;

        mService = check != null ? check.getTracker("service") : null;
@@ -186,7 +185,8 @@ public class TestableContext extends ContextWrapper implements TestRule { 


    TestableSettingsProvider getSettingsProvider() {

        if (mSettingsProviderFailure != null) {

            throw mSettingsProviderFailure;

            throw new RuntimeException(

                    "Failed to initialize TestableSettingsProvider", mSettingsProviderFailure);

        }

        return mSettingsProvider;

    }
@@ -194,7 +194,8 @@ public class TestableContext extends ContextWrapper implements TestRule { 
    @Override

    public TestableContentResolver getContentResolver() {

        if (mSettingsProviderFailure != null) {

            throw mSettingsProviderFailure;

            throw new RuntimeException(

                    "Failed to initialize TestableSettingsProvider", mSettingsProviderFailure);

        }

        return mTestableContentResolver;

    }