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

Commit 9c0cfb1f authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

Mocking CrashRecoveryProperties in test 

This test started failing as it was not able to access
CrashRecoveryProperties. Mocking them in the test fixed it.

Bug: b/323272250
Test: atest PackageWatchdogTest:com.android.server.PackageWatchdogTest

Change-Id: I6ec10adfc17cb85e1c370ff76d08c0aa7e14c11f
parent 6d5fbaeb

packages/CrashRecovery/services/java/com/android/server/PackageWatchdog.java

+3 −2
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ public class PackageWatchdog { 


    @VisibleForTesting

    static final int DEFAULT_BOOT_LOOP_TRIGGER_COUNT = 5;

    @VisibleForTesting

    static final long DEFAULT_BOOT_LOOP_TRIGGER_WINDOW_MS = TimeUnit.MINUTES.toMillis(10);



    private long mNumberOfNativeCrashPollsRemaining;
@@ -1692,11 +1693,11 @@ public class PackageWatchdog { 
            setCount(0);

        }



        private int getCount() {

        protected int getCount() {

            return CrashRecoveryProperties.rescueBootCount().orElse(0);

        }



        private void setCount(int count) {

        protected void setCount(int count) {

            CrashRecoveryProperties.rescueBootCount(count);

        }

tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java

+71 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ import org.mockito.stubbing.Answer; 


import java.io.File;

import java.io.FileOutputStream;

import java.lang.reflect.Field;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;
@@ -107,10 +108,13 @@ public class PackageWatchdogTest { 
    private ConnectivityModuleConnector mConnectivityModuleConnector;

    @Mock

    private PackageManager mMockPackageManager;

    // Mock only sysprop apis

    private PackageWatchdog.BootThreshold mSpyBootThreshold;

    @Captor

    private ArgumentCaptor<ConnectivityModuleHealthListener> mConnectivityModuleCallbackCaptor;

    private MockitoSession mSession;

    private HashMap<String, String> mSystemSettingsMap;

    private HashMap<String, String> mCrashRecoveryPropertiesMap;



    private boolean retry(Supplier<Boolean> supplier) throws Exception {

        for (int i = 0; i < RETRY_MAX_COUNT; ++i) {
@@ -1416,6 +1420,8 @@ public class PackageWatchdogTest { 
        PackageWatchdog watchdog =

                new PackageWatchdog(mSpyContext, policyFile, handler, handler, controller,

                        mConnectivityModuleConnector, mTestClock);

        mockCrashRecoveryProperties(watchdog);



        // Verify controller is not automatically started

        assertThat(controller.mIsEnabled).isFalse();

        if (withPackagesReady) {
@@ -1432,6 +1438,71 @@ public class PackageWatchdogTest { 
        return watchdog;

    }



    // Mock CrashRecoveryProperties as they cannot be accessed due to SEPolicy restrictions

    private void mockCrashRecoveryProperties(PackageWatchdog watchdog) {

        try {

            mSpyBootThreshold = spy(watchdog.new BootThreshold(

                PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_COUNT,

                PackageWatchdog.DEFAULT_BOOT_LOOP_TRIGGER_WINDOW_MS));

            mCrashRecoveryPropertiesMap = new HashMap<>();



            doAnswer((Answer<Integer>) invocationOnMock -> {

                String storedValue = mCrashRecoveryPropertiesMap

                        .getOrDefault("crashrecovery.rescue_boot_count", "0");

                return Integer.parseInt(storedValue);

            }).when(mSpyBootThreshold).getCount();

            doAnswer((Answer<Void>) invocationOnMock -> {

                int count = invocationOnMock.getArgument(0);

                mCrashRecoveryPropertiesMap.put("crashrecovery.rescue_boot_count",

                        Integer.toString(count));

                return null;

            }).when(mSpyBootThreshold).setCount(anyInt());



            doAnswer((Answer<Integer>) invocationOnMock -> {

                String storedValue = mCrashRecoveryPropertiesMap

                        .getOrDefault("crashrecovery.boot_mitigation_count", "0");

                return Integer.parseInt(storedValue);

            }).when(mSpyBootThreshold).getMitigationCount();

            doAnswer((Answer<Void>) invocationOnMock -> {

                int count = invocationOnMock.getArgument(0);

                mCrashRecoveryPropertiesMap.put("crashrecovery.boot_mitigation_count",

                        Integer.toString(count));

                return null;

            }).when(mSpyBootThreshold).setMitigationCount(anyInt());



            doAnswer((Answer<Long>) invocationOnMock -> {

                String storedValue = mCrashRecoveryPropertiesMap

                        .getOrDefault("crashrecovery.rescue_boot_start", "0");

                return Long.parseLong(storedValue);

            }).when(mSpyBootThreshold).getStart();

            doAnswer((Answer<Void>) invocationOnMock -> {

                long count = invocationOnMock.getArgument(0);

                mCrashRecoveryPropertiesMap.put("crashrecovery.rescue_boot_start",

                        Long.toString(count));

                return null;

            }).when(mSpyBootThreshold).setStart(anyLong());



            doAnswer((Answer<Long>) invocationOnMock -> {

                String storedValue = mCrashRecoveryPropertiesMap

                        .getOrDefault("crashrecovery.boot_mitigation_start", "0");

                return Long.parseLong(storedValue);

            }).when(mSpyBootThreshold).getMitigationStart();

            doAnswer((Answer<Void>) invocationOnMock -> {

                long count = invocationOnMock.getArgument(0);

                mCrashRecoveryPropertiesMap.put("crashrecovery.boot_mitigation_start",

                        Long.toString(count));

                return null;

            }).when(mSpyBootThreshold).setMitigationStart(anyLong());



            Field mBootThresholdField = watchdog.getClass().getDeclaredField("mBootThreshold");

            mBootThresholdField.setAccessible(true);

            mBootThresholdField.set(watchdog, mSpyBootThreshold);

        } catch (Exception e) {

            // tests will fail, just printing the error

            System.out.println("Error detected while spying BootThreshold" + e.getMessage());

        }

    }



    private static class TestObserver implements PackageHealthObserver {

        private final String mName;

        private int mImpact;