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

Commit 759e2e5f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ib0f10385,I1108e62d,If732d23d 

* changes:
  Fixed a resource leak in unit tests
  Fixed failed unit tests
  Fixed flaky unit tests
parents d650bdb4 6c85560b

tests/telephonytests/src/com/android/internal/telephony/CarrierActionAgentTest.java

+13 −9
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ 
 */

package com.android.internal.telephony;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;



import android.database.ContentObserver;

import android.net.Uri;

import android.os.Bundle;
@@ -32,19 +39,13 @@ import org.junit.Test; 
import org.mockito.ArgumentCaptor;

import org.mockito.Mock;



import static org.junit.Assert.assertEquals;

import static org.mockito.Matchers.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.verify;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



public class CarrierActionAgentTest extends TelephonyTest {

    private CarrierActionAgent mCarrierActionAgentUT;

    private FakeContentResolver mFakeContentResolver;

    private FakeContentProvider mFakeContentProvider;

    private static int DATA_CARRIER_ACTION_EVENT = 0;

    private static int RADIO_CARRIER_ACTION_EVENT = 1;

    private CarrierActionAgentHandler mCarrierActionAgentHandler;

    @Mock

    private Handler mDataActionHandler;

    @Mock
@@ -107,7 +108,8 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        mFakeContentProvider = new FakeContentProvider();

        mFakeContentResolver.addProvider(Settings.AUTHORITY, mFakeContentProvider);

        doReturn(mFakeContentResolver).when(mContext).getContentResolver();

        new CarrierActionAgentHandler(getClass().getSimpleName()).start();

        mCarrierActionAgentHandler = new CarrierActionAgentHandler(getClass().getSimpleName());

        mCarrierActionAgentHandler.start();

        waitUntilReady();

        logd("CarrierActionAgentTest -Setup!");

    }
@@ -118,7 +120,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 1);

        mFakeContentProvider.simulateChange(

                Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON));

        waitForMs(50);

        waitForMs(200);

        ArgumentCaptor<Message> message = ArgumentCaptor.forClass(Message.class);



        verify(mDataActionHandler).sendMessageAtTime(message.capture(), anyLong());
@@ -130,6 +132,8 @@ public class CarrierActionAgentTest extends TelephonyTest { 


    @After

    public void tearDown() throws Exception {

        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);

        mCarrierActionAgentHandler.quit();

        super.tearDown();

    }

}

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        assertFalse(sst.isImsRegistered());

    }



    @FlakyTest

    @Test

    @MediumTest

    public void testSignalStrength() {
@@ -362,14 +361,15 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        sst.mSS.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_LTE);



        mSimulatedCommands.notifySignalStrength();

        waitForMs(200);

        waitForMs(300);

        assertEquals(sst.getSignalStrength(), ss);

        assertEquals(sst.getSignalStrength().isGsm(), true);



        // notify signal strength again, but this time data RAT is not LTE

        sst.mSS.setRilVoiceRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);

        sst.mSS.setRilDataRadioTechnology(ServiceState.RIL_RADIO_TECHNOLOGY_EHRPD);

        mSimulatedCommands.notifySignalStrength();

        waitForMs(200);

        waitForMs(300);

        assertEquals(sst.getSignalStrength(), ss);

        assertEquals(sst.getSignalStrength().isGsm(), false);

    }

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.IDeviceIdleController; 
import android.os.RegistrantList;

import android.os.ServiceManager;

import android.provider.BlockedNumberContract;

import android.provider.Settings;

import android.telephony.ServiceState;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -435,6 +436,9 @@ public abstract class TelephonyTest { 
        mSST.mSS = mServiceState;

        mServiceManagerMockedServices.put("connectivity_metrics_logger", mConnMetLoggerBinder);



        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.ENABLE_CELLULAR_ON_BOOT, 1);



        setReady(false);

    }

tests/telephonytests/src/com/android/internal/telephony/imsphone/ImsPhoneCallTrackerTest.java

+24 −24
Original line number Diff line number Diff line
@@ -15,6 +15,25 @@ 
 */

package com.android.internal.telephony.imsphone;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.isNull;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



import android.app.PendingIntent;

import android.content.Context;

import android.content.Intent;
@@ -26,7 +45,6 @@ import android.support.test.filters.FlakyTest; 
import android.telephony.PhoneNumberUtils;

import android.telephony.ims.feature.ImsFeature;

import android.test.suitebuilder.annotation.SmallTest;

import android.test.suitebuilder.annotation.LargeTest;



import com.android.ims.ImsCall;

import com.android.ims.ImsCallProfile;
@@ -38,7 +56,6 @@ import com.android.ims.ImsReasonInfo; 
import com.android.ims.ImsServiceClass;

import com.android.ims.internal.ImsCallSession;

import com.android.internal.telephony.Call;

import com.android.internal.telephony.CommandsInterface;

import com.android.internal.telephony.Connection;

import com.android.internal.telephony.PhoneConstants;

import com.android.internal.telephony.TelephonyTest;
@@ -46,33 +63,12 @@ import com.android.internal.telephony.TelephonyTest; 
import org.junit.After;

import org.junit.Assert;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.mockito.Mock;

import org.mockito.invocation.InvocationOnMock;

import org.mockito.stubbing.Answer;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.nullable;

import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyBoolean;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doThrow;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.isNull;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;



public class ImsPhoneCallTrackerTest extends TelephonyTest {

    private ImsPhoneCallTracker mCTUT;

    private ImsCTHandlerThread mImsCTHandlerThread;
@@ -370,6 +366,8 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
        assertEquals(Call.State.ALERTING, mCTUT.mForegroundCall.getState());

    }



    @FlakyTest

    @Ignore

    @Test

    @SmallTest

    public void testImsMTActiveMODial() {
@@ -476,6 +474,8 @@ public class ImsPhoneCallTrackerTest extends TelephonyTest { 
                nullable(ImsConnectionStateListener.class));

    }



    @FlakyTest

    @Ignore

    @Test

    @SmallTest

    public void testTTYImsServiceUnavailable() throws ImsException {