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

Commit 8ff020a0 authored by Willy Hu's avatar Willy Hu Committed by Automerger Merge Worker
Browse files

[DataStallRecoveryManagerTest] Fix the test fail am: 8c496024 am: 8ca01fdc 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2020879

Change-Id: I7822ffc70e8204249b038c0ad12e7f3691054e8e
parents 5ef6bafb 8ca01fdc

tests/telephonytests/src/com/android/internal/telephony/data/DataStallRecoveryManagerTest.java

+9 −14
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.google.common.truth.Truth.assertThat; 
import static org.mockito.Matchers.any;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.net.NetworkAgent;
@@ -43,7 +44,6 @@ import org.mockito.Mock; 
@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class DataStallRecoveryManagerTest extends TelephonyTest {



    @Mock private DataNetworkController mDataNetworkController;

    @Mock private DataServiceManager mDataServiceManager;

    @Mock private DataStallRecoveryManagerCallback mDataStallRecoveryManagerCallback;
@@ -56,6 +56,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


        doReturn(mDataNetworkController).when(mPhone).getDataNetworkController();

        doReturn(mDataConfigManager).when(mDataNetworkController).getDataConfigManager();

        doReturn(mSST).when(mPhone).getServiceStateTracker();

        doAnswer(

                invocation -> {

                    ((Runnable) invocation.getArguments()[0]).run();
@@ -99,10 +100,8 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


        logd("Sending validation failed callback");

        sendValidationFailedCallback();

        processAllMessages();

        moveTimeForward(180000);

        processAllFutureMessages();



        assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(2);

        verify(mDataStallRecoveryManagerCallback).onDataStallReestablishInternet();

    }
@@ -114,10 +113,9 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 


        logd("Sending validation failed callback");

        sendValidationFailedCallback();

        processAllMessages();

        moveTimeForward(180000);

        processAllFutureMessages();



        assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(3);

        verify(mSST, times(1)).powerOffRadioSafely();

    }



    @Test
@@ -129,10 +127,9 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 
        logd("Sending validation failed callback");

        sendValidationFailedCallback();



        processAllMessages();

        moveTimeForward(180000);

        processAllFutureMessages();



        assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(0);

        verify(mPhone, times(1)).rebootModem(any());

    }



    @Test
@@ -145,8 +142,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 
        logd("Sending validation failed callback");

        sendValidationFailedCallback();



        processAllMessages();

        moveTimeForward(180000);

        processAllFutureMessages();



        assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(0);

    }
@@ -161,8 +157,7 @@ public class DataStallRecoveryManagerTest extends TelephonyTest { 
        logd("Sending validation failed callback");

        sendValidationFailedCallback();



        processAllMessages();

        moveTimeForward(180000);

        processAllFutureMessages();



        assertThat(mDataStallRecoveryManager.getRecoveryAction()).isEqualTo(2);

    }