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

Commit f549cd1e authored by hjchangliao's avatar hjchangliao Committed by android-build-merger
Browse files

Merge "Make Nfc/Beam searchable based on feature availability" into pi-dev 

am: dc09b3ff

Change-Id: I3574ef8d49987b0b94bb2641d15cbf782772e5f7
parents c7494be5 dc09b3ff

src/com/android/settings/nfc/BaseNfcPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ public abstract class BaseNfcPreferenceController extends AbstractPreferenceCont 


    @Override

    public void updateNonIndexableKeys(List<String> keys) {

        if (isAvailable()) {

        if (!isAvailable()) {

            keys.add(getPreferenceKey());

        }

    }

tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java

+1 −2
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ public class ConnectedDeviceDashboardFragmentTest { 
        final List<String> niks = ConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER

                .getNonIndexableKeys(mContext);



        assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES,

                NfcPreferenceController.KEY_TOGGLE_NFC);

        assertThat(niks).containsExactly(KEY_CONNECTED_DEVICES, KEY_AVAILABLE_DEVICES);

    }

}

tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java

+23 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.util.ReflectionHelpers;



import java.util.ArrayList;

import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

public class AndroidBeamPreferenceControllerTest {
@@ -132,4 +135,24 @@ public class AndroidBeamPreferenceControllerTest { 
        mAndroidBeamController.onResume();

        assertThat(mAndroidBeamPreference.isEnabled()).isFalse();

    }



    @Test

    public void updateNonIndexableKeys_available_shouldNotUpdate() {

        when(mNfcAdapter.isEnabled()).thenReturn(true);

        final List<String> keys = new ArrayList<>();



        mAndroidBeamController.updateNonIndexableKeys(keys);



        assertThat(keys).isEmpty();

    }



    @Test

    public void updateNonIndexableKeys_notAvailable_shouldUpdate() {

        ReflectionHelpers.setField(mAndroidBeamController, "mNfcAdapter", null);

        final List<String> keys = new ArrayList<>();



        mAndroidBeamController.updateNonIndexableKeys(keys);



        assertThat(keys).hasSize(1);

    }

}

tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java

+23 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.util.ReflectionHelpers;



import java.util.ArrayList;

import java.util.List;



@RunWith(SettingsRobolectricTestRunner.class)

public class NfcPreferenceControllerTest {
@@ -134,4 +137,24 @@ public class NfcPreferenceControllerTest { 
        mNfcController.onResume();

        assertThat(mNfcPreference.isChecked()).isFalse();

    }



    @Test

    public void updateNonIndexableKeys_available_shouldNotUpdate() {

        when(mNfcAdapter.isEnabled()).thenReturn(true);

        final List<String> keys = new ArrayList<>();



        mNfcController.updateNonIndexableKeys(keys);



        assertThat(keys).isEmpty();

    }



    @Test

    public void updateNonIndexableKeys_notAvailable_shouldUpdate() {

        ReflectionHelpers.setField(mNfcController, "mNfcAdapter", null);

        final List<String> keys = new ArrayList<>();



        mNfcController.updateNonIndexableKeys(keys);



        assertThat(keys).hasSize(1);

    }

}