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

Commit 8b414c9a authored by tmfang's avatar tmfang
Browse files

Fix some test cases fail 

Test: robo test
Fixes: 125599276
Change-Id: I4b1b15f69ff3021e4330bed49ac95ea871b98e92
parent 193af336

src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment 


        mEmptyView = getView().findViewById(android.R.id.empty);

        setEmptyView(mEmptyView);

        final Resources res = SubscriptionManager.getResourcesForSubId(getActivity(), mSubId);

        final Resources res = SubscriptionManager.getResourcesForSubId(getContext(), mSubId);

        String emptyViewText = res.getString(R.string.wifi_calling_off_explanation,

                res.getString(R.string.wifi_calling_off_explanation_2));

        mEmptyView.setText(emptyViewText);

tests/robotests/src/com/android/settings/applications/appinfo/DefaultEmergencyShortcutPreferenceControllerTest.java

+7 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static org.mockito.ArgumentMatchers.argThat; 
import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.app.role.RoleManager;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;
@@ -38,11 +39,14 @@ import org.robolectric.RobolectricTestRunner; 
import org.robolectric.RuntimeEnvironment;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;



@RunWith(RobolectricTestRunner.class)

public class DefaultEmergencyShortcutPreferenceControllerTest {



    @Mock

    private RoleManager mRoleManager;

    @Mock

    private PackageManager mPackageManager;
@@ -54,6 +58,7 @@ public class DefaultEmergencyShortcutPreferenceControllerTest { 
        MockitoAnnotations.initMocks(this);

        mContext = spy(RuntimeEnvironment.application);

        when(mContext.getPackageManager()).thenReturn(mPackageManager);

        when(mContext.getSystemService(RoleManager.class)).thenReturn(mRoleManager);

        mController = new DefaultEmergencyShortcutPreferenceController(mContext, "Package1");

    }
@@ -80,8 +85,8 @@ public class DefaultEmergencyShortcutPreferenceControllerTest { 


    @Test

    public void isDefaultApp_isDefaultEmergency_shouldReturnTrue() {

        Settings.Secure.putString(mContext.getContentResolver(),

                Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION, "Package1");

        when(mRoleManager.getRoleHolders(RoleManager.ROLE_EMERGENCY))

                .thenReturn(Collections.singletonList("Package1"));



        assertThat(mController.isDefaultApp()).isTrue();

    }

tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java

+2 −4
Original line number Diff line number Diff line
@@ -84,11 +84,9 @@ public class DefaultBrowserPreferenceControllerTest { 


    @Test

    public void isAvailable_hasBrowser_shouldReturnTrue() {

        final ResolveInfo info = new ResolveInfo();

        info.activityInfo = new ActivityInfo();

        info.handleAllWebDataURI = true;

        when(mPackageManager.queryIntentActivitiesAsUser(any(Intent.class), anyInt(), anyInt()))

            .thenReturn(Collections.singletonList(info));

            .thenReturn(Collections.singletonList(createResolveInfo("com.test.pkg")));



        assertThat(mController.isAvailable()).isTrue();

    }

tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSettingsForSubTest.java

+0 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.settings.wifi.calling; 


import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertNotNull;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.doNothing;
@@ -32,7 +31,6 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.content.Intent;

import android.os.Bundle;

import android.preference.PreferenceManager;

import android.telephony.TelephonyManager;

import android.telephony.ims.ProvisioningManager;

import android.view.View;
@@ -46,7 +44,6 @@ import com.android.ims.ImsException; 
import com.android.ims.ImsManager;

import com.android.settings.R;

import com.android.settings.SettingsActivity;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.widget.SwitchBar;

import com.android.settings.widget.ToggleSwitch;